Fix almost all test