working on fixes unit tests.