Adding integration test support