TRUNK-4443 Fixed failing integration tests