Merge "Minor fixes for CTS tests"