Resolved many more failures of test cases.