More test and pom fixes