Fixed Importer & web tests