Fix broken tests.