diff --git a/Octoposh.Tests/GetOctopusChannelTests.cs b/Octoposh.Tests/GetOctopusChannelTests.cs
index 72680cf5..4d85a194 100644
--- a/Octoposh.Tests/GetOctopusChannelTests.cs
+++ b/Octoposh.Tests/GetOctopusChannelTests.cs
@@ -46,7 +46,7 @@ public void GetChannelBySingleNameAndSingleProject()
             Console.WriteLine("Looking for a channel with name [{0}] in project [{1}]", channelName,projectName);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusChannel>>()[0];
+            var results = powershell.Invoke<OutputOctopusChannel>();
 
             Console.WriteLine("Found [{0}] channels", results.Count);
             Assert.AreEqual(1,results.Count);
@@ -80,7 +80,7 @@ public void GetChannelBySingleNameAndMultipleProjects()
             Console.WriteLine("Looking for channels with name [{0}] in [{1}] projects", channelName, projectNames.Length);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusChannel>>()[0];
+            var results = powershell.Invoke<OutputOctopusChannel>();
 
             Console.WriteLine("Found [{0}] channels", results.Count);
 
@@ -112,7 +112,7 @@ public void GetChannelBySingleNameInAllProjects()
             Console.WriteLine("Looking for channels with name [{0}] ", channelName);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusChannel>>()[0];
+            var results = powershell.Invoke<OutputOctopusChannel>();
 
             Console.WriteLine("Found [{0}] channels", results.Count);
             Assert.Greater(results.Count,1);
@@ -152,7 +152,7 @@ public void GetChannelByMultipleNamesAndSingleProject()
             Console.WriteLine("Looking for a channels with names [{0}] and [{1}] in project", name1, name2,projectName);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusChannel>>()[0];
+            var results = powershell.Invoke<OutputOctopusChannel>();
 
             Console.WriteLine("Found [{0}] channels", results.Count);
             Assert.AreEqual(names.Length,results.Count);
@@ -203,7 +203,7 @@ public void GetChannelByMultipleNamesInAllProjects()
             Console.WriteLine("Looking for a channels with names [{0}] or [{1}]", name1, name2);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusChannel>>()[0];
+            var results = powershell.Invoke<OutputOctopusChannel>();
 
             Console.WriteLine("Found [{0}] channels", results.Count);
 
diff --git a/Octoposh.Tests/GetOctopusDashboardTests.cs b/Octoposh.Tests/GetOctopusDashboardTests.cs
index 64ebec5c..f11e512d 100644
--- a/Octoposh.Tests/GetOctopusDashboardTests.cs
+++ b/Octoposh.Tests/GetOctopusDashboardTests.cs
@@ -30,7 +30,7 @@ public void GetDashboardBySingleProject()
             };
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusDashboardEntry>>()[0];
+            var results = powershell.Invoke<OutputOctopusDashboardEntry>();
 
             Assert.Greater(results.Count, 0);
             foreach (var item in results)
@@ -57,7 +57,7 @@ public void GetDashboardByMultipleProjects()
             };
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusDashboardEntry>>()[0];
+            var results = powershell.Invoke<OutputOctopusDashboardEntry>();
 
             Assert.Greater(results.Count, 0);
             foreach (var item in results)
@@ -96,7 +96,7 @@ public void GetDashboardBySingleEnvironment()
             };
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusDashboardEntry>>()[0];
+            var results = powershell.Invoke<OutputOctopusDashboardEntry>();
 
             Assert.Greater(results.Count, 0);
             foreach (var item in results)
@@ -125,7 +125,7 @@ public void GetDashboardByMultipleEnvironments()
             };
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusDashboardEntry>>()[0];
+            var results = powershell.Invoke<OutputOctopusDashboardEntry>();
 
             Assert.Greater(results.Count, 0);
             foreach (var item in results)
@@ -164,7 +164,7 @@ public void GetDashboardBySingleStatus()
             };
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusDashboardEntry>>()[0];
+            var results = powershell.Invoke<OutputOctopusDashboardEntry>();
 
             Assert.Greater(results.Count, 0);
             foreach (var item in results)
@@ -193,7 +193,7 @@ public void GetDashboardByMultipleStatuses()
             };
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusDashboardEntry>>()[0];
+            var results = powershell.Invoke<OutputOctopusDashboardEntry>();
 
             Assert.Greater(results.Count, 0);
             foreach (var item in results)
@@ -231,7 +231,7 @@ public void GetDashboardByProjectAndEnvironment()
 
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusDashboardEntry>>()[0];
+            var results = powershell.Invoke<OutputOctopusDashboardEntry>();
 
             Assert.Greater(results.Count,0);
             
@@ -256,7 +256,7 @@ public void GetDashboardByProjectAndStatus()
 
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusDashboardEntry>>()[0];
+            var results = powershell.Invoke<OutputOctopusDashboardEntry>();
 
             Assert.Greater(results.Count, 0);
 
@@ -281,7 +281,7 @@ public void GetDashboardByEnvironmentAndStatus()
 
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusDashboardEntry>>()[0];
+            var results = powershell.Invoke<OutputOctopusDashboardEntry>();
 
             Assert.Greater(results.Count, 0);
 
@@ -296,7 +296,7 @@ public void GetDashboardByEnvironmentAndStatus()
         public void GetDashboardWithoutParametersReturnsValues()
         {
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType);
-            var results = powershell.Invoke<List<OutputOctopusDashboardEntry>>()[0];
+            var results = powershell.Invoke<OutputOctopusDashboardEntry>();
 
             Assert.Greater(results.Count, 0);
         }
diff --git a/Octoposh.Tests/GetOctopusDeploymentTests.cs b/Octoposh.Tests/GetOctopusDeploymentTests.cs
index e90b49ba..3d337519 100644
--- a/Octoposh.Tests/GetOctopusDeploymentTests.cs
+++ b/Octoposh.Tests/GetOctopusDeploymentTests.cs
@@ -45,7 +45,7 @@ public void GetDeploymentBySingleEnvironmentAndProject()
             };
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusDeployment>>()[0];
+            var results = powershell.Invoke<OutputOctopusDeployment>();
 
             Assert.Greater(results.Count, 0);
 
@@ -79,7 +79,7 @@ public void GetDeploymentByMultipleEnvironments()
             };
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusDeployment>>()[0];
+            var results = powershell.Invoke<OutputOctopusDeployment>();
 
             Assert.Greater(results.Count, 0);
 
@@ -111,7 +111,7 @@ public void GetDeploymentByMultipleProjects()
             };
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusDeployment>>()[0];
+            var results = powershell.Invoke<OutputOctopusDeployment>();
 
             Assert.Greater(results.Count, 0);
 
@@ -145,7 +145,7 @@ public void GetDeploymentBySingleRelease()
             };
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusDeployment>>()[0];
+            var results = powershell.Invoke<OutputOctopusDeployment>();
 
             Assert.Greater(results.Count, 0);
 
@@ -184,7 +184,7 @@ public void GetDeploymentByMultipleReleases()
             };
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusDeployment>>()[0];
+            var results = powershell.Invoke<OutputOctopusDeployment>();
 
             Assert.Greater(results.Count, 0);
 
@@ -221,7 +221,7 @@ public void GetDeploymentByLatestReleases()
             };
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusDeployment>>()[0];
+            var results = powershell.Invoke<OutputOctopusDeployment>();
 
             Assert.Greater(results.Count, 0);
 
@@ -262,7 +262,7 @@ public void GetDeploymentAfterDate()
             };
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusDeployment>>()[0];
+            var results = powershell.Invoke<OutputOctopusDeployment>();
 
             Assert.Greater(results.Count, 0);
 
@@ -305,7 +305,7 @@ public void GetDeploymentBeforeDate()
             };
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusDeployment>>()[0];
+            var results = powershell.Invoke<OutputOctopusDeployment>();
 
             Assert.Greater(results.Count, 0);
 
diff --git a/Octoposh.Tests/GetOctopusEnvironmentTests.cs b/Octoposh.Tests/GetOctopusEnvironmentTests.cs
index 6fdc0993..4dd7d308 100644
--- a/Octoposh.Tests/GetOctopusEnvironmentTests.cs
+++ b/Octoposh.Tests/GetOctopusEnvironmentTests.cs
@@ -27,11 +27,11 @@ public void GetEnvironmentBySingleName()
             };
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType,parameters);
-            var results = powershell.Invoke<List<OutputOctopusEnvironment>>();
+            var results = powershell.Invoke<OutputOctopusEnvironment>();
 
-            Assert.AreEqual(results[0].Count, 1);
+            Assert.AreEqual(results.Count, 1);
             Console.WriteLine("Items Found:");
-            foreach (var item in results[0])
+            foreach (var item in results)
             {
                 Console.WriteLine(item.Name);
             }
@@ -46,12 +46,12 @@ public void GetEnvironmentsByMultipleNames()
             }};
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusEnvironment>>();
+            var results = powershell.Invoke<OutputOctopusEnvironment>();
 
-            Assert.AreEqual(results[0].Count, 2);
+            Assert.AreEqual(results.Count, 2);
 
             Console.WriteLine("Items Found:");
-            foreach (var item in results[0])
+            foreach (var item in results)
             {
                 Console.WriteLine(item.Name);
             }
@@ -72,12 +72,12 @@ public void GetEnvironmentsByNameUsingWildcard()
             var pattern = new WildcardPattern(namePattern);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusEnvironment>>();
+            var results = powershell.Invoke<OutputOctopusEnvironment>();
 
-            Assert.Greater(results[0].Count, 0);
-            Console.WriteLine("Resources found: {0}",results[0].Count);
+            Assert.Greater(results.Count, 0);
+            Console.WriteLine("Resources found: {0}",results.Count);
 
-            foreach (var item in results[0])
+            foreach (var item in results)
             {
                 Console.WriteLine("Resource name: {0}",item.Name);
                 Assert.IsTrue(pattern.IsMatch(item.Name));
@@ -95,9 +95,9 @@ public void DontGetEnvironmentsIfNameDoesntMatch()
             }};
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusEnvironment>>();
+            var results = powershell.Invoke<OutputOctopusEnvironment>();
 
-            Assert.AreEqual(results[0].Count, 0);
+            Assert.AreEqual(results.Count, 0);
         }
 
         [Test]
