Added some more tests around the type functions
Shortened fluent interface