fixed all test cases