Revisions to Importer and Its Automated Tests

Lots of failures. Not impressed. Working toward #166 and #167.