Add test coverage for import, and fix failing tests due to changes in message structure.
Reflect import method signature change in comments.