@@ -116,7 +116,7 @@ public void GetEnvironmentUsingResourceOnlyReturnsRawResource()
             var results = powershell.Invoke<List<EnvironmentResource>>();
 
             //If [results] has at least one item, It'll be of the base resource type meaning the test was successful
-            Assert.Greater(results[0].Count, 0);
+            Assert.Greater(results.Count, 0);
             ;
         }
     }
diff --git a/Octoposh.Tests/GetOctopusFeedTests.cs b/Octoposh.Tests/GetOctopusFeedTests.cs
index cd99af26..34c770d8 100644
--- a/Octoposh.Tests/GetOctopusFeedTests.cs
+++ b/Octoposh.Tests/GetOctopusFeedTests.cs
@@ -37,7 +37,7 @@ public void GetFeedBySingleName()
             Console.WriteLine("Looking for Feed [{0}]", feedName);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusFeed>>()[0];
+            var results = powershell.Invoke<OutputOctopusFeed>();
 
             Assert.AreEqual(1, results.Count);
 
@@ -65,7 +65,7 @@ public void GetFeedByMultipleNames()
             Console.WriteLine("Looking for Feeds [{0}] and [{1}]", feedName1, feedName2);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusFeed>>()[0];
+            var results = powershell.Invoke<OutputOctopusFeed>();
 
             Assert.AreEqual(2, results.Count);
 
@@ -107,7 +107,7 @@ public void GetFeedByNameUsingWildcard()
             var pattern = new WildcardPattern(namePattern);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusFeed>>()[0];
+            var results = powershell.Invoke<OutputOctopusFeed>();
 
             Assert.AreEqual(2, results.Count);
             Console.WriteLine("Resources found: {0}", results.Count);
@@ -130,7 +130,7 @@ public void DontGetFeedIfNameDoesntMatch()
             }};
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusFeed>>()[0];
+            var results = powershell.Invoke<OutputOctopusFeed>();
 
             Assert.AreEqual(results.Count, 0);
             Console.WriteLine("No resources found with name [{0}]", resourceName);
diff --git a/Octoposh.Tests/GetOctopusLifecycleTests.cs b/Octoposh.Tests/GetOctopusLifecycleTests.cs
index 27770e7e..a74eba61 100644
--- a/Octoposh.Tests/GetOctopusLifecycleTests.cs
+++ b/Octoposh.Tests/GetOctopusLifecycleTests.cs
@@ -37,7 +37,7 @@ public void GetLifecycleBySingleName()
             Console.WriteLine("Looking for Lifecycle [{0}]", lifecycleName);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusLifecycle>>()[0];
+            var results = powershell.Invoke<OutputOctopusLifecycle>();
 
             Assert.AreEqual(1, results.Count);
 
@@ -65,7 +65,7 @@ public void GetLifecycleByMultipleNames()
             Console.WriteLine("Looking for Lifecycles [{0}] and [{1}]", lifecycleName1, lifecycleName2);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusLifecycle>>()[0];
+            var results = powershell.Invoke<OutputOctopusLifecycle>();
 
             Assert.AreEqual(2, results.Count);
 
@@ -107,7 +107,7 @@ public void GetLifecycleByNameUsingWildcard()
             var pattern = new WildcardPattern(namePattern);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusLifecycle>>()[0];
+            var results = powershell.Invoke<OutputOctopusLifecycle>();
 
             Assert.AreEqual(2, results.Count);
             Console.WriteLine("Resources found: {0}", results.Count);
@@ -130,7 +130,7 @@ public void DontGetLifecycleIfNameDoesntMatch()
             }};
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusLifecycle>>()[0];
+            var results = powershell.Invoke<OutputOctopusLifecycle>();
 
             Assert.AreEqual(results.Count, 0);
             Console.WriteLine("No resources found with name [{0}]", resourceName);
diff --git a/Octoposh.Tests/GetOctopusMachineTests.cs b/Octoposh.Tests/GetOctopusMachineTests.cs
index 9e0aa92d..0caa3f2c 100644
--- a/Octoposh.Tests/GetOctopusMachineTests.cs
+++ b/Octoposh.Tests/GetOctopusMachineTests.cs
@@ -36,12 +36,12 @@ public void GetMachineBySingleName()
             Console.WriteLine("Looking for resource with name [{0}]",name);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusMachine>>();
+            var results = powershell.Invoke<OutputOctopusMachine>();
 
-            Assert.AreEqual(1, results[0].Count);
+            Assert.AreEqual(1, results.Count);
 
             Console.WriteLine("Found [{0}]");
-            foreach (var item in results[0])
+            foreach (var item in results)
             {
                 Console.WriteLine(item.Name);
             }
@@ -61,7 +61,7 @@ public void GetMachineByMultipleNames()
 
             Console.WriteLine("Looking for [{0}] machines with the names [{1}]",names.Length,names);
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusMachine>>()[0];
+            var results = powershell.Invoke<OutputOctopusMachine>();
 
             Console.WriteLine("Found [{0}] resources", results.Count);
             Assert.AreEqual(2,results.Count);
@@ -89,7 +89,7 @@ public void GetMachinesByNameUsingWildcard()
             var pattern = new WildcardPattern(namePattern);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusMachine>>()[0];
+            var results = powershell.Invoke<OutputOctopusMachine>();
 
             Console.WriteLine("Resources found: {0}", results.Count);
             Assert.Greater(results.Count, 0);
@@ -114,7 +114,7 @@ public void DontGetMachineIfNameDoesntMatch()
 
             Console.WriteLine("Looking for a machine with the name [{0}]",name);
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusMachine>>()[0];
+            var results = powershell.Invoke<OutputOctopusMachine>();
 
             Assert.AreEqual(results.Count, 0);
             Console.WriteLine("Machine with name [{0}] not found", name);
@@ -133,11 +133,11 @@ public void GetMachineByCommunicationStyle()
                 }};
 
                 var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-                var results = powershell.Invoke<List<OutputOctopusMachine>>();
+                var results = powershell.Invoke<OutputOctopusMachine>();
 
                 if (results != null)
                 {
-                    foreach (var result in results[0])
+                    foreach (var result in results)
                     {
                         Assert.AreEqual(result.CommunicationStyle, style);
                     }
diff --git a/Octoposh.Tests/GetOctopusProjectGroupTests.cs b/Octoposh.Tests/GetOctopusProjectGroupTests.cs
index d016f05b..0e943f6f 100644
--- a/Octoposh.Tests/GetOctopusProjectGroupTests.cs
+++ b/Octoposh.Tests/GetOctopusProjectGroupTests.cs
@@ -28,11 +28,11 @@ public void GetProjectGroupBySingleName()
 
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusProjectGroup>>();
+            var results = powershell.Invoke<OutputOctopusProjectGroup>();
 
-            Assert.AreEqual(results[0].Count, 1);
+            Assert.AreEqual(results.Count, 1);
             Console.WriteLine("Items Found:");
-            foreach (var item in results[0])
+            foreach (var item in results)
             {
                 Console.WriteLine(item.Name);
             }
@@ -49,12 +49,12 @@ public void GetProjectGroupsByMultipleNames()
             }};
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusProjectGroup>>();
+            var results = powershell.Invoke<OutputOctopusProjectGroup>();
 
-            Assert.AreEqual(results[0].Count, 2);
+            Assert.AreEqual(results.Count, 2);
 
             Console.WriteLine("Items Found:");
-            foreach (var item in results[0])
+            foreach (var item in results)
             {
                 Console.WriteLine(item.Name);
             }
@@ -75,12 +75,12 @@ public void GetProjectGroupsByNameUsingWildcard()
             var pattern = new WildcardPattern(namePattern);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusProjectGroup>>();
+            var results = powershell.Invoke<OutputOctopusProjectGroup>();
 
-            Assert.Greater(results[0].Count, 0);
-            Console.WriteLine("Resources found: {0}", results[0].Count);
+            Assert.Greater(results.Count, 0);
+            Console.WriteLine("Resources found: {0}", results.Count);
 
-            foreach (var item in results[0])
+            foreach (var item in results)
             {
                 Console.WriteLine("Resource name: {0}", item.Name);
                 Assert.IsTrue(pattern.IsMatch(item.Name));
@@ -98,9 +98,9 @@ public void DontGetProjectGroupIfNameDoesntMatch()
             }};
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusProjectGroup>>();
+            var results = powershell.Invoke<OutputOctopusProjectGroup>();
 
-            Assert.AreEqual(results[0].Count, 0);
+            Assert.AreEqual(results.Count, 0);
         }
 
         [Test]
@@ -116,10 +116,10 @@ public void GetProjectGroupUsingResourceOnlyReturnsRawResource()
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
 
-            var results = powershell.Invoke<List<ProjectGroupResource>>();
+            var results = powershell.Invoke<ProjectGroupResource>();
 
             //If [results] has at least one item, It'll be of the base resource type meaning the test was successful
-            Assert.Greater(results[0].Count, 0);
+            Assert.Greater(results.Count, 0);
             ;
         }
     }
diff --git a/Octoposh.Tests/GetOctopusProjectTests.cs b/Octoposh.Tests/GetOctopusProjectTests.cs
index 169d937d..dec45ac6 100644
--- a/Octoposh.Tests/GetOctopusProjectTests.cs
+++ b/Octoposh.Tests/GetOctopusProjectTests.cs
@@ -30,11 +30,11 @@ public void GetProjectBySingleName()
 
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusProject>>();
+            var results = powershell.Invoke<OutputOctopusProject>();
 
-            Assert.AreEqual(results[0].Count, 1);
+            Assert.AreEqual(results.Count, 1);
             Console.WriteLine("Items Found:");
-            foreach (var item in results[0])
+            foreach (var item in results)
             {
                 Console.WriteLine(item.Name);
             }
@@ -49,13 +49,13 @@ public void GetProjectsByMultipleNames()
             }};
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusProject>>();
+            var results = powershell.Invoke<OutputOctopusProject>();
 
             //todo this test sucks
-            Assert.AreEqual(results[0].Count, 2);
+            Assert.AreEqual(results.Count, 2);
 
             Console.WriteLine("Items Found:");
-            foreach (var item in results[0])
+            foreach (var item in results)
             {
                 Console.WriteLine(item.Name);
             }
@@ -76,12 +76,12 @@ public void GetProjectsByNameUsingWildcard()
             var pattern = new WildcardPattern(namePattern);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusProject>>();
+            var results = powershell.Invoke<OutputOctopusProject>();
 
