Xcode 5 upgrade check.
Fixed broken unit test.
Fixed unit test build.