More test coverage.
Merge pull request #22 from leonardt/more_test_coverage

More test coverage.