Address s3-test functional test suite failures