Improved test asserts.
Added support for simplified type names.
Fix simple model names across model and apis.