Fix the iOS 8 unit test failures

Resolves #14919.
Merge pull request #14931 from twbs/fix-ios-unit-test-failures

Fix the iOS 8 unit test failures