@pivotal-jwinters/@xtreme-gavin-enns - started converting tests to use OCMock