PE: Fix group colocation and regression tests
Mercurial revision: 34a8f6d95c289e157fd7290300eeb313ab60804b