INTEXT-54 - AWS Fix Failing Tests

For reference: https://jira.springsource.org/browse/INTEXT-54