Fix failing test cases.