Converting overwrite to only check s3 once

Also refactoring many of the tests.
I'm not sure what else to add other than context, but mocha will add that automatically.  Can you suggest what to add to make it seem complete?