CFY-646 fixed integration tests