Reviewed imports for schemata/types. More PEP8-friendly tests