contract test suite post-breakup misc cleanups