Add distinction between territory and map criteria groups
Add tests for territories retrieval