mavenize and add test