Pom and test updates