Fixing the test cases