fix a lot of the tests