Made corrections to correct JMock unit tests