-            Assert.Greater(results[0].Count, 0);
-            Console.WriteLine("Resources found: {0}", results[0].Count);
+            Assert.Greater(results.Count, 0);
+            Console.WriteLine("Resources found: {0}", results.Count);
 
-            foreach (var item in results[0])
+            foreach (var item in results)
             {
                 Console.WriteLine("Resource name: {0}", item.Name);
                 Assert.IsTrue(pattern.IsMatch(item.Name));
@@ -99,7 +99,7 @@ public void DontGetProjectIfNameDoesntMatch()
             }};
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusProject>>()[0];
+            var results = powershell.Invoke<OutputOctopusProject>();
 
             Assert.AreEqual(results.Count, 0);
         }
@@ -115,9 +115,9 @@ public void GetProjectByProjectGroup()
             }};
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusProject>>();
+            var results = powershell.Invoke<OutputOctopusProject>();
 
-            foreach (var result in results[0])
+            foreach (var result in results)
             {
                 Assert.AreEqual(result.ProjectGroupName, projectGroupName);
             }
@@ -139,7 +139,7 @@ public void GetProjectUsingResourceOnlyReturnsRawResource()
             var results = powershell.Invoke<List<ProjectResource>>();
 
             //If [results] has at least one item, It'll be of the base resource type meaning the test was successful
-            Assert.Greater(results[0].Count, 0);
+            Assert.Greater(results.Count, 0);
             ;
         }
 
diff --git a/Octoposh.Tests/GetOctopusReleaseTests.cs b/Octoposh.Tests/GetOctopusReleaseTests.cs
index 621120c1..3da364d0 100644
--- a/Octoposh.Tests/GetOctopusReleaseTests.cs
+++ b/Octoposh.Tests/GetOctopusReleaseTests.cs
@@ -31,7 +31,7 @@ public void GetReleaseByProject()
             };
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusRelease>>()[0];
+            var results = powershell.Invoke<OutputOctopusRelease>();
 
             Console.WriteLine("Found [{0}] releases",results.Count);
             Assert.Greater(results.Count,1);
@@ -63,7 +63,7 @@ public void GetReleaseBySingleVersion()
             };
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusRelease>>()[0];
+            var results = powershell.Invoke<OutputOctopusRelease>();
 
             Assert.IsTrue(results.Count == 1);
             Assert.AreEqual(results[0].ReleaseVersion, ReleaseVersion);
@@ -90,7 +90,7 @@ public void GetReleaseByMultipleVersions()
             };
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusRelease>>()[0];
+            var results = powershell.Invoke<OutputOctopusRelease>();
 
             Console.WriteLine("Found [{0}] Releases",results.Count);
             Assert.IsTrue(results.Count == 2);
@@ -130,7 +130,7 @@ public void GetReleaseByMultipleVersionsWithUnexisting()
             Console.WriteLine("Looking for releases with version numbers [{0}] and [{1}]. The test expects to find only 1 release with version [{1}] for the project [{2}]",badVersion,goodVersion,projectName);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusRelease>>()[0];
+            var results = powershell.Invoke<OutputOctopusRelease>();
 
             Console.WriteLine("Found [{0}] releases", results.Count);
             Assert.IsTrue(results.Count == 1);
@@ -164,7 +164,7 @@ public void GetReleaseUsingLatestX()
             Console.WriteLine("Looking for the last [{0}] releases for project [{1}]", latest, projectName);
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
 
-            var results = powershell.Invoke<List<OutputOctopusRelease>>()[0];
+            var results = powershell.Invoke<OutputOctopusRelease>();
 
             Console.WriteLine("Found [{0}] releases", results.Count);
             Assert.IsTrue(results.Count == latest);
diff --git a/Octoposh.Tests/GetOctopusServerThumbprintTests.cs b/Octoposh.Tests/GetOctopusServerThumbprintTests.cs
index 0f1bab3e..2277249d 100644
--- a/Octoposh.Tests/GetOctopusServerThumbprintTests.cs
+++ b/Octoposh.Tests/GetOctopusServerThumbprintTests.cs
@@ -27,7 +27,7 @@ public void GetThumbprint()
             Console.WriteLine("Getting thumbprint from Octopus server running on [{0}]", octopusUrl);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType);
-            var results = powershell.Invoke<string>()[0];
+            var results = powershell.Invoke<string>();
 
             Assert.NotNull(results);
 
diff --git a/Octoposh.Tests/GetOctopusTagSetTests.cs b/Octoposh.Tests/GetOctopusTagSetTests.cs
index 6bb9ea0c..c0d4165e 100644
--- a/Octoposh.Tests/GetOctopusTagSetTests.cs
+++ b/Octoposh.Tests/GetOctopusTagSetTests.cs
@@ -37,7 +37,7 @@ public void GetTagSetBySingleName()
             Console.WriteLine("Looking for TagSet [{0}]", tagSetName);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusTagSet>>()[0];
+            var results = powershell.Invoke<OutputOctopusTagSet>();
 
             Assert.AreEqual(1, results.Count);
 
@@ -65,7 +65,7 @@ public void GetTagSetByMultipleNames()
             Console.WriteLine("Looking for TagSets [{0}] and [{1}]", tagSetName1, tagSetName2);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusTagSet>>()[0];
+            var results = powershell.Invoke<OutputOctopusTagSet>();
 
             Assert.AreEqual(2, results.Count);
 
@@ -107,7 +107,7 @@ public void GetTagSetByNameUsingWildcard()
             var pattern = new WildcardPattern(namePattern);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusTagSet>>()[0];
+            var results = powershell.Invoke<OutputOctopusTagSet>();
 
             Assert.AreEqual(2, results.Count);
             Console.WriteLine("Resources found: {0}", results.Count);
@@ -130,7 +130,7 @@ public void DontGetTagSetIfNameDoesntMatch()
             }};
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusTagSet>>()[0];
+            var results = powershell.Invoke<OutputOctopusTagSet>();
 
             Assert.AreEqual(results.Count, 0);
             Console.WriteLine("No resources found with name [{0}]", resourceName);
diff --git a/Octoposh.Tests/GetOctopusTeamTests.cs b/Octoposh.Tests/GetOctopusTeamTests.cs
index ff57311e..097b3f33 100644
--- a/Octoposh.Tests/GetOctopusTeamTests.cs
+++ b/Octoposh.Tests/GetOctopusTeamTests.cs
@@ -37,7 +37,7 @@ public void GetTeamBySingleName()
             Console.WriteLine("Looking for Team [{0}]",teamName);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusTeam>>()[0];
+            var results = powershell.Invoke<OutputOctopusTeam>();
 
             Assert.AreEqual(1 ,results.Count);
 
@@ -65,7 +65,7 @@ public void GetTeamByMultipleNames()
             Console.WriteLine("Looking for Teams [{0}] and [{1}]", teamName1, teamName2);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusTeam>>()[0];
+            var results = powershell.Invoke<OutputOctopusTeam>();
 
             Assert.AreEqual(2, results.Count);
 
@@ -107,7 +107,7 @@ public void GetTeamByNameUsingWildcard()
             var pattern = new WildcardPattern(namePattern);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusTeam>>()[0];
+            var results = powershell.Invoke<OutputOctopusTeam>();
 
             Assert.AreEqual(2, results.Count);
             Console.WriteLine("Resources found: {0}", results.Count);
@@ -130,7 +130,7 @@ public void DontGetTeamIfNameDoesntMatch()
             }};
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusTeam>>()[0];
+            var results = powershell.Invoke<OutputOctopusTeam>();
 
             Assert.AreEqual(results.Count, 0);
             Console.WriteLine("No resources found with name [{0}]",resourceName);
diff --git a/Octoposh.Tests/GetOctopusTenantTests.cs b/Octoposh.Tests/GetOctopusTenantTests.cs
index 46878a8a..a84a7f51 100644
--- a/Octoposh.Tests/GetOctopusTenantTests.cs
+++ b/Octoposh.Tests/GetOctopusTenantTests.cs
@@ -37,7 +37,7 @@ public void GetTenantBySingleName()
             Console.WriteLine("Looking for Tenant [{0}]", tenantName);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusTenant>>()[0];
+            var results = powershell.Invoke<OutputOctopusTenant>();
 
             Assert.AreEqual(1, results.Count);
 
@@ -65,7 +65,7 @@ public void GetTenantByMultipleNames()
             Console.WriteLine("Looking for Tenants [{0}] and [{1}]", tenantName1, tenantName2);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusTenant>>()[0];
+            var results = powershell.Invoke<OutputOctopusTenant>();
 
             Assert.AreEqual(2, results.Count);
 
@@ -107,7 +107,7 @@ public void GetTenantByNameUsingWildcard()
             var pattern = new WildcardPattern(namePattern);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusTenant>>()[0];
+            var results = powershell.Invoke<OutputOctopusTenant>();
 
             Assert.AreEqual(2, results.Count);
             Console.WriteLine("Resources found: {0}", results.Count);
@@ -130,7 +130,7 @@ public void DontGetTenantIfNameDoesntMatch()
             }};
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusTenant>>()[0];
+            var results = powershell.Invoke<OutputOctopusTenant>();
 
             Assert.AreEqual(results.Count, 0);
             Console.WriteLine("No resources found with name [{0}]", resourceName);
diff --git a/Octoposh.Tests/GetOctopusToolVersionTests.cs b/Octoposh.Tests/GetOctopusToolVersionTests.cs
index 5968e84b..3bb14d2e 100644
--- a/Octoposh.Tests/GetOctopusToolVersionTests.cs
+++ b/Octoposh.Tests/GetOctopusToolVersionTests.cs
@@ -30,11 +30,11 @@ public class GetOctopusToolVersionTests
         [Test]
         public void NotPassingAParameterReturnsMultipleVersions()
         {
-            OctoposhEnvVariables.OctopusToolsFolder = Path.Combine(TestsUtilities.TestsPath,AssetsPath);
+            OctoposhEnvVariables.OctopusToolsFolder = Path.Combine(TestUtilities.TestsPath,AssetsPath);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType);
 
-            var results = powershell.Invoke<List<OctopusToolVersion>>()[0];
+            var results = powershell.Invoke<OctopusToolVersion>();
 
             Assert.IsTrue(results.Count > 1);
         }
