Attempt to fix the iOS 8 unit test failures