Rewrote test cases to use Mockito