INTSAMPLES-102 - Fix intermittently failing tests

Reference: https://jira.springsource.org/browse/INTSAMPLES-102