More unit tests.

This resolves issue #38.