Add some helpers
Add missing tests
Some minor refactors
Fix some checkstyles issues
Fix more checkstyles issues
Merge pull request #209 from Jarlakxen/master

Add some helpers