fixed all the test