Better environment for integration tests
Integration test fix