Aws integration test fixes

Merged Wyatt Nielsen requested to merge trusted-aws into master

Merge request reports