Improves test coverage
Merge pull request #7 from JoshTGreenwood/master

Improves test coverage