updated tests and refactored classes
Merge branch 'master' of https://github.com/MinionApp/minion
Merge branch 'master' of https://github.com/MinionApp/minion