Improved s3 output testing.