Merge "Fix RTT CTS tests"