ISIS-798: fixes for integration tests.