I skipped the bulk of verifyConsistentBehaviour tests which are not valid for the new implementation -- there is no optimization and always cleanup.