fixed unit test issues.