More dependency fixes for unit tests.