Py3 fixes to test_s3