added OCMock. refactored tests.