Imporved the mojo and testing pom.