Changes needed to make test cases pass under Xcode 6.1 beta 3.