Fix remaining tests.