Updated some test cases