Converting overwrite to only check s3 once

Also refactoring many of the tests.
Remove 's' from exists. Should this string be a constant somewhere?