HHH-8962 : Fix compile failures and remove @FailureExpectedWithNewMetamodel from passing test