Adding null importer. Additional tests.