extracting components now that Importer is doing too much
switching to flat-file tests for scenarios