s3 rspec fixes