Minor changes, fixed to acceptance tests. Change to pom.xml.