Merge "Add CTS tests for MC and TAC"