fix all the tests