Cut over more tests to AbstractIntegrationTest