Merge pull request #12869 from Tithen-Firion/cbc-update-tests