Didn't test, my bad.

Last changes broke some tests, error being that the mockup aws method
stubs didn't provide as much data as some methods expected.  This
resulted in undefined member accesses.