Tests and fix for function type parsing issue
Merge branch 'bug/module-parsing-issues'