Merge "Rename SwiftScenarioTest to ObjectStorageScenarioTest"