more tests
Merge branch 'master' of https://github.com/MinionApp/minion
checkstyle stuff