Collecting type from CaseDef fixed, new test case added