FIX ALL THE TESTS