Fix the unit tests

There are a couple important notes:

- The OS X tests won't actually works due to a CocoaPods bug (unless you install from master). This is a bug which will be fixed in the next CocoaPods which I think will come out tomorrow. The fix is: https://github.com/CocoaPods/CocoaPods/commit/b3a3d2d04eaa0b1078504c76a31265ce77871cdf A work around would be to set the architecture yourself.
- Untested on iOS due to the bug in Xcode 5.0.1 where you cannot run tests.
- This will depend on #1445 being merged for Travis to be able to use CocoaPods without getting an error.