Merge "Add the "sys" group for tests."