Fixing collection/unit scoping, adding feature test for collection exclusion by unit (DCMKEY-230)