Added more test cases with Mockito