fix ALL THE TESTS