Further JMock fixes