Merge "Fix RS CTS tests."