* Fixed unit tests.