Add OCMock and more tests