Extricate some borken tests.