Use optional_import_block in autogen and tests to handle missing imports

Use optional_import_block in autogen and tests to handle missing imports #89