converted tests to mockito
improved test coverage

Change-Id: I9db881c2d952fdd927cd1376ffed389b44624175