Format pom.xml
Adapt tests to natural keys and data