Fixed unit tests.  Fixed issue #2.