AWS - Fix integration tests

Cherry pick of e1d3f7f1

Type of change

• Bug Fix
• Feature

Does this introduce a change in the core logic?

• [NO]

Does this introduce a change in the cloud provider implementation, if so which cloud?

• AWS
• Azure
• Google Cloud
• IBM

Does this introduce a breaking change?

• [NO]

What is the current behavior?

Current integrations tests for AWS are broken following the bag of word feature. This cherry pick the fix in the tests from master