Improved testing coverage and throughness.
Merge pull request #3 from tmesser/master

Improve test coverage.