added s3 tests and tweaked field names