Fix some broken tests.