update maven surefire plugin
Add UT + refactoring using java 8 possibilities :)