fix test
Fix FindBugs warnings
fix FindBugs issues
Merge pull request #1504 from dennishendriksen/master

Fix FindBugs warnings