Test suite fixes for s3