Modified UT's using Mockito