Continued work on tests (added Mockito)