JMock fixes