Fixed poms and unit tests based upon latest refactorings from ozizka