Add OCMock dep to test target
Change to state-based API
Revert "Tweak background color of cell"

This reverts commit 9ad6b275c375878bc536550d31ab6dd035ed5073.