Finish S3 conversions

Blodgett, David L. requested to merge aws_test into master May 24, 2022