Fix the broken tests.