CFY-646 refactored integration tests environment some more