Use S3 if ENV vars set
fix tests for last edit helper