6619 - integrated maven test structure and cleaned pom file after last sync. with the master