Test: cts: Continue to decouple the various pieces of CTS