Improved unit tests.
Improved unit tests.