Move test utils outside package, add mockito to pom,
some extra javadoc in mainline