Update tests to compile on Xcode 6.1.

(Still compiles on Xcode 6.0)