merge the integration tests to new test framework