Improve coverage of unit tests.
Fix unit test.