Fix four test cases