Add AWS config
Fix aws config for tests