Remove test cruft that is causing failures.