Minor updates to Generator, introduced type converter tests