@@ -42,7 +42,7 @@ public void NotPassingAParameterReturnsMultipleVersions()
         [Test]
         public void PassingLatestParameterReturnsHighestVersion()
         {
-            OctoposhEnvVariables.OctopusToolsFolder = Path.Combine(TestsUtilities.TestsPath, AssetsPath);
+            OctoposhEnvVariables.OctopusToolsFolder = Path.Combine(TestUtilities.TestsPath, AssetsPath);
 
             var parameters = new List<CmdletParameter>
             {
@@ -54,7 +54,7 @@ public void PassingLatestParameterReturnsHighestVersion()
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType,parameters);
 
-            var results = powershell.Invoke<List<OctopusToolVersion>>()[0];
+            var results = powershell.Invoke<OctopusToolVersion>();
 
             Assert.IsTrue(results.Count == 1);
             Assert.IsTrue(results[0].Version == Version.Parse(HighestVersion));
@@ -63,7 +63,7 @@ public void PassingLatestParameterReturnsHighestVersion()
         [Test]
         public void GetToolVersionByVersion()
         {
-            OctoposhEnvVariables.OctopusToolsFolder = Path.Combine(TestsUtilities.TestsPath, AssetsPath);
+            OctoposhEnvVariables.OctopusToolsFolder = Path.Combine(TestUtilities.TestsPath, AssetsPath);
             var version = Version1;
 
             var parameters = new List<CmdletParameter>
@@ -77,7 +77,7 @@ public void GetToolVersionByVersion()
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
 
-            var results = powershell.Invoke<List<OctopusToolVersion>>()[0];
+            var results = powershell.Invoke<OctopusToolVersion>();
 
             Assert.IsTrue(results.Count == 1);
             Assert.IsTrue(results[0].Version == Version.Parse(version));
@@ -86,7 +86,7 @@ public void GetToolVersionByVersion()
         [Test]
         public void ThrowIfItCantFindSpecificVersion()
         {
-            OctoposhEnvVariables.OctopusToolsFolder = Path.Combine(TestsUtilities.TestsPath, AssetsPath);
+            OctoposhEnvVariables.OctopusToolsFolder = Path.Combine(TestUtilities.TestsPath, AssetsPath);
             var version = FakeVersion;
 
             var parameters = new List<CmdletParameter>
@@ -108,7 +108,7 @@ public void ThrowIfItCantFindSpecificVersion()
         [Test]
         public void ThrowIfItToolsFolderDoesNotExist()
         {
-            OctoposhEnvVariables.OctopusToolsFolder = Path.Combine(TestsUtilities.TestsPath, FakePath);
+            OctoposhEnvVariables.OctopusToolsFolder = Path.Combine(TestUtilities.TestsPath, FakePath);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType);
 
@@ -120,7 +120,7 @@ public void ThrowIfItToolsFolderDoesNotExist()
         [Test]
         public void ThrowIfCantFindAnyOctoExeVersionsInFolder()
         {
-            OctoposhEnvVariables.OctopusToolsFolder = Path.Combine(TestsUtilities.TestsPath, EmptyPath);
+            OctoposhEnvVariables.OctopusToolsFolder = Path.Combine(TestUtilities.TestsPath, EmptyPath);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType);
             var ex = Assert.Throws<CmdletInvocationException>(() => powershell.Invoke<List<OctopusToolVersion>>());
diff --git a/Octoposh.Tests/GetOctopusUserTests.cs b/Octoposh.Tests/GetOctopusUserTests.cs
index dcfe2448..3d14aada 100644
--- a/Octoposh.Tests/GetOctopusUserTests.cs
+++ b/Octoposh.Tests/GetOctopusUserTests.cs
@@ -37,7 +37,7 @@ public void GetUserBySingleName()
             Console.WriteLine("Looking for User [{0}]", userName);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusUser>>()[0];
+            var results = powershell.Invoke<OutputOctopusUser>();
 
             Assert.AreEqual(1, results.Count);
 
@@ -65,7 +65,7 @@ public void GetUserByMultipleNames()
             Console.WriteLine("Looking for Users [{0}] and [{1}]", userName1, userName2);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusUser>>()[0];
+            var results = powershell.Invoke<OutputOctopusUser>();
 
             Assert.AreEqual(2, results.Count);
 
@@ -108,7 +108,7 @@ public void GetUserByNameUsingWildcard()
             var pattern = new WildcardPattern(namePattern);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusUser>>()[0];
+            var results = powershell.Invoke<OutputOctopusUser>();
 
             Assert.AreEqual(2, results.Count);
             Console.WriteLine("Resources found: [{0}]", results.Count);
@@ -132,7 +132,7 @@ public void DontGetUserIfNameDoesntMatch()
             }};
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusUser>>()[0];
+            var results = powershell.Invoke<OutputOctopusUser>();
 
             Assert.AreEqual(results.Count, 0);
             Console.WriteLine("No resources found with name [{0}]", resourceName);
diff --git a/Octoposh.Tests/GetOctopusVariableSetTests.cs b/Octoposh.Tests/GetOctopusVariableSetTests.cs
index e67ae956..812ab4c6 100644
--- a/Octoposh.Tests/GetOctopusVariableSetTests.cs
+++ b/Octoposh.Tests/GetOctopusVariableSetTests.cs
@@ -39,7 +39,7 @@ public void GetVariableSetBySingleProjectName()
             Console.WriteLine("Looking for variable set of project [{0}]", projectName);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusVariableSet>>()[0];
+            var results = powershell.Invoke<OutputOctopusVariableSet>();
 
             Assert.AreEqual(1, results.Count);
 
@@ -70,7 +70,7 @@ public void GetvariableSetByMultipleProjectNames()
             Console.WriteLine("Looking for variable sets of projects [{0}] and [{1}]", name1, name2);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusVariableSet>>()[0];
+            var results = powershell.Invoke<OutputOctopusVariableSet>();
 
             Assert.AreEqual(2, results.Count);
 
@@ -113,7 +113,7 @@ public void GetTagSetByProjectNameUsingWildcard()
             var pattern = new WildcardPattern(namePattern);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusVariableSet>>()[0];
+            var results = powershell.Invoke<OutputOctopusVariableSet>();
 
             Assert.IsTrue(results.Count > 0);
             Console.WriteLine("Resources found: {0}", results.Count);
@@ -143,7 +143,7 @@ public void GetVariableSetBySingleLibraryName()
             Console.WriteLine("Looking for library variable [{0}]", libraryName);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusVariableSet>>()[0];
+            var results = powershell.Invoke<OutputOctopusVariableSet>();
 
             Assert.AreEqual(1, results.Count);
 
@@ -174,7 +174,7 @@ public void GetvariableSetByMultipleLibraryNames()
             Console.WriteLine("Looking for variable sets of projects [{0}] and [{1}]", name1, name2);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusVariableSet>>()[0];
+            var results = powershell.Invoke<OutputOctopusVariableSet>();
 
             Assert.AreEqual(2, results.Count);
 
@@ -217,7 +217,7 @@ public void GetVariableSetByLibraryNameUsingWildcard()
             var pattern = new WildcardPattern(namePattern);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusVariableSet>>()[0];
+            var results = powershell.Invoke<OutputOctopusVariableSet>();
 
             Assert.IsTrue(results.Count > 0);
             Console.WriteLine("Resources found: {0}", results.Count);
@@ -256,7 +256,7 @@ public void GetVariableSetByProjectAndLibraryNames()
             Console.WriteLine("Looking for variable sets of project [{0}] and library [{1}]", projectName, libraryName);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusVariableSet>>()[0];
+            var results = powershell.Invoke<OutputOctopusVariableSet>();
 
             Assert.AreEqual(2, results.Count);
 
@@ -304,7 +304,7 @@ public void PassingIncludeUsageSwitchReturnsLibraryProjectUsage()
             Console.WriteLine("Looking for library variable set [{0}]", libraryName);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusVariableSet>>()[0];
+            var results = powershell.Invoke<OutputOctopusVariableSet>();
 
             Assert.AreEqual(1, results.Count);
 
@@ -330,7 +330,7 @@ public void NotPassingIncludeUsageSwitchDoesNotReturnLibraryProjectUsage()
             Console.WriteLine("Looking for library variable set [{0}]", libraryName);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusVariableSet>>()[0];
+            var results = powershell.Invoke<OutputOctopusVariableSet>();
 
             Assert.AreEqual(1, results.Count);
 
@@ -357,14 +357,13 @@ public void VariableSetVariableScopeIsNotEmpty()
             Console.WriteLine("Looking for library variable set [{0}]", projectName);
 
             var powershell = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results = powershell.Invoke<List<OutputOctopusVariableSet>>()[0];
+            var results = powershell.Invoke<OutputOctopusVariableSet>();
 
             Assert.AreEqual(1, results.Count);
 
             var variable = results[0].Variables.FirstOrDefault(v => v.Name == variableName);
 
             Assert.IsNotNull(variable);
-
             Assert.IsTrue(variable.Scope.Channels.Count != 0);
             Assert.IsTrue(variable.Scope.Actions.Count != 0);
             Assert.IsTrue(variable.Scope.Environments.Count != 0);
diff --git a/Octoposh.Tests/InstallOctopusToolTests.cs b/Octoposh.Tests/InstallOctopusToolTests.cs
index b65132bd..615a851e 100644
--- a/Octoposh.Tests/InstallOctopusToolTests.cs
+++ b/Octoposh.Tests/InstallOctopusToolTests.cs
@@ -1,15 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Management.Automation;
-using System.Management.Automation.Runspaces;
 using NUnit.Framework;
 using Octoposh.Cmdlets;
 using Octoposh.Model;
-using Octopus.Client.Model;
 
 namespace Octoposh.Tests
 {
@@ -18,10 +12,9 @@ public class InstallOctopusToolTests
     {
         private static readonly string CmdletName = "Install-OctopusTool";
         private static readonly Type CmdletType = typeof(InstallOctopusTool);
-        private static readonly string TempDirectory = Path.Combine(TestsUtilities.TestsPath, @"TestAssets\Temp");
-        private static readonly string NugetRepositoryURL = Path.Combine(TestsUtilities.TestsPath, @"TestAssets\Repository");
+        private static readonly string TempDirectory = Path.Combine(TestUtilities.TestsPath, @"TestAssets\Temp");
+        private static readonly string NugetRepositoryURL = Path.Combine(TestUtilities.TestsPath, @"TestAssets\Repository");
         private static readonly string Version1 = "1.0.0";
-        private static readonly string LatestVersion = "4.0.0";
 
         public InstallOctopusToolTests()
         {
@@ -53,7 +46,7 @@ public void InstallToolByVersionAndSetAsDefault()
 
             Assert.DoesNotThrow(() => powershell.Invoke());
 
-            var expectedpath = Path.Combine(TestsUtilities.TestsPath, TempDirectory,String.Concat("OctopusTools.", version), "Octo.exe");
+            var expectedpath = Path.Combine(TestUtilities.TestsPath, TempDirectory,String.Concat("OctopusTools.", version), "Octo.exe");
 
             Assert.AreEqual(OctoposhEnvVariables.Octoexe, expectedpath);
         }
@@ -89,7 +82,14 @@ public void InstallToolByLatestAndDoNotSetAsDefault()
         /// </summary>
         private void ClearTempDirectory()
         {
-            DirectoryInfo di = new DirectoryInfo(Path.Combine(TestsUtilities.TestsPath, TempDirectory));
+            var fullTempDirPath = Path.Combine(TestUtilities.TestsPath, TempDirectory);
+
+            if (!Directory.Exists(fullTempDirPath))
+            {
+                Directory.CreateDirectory(fullTempDirPath);
+            }
+
+            DirectoryInfo di = new DirectoryInfo(fullTempDirPath);
 
             foreach (FileInfo file in di.GetFiles())
             {
diff --git a/Octoposh.Tests/NewAndRemoveOctopusResourceTests.cs b/Octoposh.Tests/NewAndRemoveOctopusResourceTests.cs
index 17f392aa..03ab0627 100644
--- a/Octoposh.Tests/NewAndRemoveOctopusResourceTests.cs
+++ b/Octoposh.Tests/NewAndRemoveOctopusResourceTests.cs
@@ -122,8 +122,8 @@ public void CreateAndRemoveProject()
         {
             #region ProjectCreate
 
-            var projectGroupId = "ProjectGroups-21";
-            var lifecycleID = "Lifecycles-21";
+            var projectGroupId = TestUtilities.Repository.ProjectGroups.FindAll().FirstOrDefault().Id;
+            var lifecycleID = TestUtilities.Repository.Lifecycles.FindAll().FirstOrDefault().Id;
 
             var resource = new ProjectResource()
             {
@@ -540,7 +540,7 @@ public void CreateAndRemoveChannel()
         {
             #region ChannelCreate
 
-            var projectId = "Projects-5";
+            var projectId = TestUtilities.Repository.Projects.FindAll().FirstOrDefault().Id;
 
             var resource = new ChannelResource()
             {
@@ -593,7 +593,7 @@ public void CreateAndRemoveMachine()
         {
             #region MachineCreate
 
-            var environmentId = "Environments-1";
+            var environmentId = TestUtilities.Repository.Environments.FindAll().FirstOrDefault().Id;
 
             var resource = new MachineResource()
             {
diff --git a/Octoposh.Tests/SetOctopusToolPathTests.cs b/Octoposh.Tests/SetOctopusToolPathTests.cs
index d0a14d47..91864697 100644
--- a/Octoposh.Tests/SetOctopusToolPathTests.cs
+++ b/Octoposh.Tests/SetOctopusToolPathTests.cs
@@ -46,7 +46,7 @@ public void SetPathByPath()
         [Test]
         public void SetPathByVersion()
         {
-            OctoposhEnvVariables.OctopusToolsFolder = Path.Combine(TestsUtilities.TestsPath, AssetsPath);
+            OctoposhEnvVariables.OctopusToolsFolder = Path.Combine(TestUtilities.TestsPath, AssetsPath);
             var version = OctoexeVersion;
 
             var parameters = new List<CmdletParameter>(){
diff --git a/Octoposh.Tests/TestsUtilities.cs b/Octoposh.Tests/TestsUtilities.cs
index 81eb0d24..c6e360b3 100644
--- a/Octoposh.Tests/TestsUtilities.cs
+++ b/Octoposh.Tests/TestsUtilities.cs
@@ -1,17 +1,19 @@
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
+using Octopus.Client;
 
 namespace Octoposh.Tests
 {
     /// <summary>
     /// Helper class whose purpose is to provie some properties/methods that will aid during unit tests.
     /// </summary>
-    static class TestsUtilities
+    static class TestUtilities
     {
         /// <summary>
         /// Gets the path where the tests are currently running
@@ -21,5 +23,24 @@ public static string TestsPath
             get { return Path.GetDirectoryName(Assembly.GetExecutingAssembly().CodeBase).Replace(@"file:\", string.Empty); }
             set { }
         }
+
+        /// <summary>
+        /// exposes an OctopusRepository to use in tests
+        /// </summary>
+        public static OctopusRepository Repository
+        {
+            get
+            {
+                var octopusUrl = string.Concat("http://localhost:", ConfigurationManager.AppSettings["OctopusBindingPort"]);
+                var octopusApiKey = ConfigurationManager.AppSettings["OctopusAPIKey"];
+
+                var endpoint = new OctopusServerEndpoint(octopusUrl, octopusApiKey);
+
+                var repository = new OctopusRepository(endpoint);
+
+                return repository;
+            }
+            set { }
+        }
     }
 }
diff --git a/Octoposh.Tests/UpdateOctopusResourceTests.cs b/Octoposh.Tests/UpdateOctopusResourceTests.cs
index dfe82c88..be72aaeb 100644
--- a/Octoposh.Tests/UpdateOctopusResourceTests.cs
+++ b/Octoposh.Tests/UpdateOctopusResourceTests.cs
@@ -39,7 +39,7 @@ public void UpdateProject()
             };
             //Changing the name from Unmodified_* => Modified_*
             var powershell1 = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results1 = powershell1.Invoke<List<ProjectResource>>()[0];
+            var results1 = powershell1.Invoke<ProjectResource>();
 
             Assert.AreEqual(results1.Count, 1);
             Assert.AreEqual(results1[0].Name, modifiedName);
@@ -49,7 +49,7 @@ public void UpdateProject()
             parameters[0].Resource = baseresource;
 
             var powershell2 = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results2 = powershell2.Invoke<List<ProjectResource>>()[0];
+            var results2 = powershell2.Invoke<ProjectResource>();
 
             Assert.AreEqual(results2.Count, 1);
             Assert.AreEqual(results2[0].Name, unmodifiedName);
@@ -77,7 +77,7 @@ public void UpdateProjectGroup()
             };
             //Changing the name from Unmodified_* => Modified_*
             var powershell1 = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results1 = powershell1.Invoke<List<ProjectGroupResource>>()[0];
+            var results1 = powershell1.Invoke<ProjectGroupResource>();
 
             Assert.AreEqual(results1.Count, 1);
             Assert.AreEqual(results1[0].Name, modifiedName);
@@ -87,7 +87,7 @@ public void UpdateProjectGroup()
             parameters[0].Resource = baseresource;
 
             var powershell2 = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results2 = powershell2.Invoke<List<ProjectGroupResource>>()[0];
+            var results2 = powershell2.Invoke<ProjectGroupResource>();
 
             Assert.AreEqual(results2.Count, 1);
             Assert.AreEqual(results2[0].Name, unmodifiedName);
@@ -115,7 +115,7 @@ public void UpdateEnvironment()
             };
             //Changing the name from Unmodified_* => Modified_*
             var powershell1 = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results1 = powershell1.Invoke<List<EnvironmentResource>>()[0];
+            var results1 = powershell1.Invoke<EnvironmentResource>();
 
             Assert.AreEqual(results1.Count, 1);
             Assert.AreEqual(results1[0].Name, modifiedName);
@@ -125,7 +125,7 @@ public void UpdateEnvironment()
             parameters[0].Resource = baseresource;
 
             var powershell2 = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results2 = powershell2.Invoke<List<EnvironmentResource>>()[0];
+            var results2 = powershell2.Invoke<EnvironmentResource>();
 
             Assert.AreEqual(results2.Count, 1);
             Assert.AreEqual(results2[0].Name, unmodifiedName);
@@ -153,7 +153,7 @@ public void UpdateTeam()
             };
             //Changing the name from Unmodified_* => Modified_*
             var powershell1 = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results1 = powershell1.Invoke<List<TeamResource>>()[0];
+            var results1 = powershell1.Invoke<TeamResource>();
 
             Assert.AreEqual(results1.Count, 1);
             Assert.AreEqual(results1[0].Name, modifiedName);
@@ -163,7 +163,7 @@ public void UpdateTeam()
             parameters[0].Resource = baseresource;
 
             var powershell2 = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results2 = powershell2.Invoke<List<TeamResource>>()[0];
+            var results2 = powershell2.Invoke<TeamResource>();
 
             Assert.AreEqual(results2.Count, 1);
             Assert.AreEqual(results2[0].Name, unmodifiedName);
@@ -192,7 +192,7 @@ public void UpdateChannel()
             };
             //Changing the name from Unmodified_* => Modified_*
             var powershell1 = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results1 = powershell1.Invoke<List<ChannelResource>>()[0];
+            var results1 = powershell1.Invoke<ChannelResource>();
 
             Assert.AreEqual(results1.Count, 1);
             Assert.AreEqual(results1[0].Name, modifiedName);
@@ -202,7 +202,7 @@ public void UpdateChannel()
             parameters[0].Resource = baseresource;
 
             var powershell2 = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results2 = powershell2.Invoke<List<ChannelResource>>()[0];
+            var results2 = powershell2.Invoke<ChannelResource>();
 
             Assert.AreEqual(results2.Count, 1);
             Assert.AreEqual(results2[0].Name, unmodifiedName);
@@ -211,41 +211,52 @@ public void UpdateChannel()
         }
 
         [Test]
-        public void UpdateLibraryVariableSet()
+        public void UpdateVariableSet()
         {
-            var unmodifiedName = "unmodified_TestLibraryVariableSet";
-            var modifiedName = "modified_TestLibraryVariableSet";
+            var variableSetName = "VariableSetTests_Library1";
+            var unmodifiedValue = "unmodified_VariableValue";
+            var modifiedValue = "modified_VariableValue";
 
-            var baseresource = Repository.LibraryVariableSets.FindByName(unmodifiedName);
+            var libraryVariableSet = Repository.LibraryVariableSets.FindByName(variableSetName);
+            var baseresource1 = Repository.VariableSets.Get(libraryVariableSet.VariableSetId);
 
-            baseresource.Name = modifiedName;
+            baseresource1.Variables[0].Value = modifiedValue;
 
-            var parameters = new List<CmdletParameter>
+            var parameters1 = new List<CmdletParameter>
             {
                 new CmdletParameter()
                 {
                     Name = "Resource",
-                    Resource = baseresource
+                    Resource = baseresource1
                 }
             };
             //Changing the name from Unmodified_* => Modified_*
-            var powershell1 = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results1 = powershell1.Invoke<List<LibraryVariableSetResource>>()[0];
+            var powershell1 = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters1);
+            var results1 = powershell1.Invoke<VariableSetResource>();
 
             Assert.AreEqual(results1.Count, 1);
-            Assert.AreEqual(results1[0].Name, modifiedName);
+            Assert.AreEqual(results1[0].Variables[0].Value, modifiedValue);
 
             // Changing the name back from Modified_* => Unmodified_* for the sake of being able to re-run tests without having to reload test data
-            baseresource.Name = unmodifiedName;
-            parameters[0].Resource = baseresource;
+            var baseresource2 = Repository.VariableSets.Get(libraryVariableSet.VariableSetId);
+            baseresource2.Variables[0].Value = unmodifiedValue;
 
-            var powershell2 = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results2 = powershell2.Invoke<List<LibraryVariableSetResource>>()[0];
+            var parameters2 = new List<CmdletParameter>
+            {
+                new CmdletParameter()
+                {
+                    Name = "Resource",
+                    Resource = baseresource2
+                }
+            };
+
+            var powershell2 = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters2);
+            var results2 = powershell2.Invoke<VariableSetResource>();
 
             Assert.AreEqual(results2.Count, 1);
-            Assert.AreEqual(results2[0].Name, unmodifiedName);
+            Assert.AreEqual(results2[0].Variables[0].Value, unmodifiedValue);
 
-            Console.WriteLine("Resource name changed from {0} to {1} and back to {0}", unmodifiedName, modifiedName);
+            Console.WriteLine("Variable in variable set [{2}] value changed from [{0}] to [{1}] and back to [{0}]", unmodifiedValue, modifiedValue, variableSetName);
         }
 
         [Test]
@@ -382,7 +393,7 @@ public void UpdateFeed()
             };
             //Changing the name from Unmodified_* => Modified_*
             var powershell1 = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results1 = powershell1.Invoke<List<FeedResource>>()[0];
+            var results1 = powershell1.Invoke<FeedResource>();
 
             Assert.AreEqual(results1.Count, 1);
             Assert.AreEqual(results1[0].Name, modifiedName);
@@ -392,7 +403,7 @@ public void UpdateFeed()
             parameters[0].Resource = baseresource;
 
             var powershell2 = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
-            var results2 = powershell2.Invoke<List<FeedResource>>()[0];
+            var results2 = powershell2.Invoke<FeedResource>();
 
             Assert.AreEqual(results2.Count, 1);
             Assert.AreEqual(results2[0].Name, unmodifiedName);
@@ -439,5 +450,45 @@ public void UpdateMachine()
         }
 
         //todo add tests for Tag Sets
+
+        [Test]
+        public void UpdateRelease()
+        {
+            var unmodifiedReleaseNotes = "unmodified_ReleaseNotes";
+            var modifiedReleaseNotes = "modified_ReleaseNotes";
+
+            var releaseVersion = "0.0.1";
+            var project = Repository.Projects.FindByName("ReleaseTests_Project1");
+            var baseresource = Repository.Projects.GetReleaseByVersion(project, releaseVersion);
+
+            baseresource.ReleaseNotes = modifiedReleaseNotes;
+
+            var parameters = new List<CmdletParameter>
+            {
+                new CmdletParameter()
+                {
+                    Name = "Resource",
+                    Resource = baseresource
+                }
+            };
+            //Changing the name from Unmodified_* => Modified_*
+            var powershell1 = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
+            var results1 = powershell1.Invoke<ReleaseResource>();
+
+            Assert.AreEqual(results1.Count, 1);
+            Assert.AreEqual(results1[0].ReleaseNotes, modifiedReleaseNotes);
+
+            // Changing the name back from Modified_* => Unmodified_* for the sake of being able to re-run tests without having to reload test data
+            baseresource.ReleaseNotes= unmodifiedReleaseNotes;
+            parameters[0].Resource = baseresource;
+
+            var powershell2 = new CmdletRunspace().CreatePowershellcmdlet(CmdletName, CmdletType, parameters);
+            var results2 = powershell2.Invoke<ReleaseResource>();
+
+            Assert.AreEqual(results2.Count, 1);
+            Assert.AreEqual(results2[0].ReleaseNotes, unmodifiedReleaseNotes);
+
+            Console.WriteLine("Resource name changed from {0} to {1} and back to {0}", unmodifiedReleaseNotes, modifiedReleaseNotes);
+        }
     }
 }
\ No newline at end of file
diff --git a/Octoposh/Cmdlets/Get-OctopusServerThumbprint.cs b/Octoposh/Cmdlets/Get-OctopusServerThumbprint.cs
index 8adfbb3d..b516c5b0 100644
--- a/Octoposh/Cmdlets/Get-OctopusServerThumbprint.cs
+++ b/Octoposh/Cmdlets/Get-OctopusServerThumbprint.cs
@@ -46,7 +46,7 @@ protected override void ProcessRecord()
                 throw;
             }
 
-            WriteObject(thumbprint);
+            WriteObject(thumbprint,true);
         }
     }
 }
