Fixed tests
Make suggestions
Merge branch 'master' of github.com:kevinvandervlist/whashose