Trim pom.xml & add back tests