Improve test coverage
Merge pull request #25 from bp323/upCoverage

Verified and tested. > 90% is awesome! Merging