FailureExpectedWithNewMetamodel cleanup