Refactor + new mockito Test