fix a bunch of tests