PMD refactoring and deleting test files