FIXIN THE TESTS