Added mockito test runner and simplified mocks.