Update of testcases.
Fix of additional PMD and FindBugs warnings.