More unit testing
Merge branch 'amazons3'