Clean up some broken tests.