INTSAMPLES-102 - Fix intermittently failing tests
Reference: https://jira.springsource.org/browse/INTSAMPLES-102
Merge pull request #84 from ghillert/INTSAMPLES-102-2

INTSAMPLES-102 - Fix intermittently failing tests