Remove remaining DVI dependencies from unit tests.