Fixed dependencies and unit tests.