diff --git a/UptimeSharp.Tests/MonitorsTest.cs b/UptimeSharp.Tests/MonitorsTest.cs
index 2ee74ea..d743f48 100644
--- a/UptimeSharp.Tests/MonitorsTest.cs
+++ b/UptimeSharp.Tests/MonitorsTest.cs
@@ -14,78 +14,98 @@ namespace UptimeSharp.Tests
     [Fact]
     public async void AddHTTPMonitor()
     {
-      Assert.NotNull(await client.AddMonitor(
+      Monitor monitor;
+      Assert.NotNull(monitor = await client.AddMonitor(
         name: "test_1",
         target: "http://test1.com"
       ));
+
+      await client.DeleteMonitor(monitor);
     }
 
 
     [Fact]
     public async Task AddKeywordMonitor()
     {
-      Assert.NotNull(await client.AddMonitor(
+      Monitor monitor;
+      Assert.NotNull(monitor = await client.AddMonitor(
         name: "test_2",
         target: "http://test2.com",
         type: Models.Type.Keyword,
         keywordType: KeywordType.Exists,
         keywordValue: "test"
       ));
+
+      await client.DeleteMonitor(monitor);
     }
 
 
     [Fact]
     public async Task AddPingMonitor()
     {
-      Assert.NotNull(await client.AddMonitor(
+      Monitor monitor;
+      Assert.NotNull(monitor = await client.AddMonitor(
         name: "test_3",
         target: "http://test3.com",
         type: Models.Type.Ping
       ));
+
+      await client.DeleteMonitor(monitor);
     }
 
 
     [Fact]
     public async Task AddPortMonitor()
     {
-      Assert.NotNull(await client.AddMonitor(
+      Monitor monitor;
+      Assert.NotNull(monitor = await client.AddMonitor(
         name: "test_4",
         target: "127.0.0.1",
         type: Models.Type.Port,
         subtype: Subtype.Custom,
         port: 50004
       ));
+
+      await client.DeleteMonitor(monitor);
     }
 
 
     [Fact]
     public async Task GetMonitors()
     {
-      //Assert.True(await client.AddMonitor(
-      //  name: "test_5",
-      //  target: "255.0.0.1",
-      //  type: Models.Type.Port,
-      //  subtype: Subtype.HTTP
-      //));
-
-      List<Monitor> items = await client.GetMonitors();
-      Monitor monitor = items.SingleOrDefault(item => item.Name == "test_5");
+      Monitor monitor;
+      Assert.NotNull(monitor = await client.AddMonitor(
+        name: "test_5",
+        target: "255.0.0.1",
+        type: Models.Type.Port,
+        subtype: Subtype.HTTP
+      ));
 
       Assert.True(
         monitor != null
         && monitor.Target == "255.0.0.1"
         && monitor.Type == Models.Type.Port
         && monitor.Subtype == Subtype.HTTP);
+
+      monitor = await client.GetMonitor(monitor.ID);
+
+      Assert.True(
+        monitor != null
+        && monitor.Target == "255.0.0.1"
+        && monitor.Type == Models.Type.Port
+        && monitor.Subtype == Subtype.HTTP);
+
+      await client.DeleteMonitor(monitor);
     }
 
 
     [Fact]
     public async Task ModifyAMonitor()
     {
-      //Assert.NotNull(await client.AddMonitor(
-      //  name: "test_6",
-      //  target: "http://test6.com"
-      //));
+      Assert.NotNull(await client.AddMonitor(
+        name: "test_6",
+        target: "http://test6.com"
+      ));
 
       List<Monitor> items = await client.GetMonitors();
       Monitor monitor = items.SingleOrDefault(item => item.Name == "test_6");
@@ -99,6 +119,8 @@ namespace UptimeSharp.Tests
       monitor = await client.GetMonitor(monitor.ID);
 
       Assert.Equal(monitor.Name, "updated_test_6");
+
+      await client.DeleteMonitor(monitor);
     }
   }
 }
diff --git a/UptimeSharp/Components/Monitor.cs b/UptimeSharp/Components/Monitor.cs
index 8a9e65c..51a8eeb 100644
--- a/UptimeSharp/Components/Monitor.cs
+++ b/UptimeSharp/Components/Monitor.cs
@@ -81,7 +81,7 @@ namespace UptimeSharp
     /// <exception cref="UptimeSharpException"></exception>
     public async Task<bool> DeleteMonitor(string monitorId, CancellationToken cancellationToken = default(CancellationToken))
     {
-      return (await Request<DefaultResponse>("getMonitors", cancellationToken, new Dictionary<string, string>()
+      return (await Request<DefaultResponse>("deleteMonitor", cancellationToken, new Dictionary<string, string>()
       {
         { "monitorID", monitorId }
       })).Success;
@@ -125,7 +125,8 @@ namespace UptimeSharp
       string target,
       Type type = Type.HTTP,
       Subtype subtype = Subtype.Unknown,
-      int? port = null, string keywordValue = null,
+      int? port = null,
+      string keywordValue = null,
       KeywordType keywordType = KeywordType.Unknown,
       string[] alerts = null,
       string HTTPUsername = null,
@@ -152,6 +153,7 @@ namespace UptimeSharp
       if (monitor != null)
       {
         monitor.Name = name;
+        monitor.Target = target;
         monitor.Type = type;
         monitor.Subtype = subtype;
         monitor.Port = port;