Fixes some tests and skips others as needed for cloudfiles/swift