Feature Merge: Integration test updates, AWS api changes