Fix tests for iOS 8.1