Fix dvec-related fallout in tests