filled in an empty test so as not to fail
added s3 changes
interim commit for s3 test
fixed merge issues with interim commit
minor test for s3 that checks for error