Fix CT tests with recent changes.