Tests mavenized
Merge