Fixed all test cases