Started to write tests to capture info on hosts etc
Merge pull request #6 from peoplemerge/master

Started to write tests to capture info on hosts etc