Fix other affected tests.