Testbed Adapter PMD/FindBugs fixes