Merge "Clean up failing CTS tests after refactor" into mnc-dev