Add some more code from the separate integration test project to be able to publish the femaining functionality as separate project at some point