More FindBugs changes as part of test