Fixed failed test cases