Refactored some cloud patching to a fixture