Merge pull request #199 from dennishendriksen/testing

Fix high priority FindBugs warnings
Merge pull request #200 from dennishendriksen/testing

Fix FindBugs warnings
Merge pull request #201 from dennishendriksen/testing

Fix FindBugs warnings + revert fix