fixes to make mvn test run clean (again)