Revert changes to integration-test-framework to not make tests fail with strange errors about entity expansion limits