diff --git a/Octoposh/Cmdlets/GetOctopusChannel.cs b/Octoposh/Cmdlets/GetOctopusChannel.cs
index 234e84f0..0767c1c8 100644
--- a/Octoposh/Cmdlets/GetOctopusChannel.cs
+++ b/Octoposh/Cmdlets/GetOctopusChannel.cs
@@ -146,7 +146,7 @@ protected override void ProcessRecord()
                 }
                 else
                 {
-                    WriteObject(baseResourceList);
+                    WriteObject(baseResourceList,true);
                 }
             }
 
@@ -157,11 +157,11 @@ protected override void ProcessRecord()
 
                 if (outputList.Count == 1)
                 {
-                    WriteObject(outputList.FirstOrDefault());
+                    WriteObject(outputList.FirstOrDefault(),true);
                 }
                 else
                 {
-                    WriteObject(outputList);
+                    WriteObject(outputList,true);
                 }
             }
 
diff --git a/Octoposh/Cmdlets/GetOctopusConnectionInfo.cs b/Octoposh/Cmdlets/GetOctopusConnectionInfo.cs
index 923cc819..d5673b11 100644
--- a/Octoposh/Cmdlets/GetOctopusConnectionInfo.cs
+++ b/Octoposh/Cmdlets/GetOctopusConnectionInfo.cs
@@ -28,7 +28,7 @@ protected override void ProcessRecord()
             {
                 OctopusUrl = Environment.GetEnvironmentVariable("OctopusURL"),
                 OctopusApiKey = Environment.GetEnvironmentVariable("OctopusAPIKey")
-            });
+            },true);
         }
     }
 }
