Fix the failing tests.