Diag fixes. Extending import test.