Also need to update subset test for changed DG mapping