Added Mockito test support