Some minor infrastructure changes for Integration Tests