COMP: Address dependencies on tests.