fix failing tests for this branch.