Fix failing tests due to framework changes.