All test cases work now