wintest More work to make test-s3.py work