Fix issue with unique type name generation
Bump version
Fix bug and add test-suite