Unit test cleanup, plus 1 more line!
Merge pull request #247 from shermdog/unit-tests

Unit test cleanup, plus 1 more line!