Using GHUnit and OCMock forks and restored all tests (all passing)