PMD and removed failing test cases