I commented out the whole block of s3 testing, as I figured that it would break for anyone who does not have credentials to access my bucket in s3. I commented out the comments as well, to show that they belonged to the block of commented out code.  I'll work on moving this whole mess over to the regression test area.