Fix test for new criteria handling.
Changed my mind. Subclassed GroupEditor.