Added pom and updated tests