Merge "Move some tests into CTS to avoid duplication" into sc-dev