cut over more tests to AbstractIntegrationTest