#POULPE-452
Fixed javadocs, method names
Added unit tests