Collapsing a few tests
changed to feature to facilities