Improvements to the tests.
Merge pull request #64 from apenney/tests

Improvements to the tests.