Closes #944, closes #532. ~WIP because something is causing the test budget to fail to create because it’s using INSERT instead of UPDATE sql queries. (Or not? I have no idea)~