\ No newline at end of file
diff --git a/Octoposh/Cmdlets/GetOctopusDashboard.cs b/Octoposh/Cmdlets/GetOctopusDashboard.cs
index 4d0c5ac3..d0ed4b31 100644
--- a/Octoposh/Cmdlets/GetOctopusDashboard.cs
+++ b/Octoposh/Cmdlets/GetOctopusDashboard.cs
@@ -58,7 +58,7 @@ protected override void ProcessRecord()
             var converter = new OutputConverter();
             
             var outputList = converter.GetOctopusDashboard(rawDashboard, ProjectName, EnvironmentName, DeploymentStatus);
-            WriteObject(outputList);
+            WriteObject(outputList,true);
         }
     }
 }
diff --git a/Octoposh/Cmdlets/GetOctopusDeployment.cs b/Octoposh/Cmdlets/GetOctopusDeployment.cs
index 59242f47..6144d1a5 100644
--- a/Octoposh/Cmdlets/GetOctopusDeployment.cs
+++ b/Octoposh/Cmdlets/GetOctopusDeployment.cs
@@ -222,11 +222,11 @@ protected override void ProcessRecord()
             {
                 if (baseResourceList.Count == 1)
                 {
-                    WriteObject(baseResourceList.FirstOrDefault());
+                    WriteObject(baseResourceList.FirstOrDefault(),true);
                 }
                 else
                 {
-                    WriteObject(baseResourceList);
+                    WriteObject(baseResourceList,true);
                 }
             }
 
@@ -237,11 +237,11 @@ protected override void ProcessRecord()
 
                 if (outputList.Count == 1)
                 {
-                    WriteObject(outputList.FirstOrDefault());
+                    WriteObject(outputList.FirstOrDefault(),true);
                 }
                 else
                 {
-                    WriteObject(outputList);
+                    WriteObject(outputList,true);
                 }
             }
         }
diff --git a/Octoposh/Cmdlets/GetOctopusEnvironment.cs b/Octoposh/Cmdlets/GetOctopusEnvironment.cs
index 2e323df2..340bebf6 100644
--- a/Octoposh/Cmdlets/GetOctopusEnvironment.cs
+++ b/Octoposh/Cmdlets/GetOctopusEnvironment.cs
@@ -91,11 +91,11 @@ protected override void ProcessRecord()
             {
                 if (baseResourceList.Count == 1)
                 {
-                    WriteObject(baseResourceList.FirstOrDefault());
+                    WriteObject(baseResourceList.FirstOrDefault(),true);
                 }
                 else
                 {
-                    WriteObject(baseResourceList);
+                    WriteObject(baseResourceList,true);
                 }
             }
             else
@@ -105,11 +105,11 @@ protected override void ProcessRecord()
 
                 if (outputList.Count == 1)
                 {
-                    WriteObject(outputList.FirstOrDefault());
+                    WriteObject(outputList.FirstOrDefault(),true);
                 }
                 else
                 {
-                    WriteObject(outputList);
+                    WriteObject(outputList,true);
                 }
             }
 
diff --git a/Octoposh/Cmdlets/GetOctopusFeed.cs b/Octoposh/Cmdlets/GetOctopusFeed.cs
index 63101a41..2597f9d5 100644
--- a/Octoposh/Cmdlets/GetOctopusFeed.cs
+++ b/Octoposh/Cmdlets/GetOctopusFeed.cs
@@ -123,11 +123,11 @@ protected override void ProcessRecord()
             {
                 if (baseResourceList.Count == 1)
                 {
-                    WriteObject(baseResourceList.FirstOrDefault());
+                    WriteObject(baseResourceList.FirstOrDefault(),true);
                 }
                 else
                 {
-                    WriteObject(baseResourceList);
+                    WriteObject(baseResourceList,true);
                 }
             }
 
