Merge pull request #3118 from clumens/cts-tests-batch-2-prep
CTS updates before the next batch of refactorings