fix all the tests!