Merge "Refactor some code in Telecom CTS tests" into mnc-dev