Clean Up tests

Changed variable names, added comments.
Merge branch 'advancedUI' of https://github.com/MinionApp/minion into advancedUI