diff --git a/BotSharp.Core/Engines/AgentImporterInDialogflow.cs b/BotSharp.Core/Engines/AgentImporterInDialogflow.cs
index 437541ef..4cbb312d 100644
--- a/BotSharp.Core/Engines/AgentImporterInDialogflow.cs
+++ b/BotSharp.Core/Engines/AgentImporterInDialogflow.cs
@@ -83,7 +83,7 @@ namespace BotSharp.Core.Engines
                         intentJson = intentJson.Replace("\"prompts\":", "\"promptList\":");
 
                         var intent = JsonConvert.DeserializeObject<DialogflowIntent>(intentJson);
-
+                        intent.Name = intent.Name.Replace("/","_");
                         // load user expressions
                         if (fileName.Contains("Default Fallback Intent"))
                         {
diff --git a/BotSharp.UnitTest/AgentTest.cs b/BotSharp.UnitTest/AgentTest.cs
index ad36ab05..de8063f0 100644
--- a/BotSharp.UnitTest/AgentTest.cs
+++ b/BotSharp.UnitTest/AgentTest.cs
@@ -24,7 +24,7 @@ namespace BotSharp.UnitTest
                 UserId = Guid.NewGuid().ToString()
             };
             var rasa = new RasaAi(dc);
-            
+            rasa.agent = agent;
             int row = dc.DbTran(() => rasa.agent.SaveAgent(dc));
         }
 
@@ -38,7 +38,7 @@ namespace BotSharp.UnitTest
                 Language = "en"
             };
             var rasa = new RasaAi(dc);
-
+            rasa.agent = agent;
             int row = dc.DbTran(() => rasa.agent.SaveAgent(dc));
         }
 
@@ -48,7 +48,7 @@ namespace BotSharp.UnitTest
             var rasa = new RasaAi(dc);
             var importer = new AgentImporterInDialogflow();
 
-            string dataDir = $"{Database.ContentRootPath}\\App_Data\\DbInitializer\\Agents\\";
+            string dataDir =  $"{Database.ContentRootPath}\\App_Data\\DbInitializer\\Agents\\";
             var agent = rasa.RestoreAgent(importer, BOT_NAME, dataDir);
             agent.Id = BOT_ID;
             agent.ClientAccessToken = BOT_CLIENT_TOKEN;