Made changes for integration test to work