Added tests, refactored methods
Merge branch 'master' of https://www.github.com/LiamDeGrey/Mansion-Bandit