added s3 tests and tweaked field names
Merge branch 'master' into level3