Made changes for integration testing to work.