refactoring repo for Maven Tests