fixing all the tests