Type-safe fixes for tests caught by Xcode 5/iOS 7 compiler
merged from ocmock master