@@ -138,11 +138,11 @@ protected override void ProcessRecord()
 
                 if (outputList.Count == 1)
                 {
-                    WriteObject(outputList.FirstOrDefault());
+                    WriteObject(outputList.FirstOrDefault(),true);
                 }
                 else
                 {
-                    WriteObject(outputList);
+                    WriteObject(outputList,true);
                 }
             }
 
diff --git a/Octoposh/Cmdlets/GetOctopusLifecycle.cs b/Octoposh/Cmdlets/GetOctopusLifecycle.cs
index 569a44c0..ec254fd5 100644
--- a/Octoposh/Cmdlets/GetOctopusLifecycle.cs
+++ b/Octoposh/Cmdlets/GetOctopusLifecycle.cs
@@ -91,11 +91,11 @@ protected override void ProcessRecord()
             {
                 if (baseResourceList.Count == 1)
                 {
-                    WriteObject(baseResourceList.FirstOrDefault());
+                    WriteObject(baseResourceList.FirstOrDefault(),true);
                 }
                 else
                 {
-                    WriteObject(baseResourceList);
+                    WriteObject(baseResourceList,true);
                 }
             }
 
@@ -106,11 +106,11 @@ protected override void ProcessRecord()
 
                 if (outputList.Count == 1)
                 {
-                    WriteObject(outputList.FirstOrDefault());
+                    WriteObject(outputList.FirstOrDefault(),true);
                 }
                 else
                 {
-                    WriteObject(outputList);
+                    WriteObject(outputList,true);
                 }
             }
 
diff --git a/Octoposh/Cmdlets/GetOctopusMachine.cs b/Octoposh/Cmdlets/GetOctopusMachine.cs
index fbbb4883..4e94bceb 100644
--- a/Octoposh/Cmdlets/GetOctopusMachine.cs
+++ b/Octoposh/Cmdlets/GetOctopusMachine.cs
@@ -189,11 +189,11 @@ protected override void ProcessRecord()
             {
                 if (baseResourceList.Count == 1)
                 {
-                    WriteObject(baseResourceList.FirstOrDefault());
+                    WriteObject(baseResourceList.FirstOrDefault(),true);
                 }
                 else
                 {
-                    WriteObject(baseResourceList);
+                    WriteObject(baseResourceList,true);
                 }
             }
             else
@@ -203,11 +203,11 @@ protected override void ProcessRecord()
 
                 if (outputList.Count == 1)
                 {
-                    WriteObject(outputList.FirstOrDefault());
+                    WriteObject(outputList.FirstOrDefault(),true);
                 }
                 else
                 {
-                    WriteObject(outputList);
+                    WriteObject(outputList,true);
                 }
             }
             
diff --git a/Octoposh/Cmdlets/GetOctopusProject.cs b/Octoposh/Cmdlets/GetOctopusProject.cs
index 95dca351..adcf5435 100644
--- a/Octoposh/Cmdlets/GetOctopusProject.cs
+++ b/Octoposh/Cmdlets/GetOctopusProject.cs
@@ -144,11 +144,11 @@ protected override void ProcessRecord()
             {
                 if (baseResourceList.Count == 1)
                 {
-                    WriteObject(baseResourceList.FirstOrDefault());
+                    WriteObject(baseResourceList.FirstOrDefault(),true);
                 }
                 else
                 {
-                    WriteObject(baseResourceList);
+                    WriteObject(baseResourceList,true);
                 }
             }
 
@@ -159,11 +159,11 @@ protected override void ProcessRecord()
 
                 if (outputList.Count == 1)
                 {
-                    WriteObject(outputList.FirstOrDefault());
+                    WriteObject(outputList.FirstOrDefault(),true);
                 }
                 else
                 {
-                    WriteObject(outputList);
+                    WriteObject(outputList,true);
                 }
             }
             
diff --git a/Octoposh/Cmdlets/GetOctopusProjectGroup.cs b/Octoposh/Cmdlets/GetOctopusProjectGroup.cs
index df735a29..6f6820c1 100644
--- a/Octoposh/Cmdlets/GetOctopusProjectGroup.cs
+++ b/Octoposh/Cmdlets/GetOctopusProjectGroup.cs
@@ -92,11 +92,11 @@ protected override void ProcessRecord()
             {
                 if (baseResourceList.Count == 1)
                 {
-                    WriteObject(baseResourceList.FirstOrDefault());
+                    WriteObject(baseResourceList.FirstOrDefault(),true);
                 }
                 else
                 {
-                    WriteObject(baseResourceList);
+                    WriteObject(baseResourceList,true);
                 }
             }
 
@@ -107,11 +107,11 @@ protected override void ProcessRecord()
 
                 if (outputList.Count == 1)
                 {
-                    WriteObject(outputList.FirstOrDefault());
+                    WriteObject(outputList.FirstOrDefault(),true);
                 }
                 else
                 {
-                    WriteObject(outputList);
+                    WriteObject(outputList,true);
                 }
             }
 
diff --git a/Octoposh/Cmdlets/GetOctopusRelease.cs b/Octoposh/Cmdlets/GetOctopusRelease.cs
index 1dadc10c..f4a66f82 100644
--- a/Octoposh/Cmdlets/GetOctopusRelease.cs
+++ b/Octoposh/Cmdlets/GetOctopusRelease.cs
@@ -138,11 +138,11 @@ protected override void ProcessRecord()
             {
                 if (baseResourceList.Count == 1)
                 {
-                    WriteObject(baseResourceList.FirstOrDefault());
+                    WriteObject(baseResourceList.FirstOrDefault(),true);
                 }
                 else
                 {
-                    WriteObject(baseResourceList);
+                    WriteObject(baseResourceList,true);
                 }
             }
 
@@ -153,11 +153,11 @@ protected override void ProcessRecord()
 
                 if (outputList.Count == 1)
                 {
-                    WriteObject(outputList.FirstOrDefault());
+                    WriteObject(outputList.FirstOrDefault(),true);
                 }
                 else
                 {
-                    WriteObject(outputList);
+                    WriteObject(outputList,true);
                 }
             }
 
diff --git a/Octoposh/Cmdlets/GetOctopusResourceModel.cs b/Octoposh/Cmdlets/GetOctopusResourceModel.cs
index 67bfe5dd..9baa2efa 100644
--- a/Octoposh/Cmdlets/GetOctopusResourceModel.cs
+++ b/Octoposh/Cmdlets/GetOctopusResourceModel.cs
@@ -92,7 +92,7 @@ protected override void ProcessRecord()
                     break;
             }
 
-            WriteObject(baseresource);
+            WriteObject(baseresource,true);
         }
     }
 }
\ No newline at end of file
diff --git a/Octoposh/Cmdlets/GetOctopusTagSet.cs b/Octoposh/Cmdlets/GetOctopusTagSet.cs
index f8965b69..c5bf2d62 100644
--- a/Octoposh/Cmdlets/GetOctopusTagSet.cs
+++ b/Octoposh/Cmdlets/GetOctopusTagSet.cs
@@ -93,11 +93,11 @@ protected override void ProcessRecord()
             {
                 if (baseResourceList.Count == 1)
                 {
-                    WriteObject(baseResourceList.FirstOrDefault());
+                    WriteObject(baseResourceList.FirstOrDefault(),true);
                 }
                 else
                 {
-                    WriteObject(baseResourceList);
+                    WriteObject(baseResourceList,true);
                 }
             }
 
@@ -108,11 +108,11 @@ protected override void ProcessRecord()
 
                 if (outputList.Count == 1)
                 {
-                    WriteObject(outputList.FirstOrDefault());
+                    WriteObject(outputList.FirstOrDefault(),true);
                 }
                 else
                 {
-                    WriteObject(outputList);
+                    WriteObject(outputList,true);
                 }
             }
 
diff --git a/Octoposh/Cmdlets/GetOctopusTeam.cs b/Octoposh/Cmdlets/GetOctopusTeam.cs
index 8ca166dd..0a24bbcf 100644
--- a/Octoposh/Cmdlets/GetOctopusTeam.cs
+++ b/Octoposh/Cmdlets/GetOctopusTeam.cs
@@ -90,11 +90,11 @@ protected override void ProcessRecord()
             {
                 if (baseResourceList.Count == 1)
                 {
-                    WriteObject(baseResourceList.FirstOrDefault());
+                    WriteObject(baseResourceList.FirstOrDefault(),true);
                 }
                 else
                 {
-                    WriteObject(baseResourceList);
+                    WriteObject(baseResourceList, true);
                 }
             }
 
@@ -105,11 +105,11 @@ protected override void ProcessRecord()
 
                 if (outputList.Count == 1)
                 {
-                    WriteObject(outputList.FirstOrDefault());
+                    WriteObject(outputList.FirstOrDefault(), true);
                 }
                 else
                 {
-                    WriteObject(outputList);
+                    WriteObject(outputList, true);
                 }
             }
 
diff --git a/Octoposh/Cmdlets/GetOctopusTenant.cs b/Octoposh/Cmdlets/GetOctopusTenant.cs
index 3ca62ea1..e8e769dc 100644
--- a/Octoposh/Cmdlets/GetOctopusTenant.cs
+++ b/Octoposh/Cmdlets/GetOctopusTenant.cs
@@ -93,11 +93,11 @@ protected override void ProcessRecord()
             {
                 if (baseResourceList.Count == 1)
                 {
-                    WriteObject(baseResourceList.FirstOrDefault());
+                    WriteObject(baseResourceList.FirstOrDefault(),true);
                 }
                 else
                 {
-                    WriteObject(baseResourceList);
+                    WriteObject(baseResourceList, true);
                 }
             }
 
@@ -108,11 +108,11 @@ protected override void ProcessRecord()
 
                 if (outputList.Count == 1)
                 {
-                    WriteObject(outputList.FirstOrDefault());
+                    WriteObject(outputList.FirstOrDefault(), true);
                 }
                 else
                 {
-                    WriteObject(outputList);
+                    WriteObject(outputList, true);
                 }
             }
 
