Some unit testing and pom cleanup.