fix all failing tests from the original branch.