Add standard importer
Edit test cases.