diff --git a/TelegramBotBaseTest/Tests/Controls/ButtonGridForm.cs b/TelegramBotBaseTest/Tests/Controls/ButtonGridForm.cs
index 8bafd5a..82ed2cc 100644
--- a/TelegramBotBaseTest/Tests/Controls/ButtonGridForm.cs
+++ b/TelegramBotBaseTest/Tests/Controls/ButtonGridForm.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using TelegramBotBase.Args;
 using TelegramBotBase.Controls;
 using TelegramBotBase.Form;
 
@@ -20,7 +21,7 @@ namespace TelegramBotBaseTest.Tests.Controls
             this.Init += ButtonGridForm_Init;
         }
 
-        private async Task ButtonGridForm_Init(object sender, TelegramBotBase.Base.InitEventArgs e)
+        private async Task ButtonGridForm_Init(object sender, InitEventArgs e)
         {
             m_Buttons = new ButtonGrid();
 
@@ -43,7 +44,7 @@ namespace TelegramBotBaseTest.Tests.Controls
 
         }
 
-        private async void Bg_ButtonClicked(object sender, TelegramBotBase.Base.ButtonClickedEventArgs e)
+        private async void Bg_ButtonClicked(object sender, ButtonClickedEventArgs e)
         {
             if (e.Button == null)
                 return;
diff --git a/TelegramBotBaseTest/Tests/Controls/CalendarPickerForm.cs b/TelegramBotBaseTest/Tests/Controls/CalendarPickerForm.cs
index 6dcccbe..ab2d1cd 100644
--- a/TelegramBotBaseTest/Tests/Controls/CalendarPickerForm.cs
+++ b/TelegramBotBaseTest/Tests/Controls/CalendarPickerForm.cs
@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using TelegramBotBase.Base;
 using TelegramBotBase.Form;
 using TelegramBotBase.Controls;
+using TelegramBotBase.Args;
 
 namespace TelegramBotBaseTest.Tests.Controls
 {
diff --git a/TelegramBotBaseTest/Tests/Controls/MonthPickerForm.cs b/TelegramBotBaseTest/Tests/Controls/MonthPickerForm.cs
index 3eb1403..f2a86c7 100644
--- a/TelegramBotBaseTest/Tests/Controls/MonthPickerForm.cs
+++ b/TelegramBotBaseTest/Tests/Controls/MonthPickerForm.cs
@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using TelegramBotBase.Base;
 using TelegramBotBase.Form;
 using TelegramBotBase.Controls;
+using TelegramBotBase.Args;
 
 namespace TelegramBotBaseTest.Tests.Controls
 {
diff --git a/TelegramBotBaseTest/Tests/Controls/ToggleButtons.cs b/TelegramBotBaseTest/Tests/Controls/ToggleButtons.cs
index 7d6c523..ba34947 100644
--- a/TelegramBotBaseTest/Tests/Controls/ToggleButtons.cs
+++ b/TelegramBotBaseTest/Tests/Controls/ToggleButtons.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using TelegramBotBase.Args;
 using TelegramBotBase.Controls;
 using TelegramBotBase.Form;
 
@@ -17,7 +18,7 @@ namespace TelegramBotBaseTest.Tests.Controls
             this.Init += ToggleButtons_Init;
         }
 
-        private async Task ToggleButtons_Init(object sender, TelegramBotBase.Base.InitEventArgs e)
+        private async Task ToggleButtons_Init(object sender, InitEventArgs e)
         {
 
             var tb = new ToggleButton();
diff --git a/TelegramBotBaseTest/Tests/Controls/TreeViewForms.cs b/TelegramBotBaseTest/Tests/Controls/TreeViewForms.cs
index eee493e..b083075 100644
--- a/TelegramBotBaseTest/Tests/Controls/TreeViewForms.cs
+++ b/TelegramBotBaseTest/Tests/Controls/TreeViewForms.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using TelegramBotBase.Form;
 using TelegramBotBase.Controls;
 using TelegramBotBase.Base;
+using TelegramBotBase.Args;
 
 namespace TelegramBotBaseTest.Tests.Controls
 {
@@ -21,7 +22,7 @@ namespace TelegramBotBaseTest.Tests.Controls
             this.Init += TreeViewForms_Init;
         }
 
-        private async Task TreeViewForms_Init(object sender, TelegramBotBase.Base.InitEventArgs e)
+        private async Task TreeViewForms_Init(object sender, InitEventArgs e)
         {
             view = new TreeView();
 
diff --git a/TelegramBotBaseTest/Tests/Groups/GroupChange.cs b/TelegramBotBaseTest/Tests/Groups/GroupChange.cs
index 3c2cc42..2322b9f 100644
--- a/TelegramBotBaseTest/Tests/Groups/GroupChange.cs
+++ b/TelegramBotBaseTest/Tests/Groups/GroupChange.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
+using TelegramBotBase.Args;
 using TelegramBotBase.Base;
 using TelegramBotBase.Form;
 
diff --git a/TelegramBotBaseTest/Tests/Groups/LinkReplaceTest.cs b/TelegramBotBaseTest/Tests/Groups/LinkReplaceTest.cs
index c7ef39f..2006105 100644
--- a/TelegramBotBaseTest/Tests/Groups/LinkReplaceTest.cs
+++ b/TelegramBotBaseTest/Tests/Groups/LinkReplaceTest.cs
@@ -79,6 +79,10 @@ namespace TelegramBotBaseTest.Tests.Groups
             if (e.Message.From.IsBot)
                 return;
 
+            //Are urls inside his message ?
+            if (!HasLinks(e.MessageText))
+                return;
+
             var u = await Device.GetChatUser(from);
 
             //Don't kick Admins or Creators
@@ -88,11 +92,6 @@ namespace TelegramBotBaseTest.Tests.Groups
                 return;
             }
 
-            //Are urls inside his message ?
-            if (!HasLinks(e.MessageText))
-                return;
-
-
             await e.Device.DeleteMessage(e.MessageId);
 
             var cp = new ChatPermissions();
diff --git a/TelegramBotBaseTest/Tests/Groups/WelcomeUser.cs b/TelegramBotBaseTest/Tests/Groups/WelcomeUser.cs
index ffaa887..c90a3b9 100644
--- a/TelegramBotBaseTest/Tests/Groups/WelcomeUser.cs
+++ b/TelegramBotBaseTest/Tests/Groups/WelcomeUser.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using TelegramBotBase.Base;
 using TelegramBotBase.Form;
+using TelegramBotBase.Args;
 
 namespace TelegramBotBaseTest.Tests.Groups
 {
diff --git a/TelegramBotBaseTest/Tests/Register/Steps/Step1.cs b/TelegramBotBaseTest/Tests/Register/Steps/Step1.cs
index 3bc0acc..1952a1b 100644
--- a/TelegramBotBaseTest/Tests/Register/Steps/Step1.cs
+++ b/TelegramBotBaseTest/Tests/Register/Steps/Step1.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using TelegramBotBase.Args;
 using TelegramBotBase.Base;
 using TelegramBotBase.Form;