Fix CTYP-45 with test.