fixed unit tests.