test refactoring
Merge commit '19ac36daca3ca65a312f396ad57bb5f8636ce76e'
Merge branch 'master' of https://github.com/woodbury/Musha