Fixed issues with test cases