Resolve typedefs in function return types
Add misisng dictionary
Merge pull request #6950 from wmtan/ResolveTypedefsInUnitTest

Resolve typedefs in unit test