Optimize S3 usage by eliminating most "test" calls