a few fixes in the s3 deployer
restructure test fixtures