Switching to facet-based unit scoping, fixing feature tests for RCI -> Research Data Curation Program name change