Fix the rest the tests