Minor pom and test fixes