#42: fix aws plugin issue
Merge branch 'iss42.tests'