Improve test coverage

In particular, since !6 (merged), we need to improve testing for:

• Test YAML loading code
• Test IMPORT functionality