committing after adding testcases for SG and CH.