Fixed broken unit tests.

This addresses issue #7.