added OCMock and more tests