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