Unit tests for import site

Also fixes a name collision bug in import_site