Tweaking tests a bit and adding more coverage
Merge pull request #6 from meatballhat/moar-test-coverage

Tweaking tests a bit and adding more coverage