Changes for the integration tests
Merged with the master repo