Fixed some test cases