Fix testing in Makefile and pom.xml