Fix system group tests- sg's belong to org, not env.