add mockito for tests
javadoc fixes
additional test for coverage