fix rests of the tests