Fix PMD warnings (and get rid of some rules) in test code, implement skipped test