Added more tests; updated pom