Fix trivial-types type name
Add tests