Fix all the test