Fixed new test cases