JUnit and JMock test changes