Refactored Xcode tests