Updated for Xcode 6 and XCTest