Modified some test cases