Fix up dependencies for test suite.