Merge pull request #12023 from compucorp/refactor-case-type-tests