Merge "Remove watch specific test from CTS" into sc-dev