Add basic custom types section, test fixes