Resolved conflicts and fixed up system groups tests