Fixed some failed test cases