fixed a bunch of tests, wooohooo!