Simplifying self test and mvn test.