INT-3212: Fix some failed tests from CI

JIRA: https://jira.springsource.org/browse/INT-3212