Tweak debug statements
Fix tests

The import/export tests are not really testing the right thing.