initial integration test infrastructure, refactored