Added fog and s3
commented
Fixed fog not allowing tests to be run