Fixed the dependencies and unit tests.