Fixed some other test cases