interim commit for s3 test
fixed merge issues with interim commit
minor test for s3 that checks for error