diff --git a/Octoposh/Cmdlets/GetOctopusToolPath.cs b/Octoposh/Cmdlets/GetOctopusToolPath.cs
index a1a3d838..97041266 100644
--- a/Octoposh/Cmdlets/GetOctopusToolPath.cs
+++ b/Octoposh/Cmdlets/GetOctopusToolPath.cs
@@ -28,7 +28,7 @@ public class GetOctopusToolPath : PSCmdlet
         protected override void ProcessRecord()
         {
             var octoTools = new OctopusToolsHandler();
-            WriteObject(octoTools.GetToolPath());
+            WriteObject(octoTools.GetToolPath(),true);
         }
     }
 }
\ No newline at end of file
diff --git a/Octoposh/Cmdlets/GetOctopusToolVersion.cs b/Octoposh/Cmdlets/GetOctopusToolVersion.cs
index fb0a8a39..5de0a09a 100644
--- a/Octoposh/Cmdlets/GetOctopusToolVersion.cs
+++ b/Octoposh/Cmdlets/GetOctopusToolVersion.cs
@@ -66,13 +66,13 @@ protected override void ProcessRecord()
             switch (ParameterSetName)
             {
                 case ByLatest:
-                    WriteObject(octopusTools.GetLatestToolVersion());
+                    WriteObject(octopusTools.GetLatestToolVersion(),true);
                     break;
                 case ByVersion:
-                    WriteObject(octopusTools.GetToolByVersion(Version));
+                    WriteObject(octopusTools.GetToolByVersion(Version),true);
                     break;
                 case All:
-                    WriteObject(octopusTools.GetAllToolVersions());
+                    WriteObject(octopusTools.GetAllToolVersions(),true);
                     break;
             }
         }
diff --git a/Octoposh/Cmdlets/GetOctopusToolsFolder.cs b/Octoposh/Cmdlets/GetOctopusToolsFolder.cs
index 95c83ffd..dde734b6 100644
--- a/Octoposh/Cmdlets/GetOctopusToolsFolder.cs
+++ b/Octoposh/Cmdlets/GetOctopusToolsFolder.cs
@@ -28,7 +28,7 @@ public class GetOctopusToolsFolder : PSCmdlet
         protected override void ProcessRecord()
         {
             var octoTools = new OctopusToolsHandler();
-            WriteObject(octoTools.GetToolsFolder());
+            WriteObject(octoTools.GetToolsFolder(),true);
             
         }
     }
diff --git a/Octoposh/Cmdlets/GetOctopusUser.cs b/Octoposh/Cmdlets/GetOctopusUser.cs
index 9c45076f..8b512c8f 100644
--- a/Octoposh/Cmdlets/GetOctopusUser.cs
+++ b/Octoposh/Cmdlets/GetOctopusUser.cs
@@ -94,11 +94,11 @@ protected override void ProcessRecord()
             {
                 if (baseResourceList.Count == 1)
                 {
-                    WriteObject(baseResourceList.FirstOrDefault());
+                    WriteObject(baseResourceList.FirstOrDefault(),true);
                 }
                 else
                 {
-                    WriteObject(baseResourceList);
+                    WriteObject(baseResourceList,true);
                 }
             }
             else
@@ -108,11 +108,11 @@ protected override void ProcessRecord()
 
                 if (outputList.Count == 1)
                 {
-                    WriteObject(outputList.FirstOrDefault());
+                    WriteObject(outputList.FirstOrDefault(),true);
                 }
                 else
                 {
-                    WriteObject(outputList);
+                    WriteObject(outputList,true);
                 }
             }
 
diff --git a/Octoposh/Cmdlets/GetOctopusVariableSet.cs b/Octoposh/Cmdlets/GetOctopusVariableSet.cs
index 844a047b..8f3d8ad3 100644
--- a/Octoposh/Cmdlets/GetOctopusVariableSet.cs
+++ b/Octoposh/Cmdlets/GetOctopusVariableSet.cs
@@ -175,11 +175,11 @@ protected override void ProcessRecord()
             {
                 if (baseResourceList.Count == 1)
                 {
-                    WriteObject(baseResourceList.FirstOrDefault());
+                    WriteObject(baseResourceList.FirstOrDefault(),true);
                 }
                 else
                 {
-                    WriteObject(baseResourceList);
+                    WriteObject(baseResourceList,true);
                 }
             }
 
@@ -190,11 +190,11 @@ protected override void ProcessRecord()
 
                 if (outputList.Count == 1)
                 {
-                    WriteObject(outputList.FirstOrDefault());
+                    WriteObject(outputList.FirstOrDefault(),true);
                 }
                 else
                 {
-                    WriteObject(outputList);
+                    WriteObject(outputList,true);
                 }
             }
 
diff --git a/Octoposh/Cmdlets/NewOctopusResource.cs b/Octoposh/Cmdlets/NewOctopusResource.cs
index c07d3909..76a3780b 100644
--- a/Octoposh/Cmdlets/NewOctopusResource.cs
+++ b/Octoposh/Cmdlets/NewOctopusResource.cs
@@ -131,7 +131,7 @@ protected override void ProcessRecord()
                     break;
             }
 
-            WriteObject(outputResource);
+            WriteObject(outputResource,true);
         }
     }
 }
\ No newline at end of file
diff --git a/Octoposh/Cmdlets/RemoveOctopusResource.cs b/Octoposh/Cmdlets/RemoveOctopusResource.cs
index 5b3a70ac..f8209655 100644
--- a/Octoposh/Cmdlets/RemoveOctopusResource.cs
+++ b/Octoposh/Cmdlets/RemoveOctopusResource.cs
@@ -59,72 +59,72 @@ protected override void ProcessRecord()
                         case "Octopus.Client.Model.EnvironmentResource":
                             var enviroment = (EnvironmentResource)r;
                             _connection.Repository.Environments.Delete(enviroment);
-                            WriteObject(true);
+                            WriteObject(true,true);
                             break;
 
                         case "Octopus.Client.Model.ProjectResource":
                             var project = (ProjectResource)r;
                             _connection.Repository.Projects.Delete(project);
-                            WriteObject(true);
+                            WriteObject(true,true);
                             break;
 
                         case "Octopus.Client.Model.ProjectGroupResource":
                             var projectGroup = (ProjectGroupResource)r;
                             _connection.Repository.ProjectGroups.Delete(projectGroup);
-                            WriteObject(true);
+                            WriteObject(true,true);
                             break;
 
                         case "Octopus.Client.Model.NuGetFeedResource":
                             var nugetFeed = (NuGetFeedResource)r;
                             _connection.Repository.Feeds.Delete(nugetFeed);
-                            WriteObject(true);
+                            WriteObject(true,true);
                             break;
 
                         case "Octopus.Client.Model.LibraryVariableSetResource":
                             var libraryVariableSet = (LibraryVariableSetResource)r;
                             _connection.Repository.LibraryVariableSets.Delete(libraryVariableSet);
-                            WriteObject(true);
+                            WriteObject(true,true);
                             break;
 
                         case "Octopus.Client.Model.MachineResource":
                             var machine = (MachineResource)r;
                             _connection.Repository.Machines.Delete(machine);
-                            WriteObject(true);
+                            WriteObject(true,true);
                             break;
 
                         case "Octopus.Client.Model.LifecycleResource":
                             var lifecycle = (LifecycleResource)r;
                             _connection.Repository.Lifecycles.Delete(lifecycle);
-                            WriteObject(true);
+                            WriteObject(true,true);
                             break;
 
                         case "Octopus.Client.Model.TeamResource":
                             var team = (TeamResource)r;
                             _connection.Repository.Teams.Delete(team);
-                            WriteObject(true);
+                            WriteObject(true,true);
                             break;
 
                         case "Octopus.Client.Model.UserResource":
                             var user = (UserResource)r;
                             _connection.Repository.Users.Delete(user);
-                            WriteObject(true);
+                            WriteObject(true,true);
                             break;
 
                         case "Octopus.Client.Model.ChannelResource":
                             var channel = (ChannelResource)r;
                             _connection.Repository.Channels.Delete(channel);
-                            WriteObject(true);
+                            WriteObject(true,true);
                             break;
 
                         case "Octopus.Client.Model.TenantResource":
                             var tenant = (TenantResource)r;
                             _connection.Repository.Tenants.Delete(tenant);
-                            WriteObject(true);
+                            WriteObject(true,true);
                             break;
                         case "Octopus.Client.Model.TagSetResource":
                             var tagset = (TagSetResource)r;
                             _connection.Repository.TagSets.Delete(tagset);
-                            WriteObject(true);
+                            WriteObject(true,true);
                             break;
 
                         default:
diff --git a/Octoposh/Cmdlets/SetOctopusConnectionInfo.cs b/Octoposh/Cmdlets/SetOctopusConnectionInfo.cs
index bcf78998..c486c831 100644
--- a/Octoposh/Cmdlets/SetOctopusConnectionInfo.cs
+++ b/Octoposh/Cmdlets/SetOctopusConnectionInfo.cs
@@ -43,7 +43,7 @@ protected override void ProcessRecord()
             {
                 OctopusUrl = Environment.GetEnvironmentVariable("OctopusURL"),
                 OctopusApiKey = Environment.GetEnvironmentVariable("OctopusAPIKey")
-            });
+            },true);
         }
 
     }
diff --git a/Octoposh/Cmdlets/UpdateOctopusResource.cs b/Octoposh/Cmdlets/UpdateOctopusResource.cs
index e16af8f7..aa166391 100644
--- a/Octoposh/Cmdlets/UpdateOctopusResource.cs
+++ b/Octoposh/Cmdlets/UpdateOctopusResource.cs
@@ -83,10 +83,8 @@ protected override void ProcessRecord()
                     break;
 
                 case "Octopus.Client.Model.VariableSetResource":
-
                     var variableSet = (VariableSetResource)Resource;
                     outputResource = _connection.Repository.VariableSets.Modify(variableSet);
-
                     break;
 
                 case "Octopus.Client.Model.MachineResource":
@@ -123,13 +121,12 @@ protected override void ProcessRecord()
                     var tagset = (TagSetResource)Resource;
                     outputResource = _connection.Repository.TagSets.Modify(tagset);
                     break;
-
                 default:
-                    Console.WriteLine("Dunno what to modify");
+                    Console.WriteLine("Update-OctopusResource doesn't support updating objects of type: {0}", Resource.GetType().ToString());
                     break;
             }
 
-            WriteObject(outputResource);
+            WriteObject(outputResource, true);
         }
     }
 }
\ No newline at end of file