Converting overwrite to only check s3 once

Also refactoring many of the tests.
Merge pull request #33 from cpacey/single_overwrite

Converting overwrite to only check s3 once