diff --git a/test/raven-integration/Tags/TagGroupOps.cs b/test/raven-integration/Tags/TagGroupOps.cs
index c3840212..f5900eb7 100644
--- a/test/raven-integration/Tags/TagGroupOps.cs
+++ b/test/raven-integration/Tags/TagGroupOps.cs
@@ -11,16 +11,9 @@ namespace raven_integration
     public class TagGroupOps
     {
 
-        //OPS
-        //CREATE A GROUP
-        //TAG A WIDGET WITH A GROUP OF TAGS
-        //GET A PICKLIST OF ALL TAGS IN A GROUP??
-        //GET A ID ONLY LIST OF ALL TAG ID's IN A GROUP
-        //DELETE A GROUP
-
 
         /// <summary>
-        /// Test taggroup
+        /// Test TagGroup operations
         /// </summary>
         [Fact]
         public async void GroupOpsShouldWork()
@@ -66,7 +59,10 @@ namespace raven_integration
             //GET PICKLIST OF TAGS FOR GROUP            
             R = await Util.GetAsync("TagGroup/TagsInGroupPickList/" + TestTagGroupId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
             Util.ValidateDataReturnResponseOk(R);
-            // R.ObjectResponse["result"]["id"].Value<long>().Should().Be(tagMapId);
+
+            //VERIFY CANT DELETE TAG IN GROUP
+            R = await Util.DeleteAsync("Tag/" + TestTag2Id.ToString(), await Util.GetTokenAsync("BizAdminFull"));
+            Util.ValidateErrorCodeResponse(R, 2200, 400);
 
 
             //TAG ITEM WITH GROUP OF TAGS
@@ -118,62 +114,14 @@ namespace raven_integration
             R = await Util.DeleteAsync("TagGroup/" + TestTagGroupId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
             Util.ValidateHTTPStatusCode(R, 204);
 
-            //UNTAG ALL
+            //DELETE WIDGET (which will delete tagmaps as well)
+            R = await Util.DeleteAsync("Widget/" + WidgetId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
+            Util.ValidateHTTPStatusCode(R, 204);
 
+            //VERIFY CAN NOW DELETE TAG IN GROUP
+            R = await Util.DeleteAsync("Tag/" + TestTag2Id.ToString(), await Util.GetTokenAsync("BizAdminFull"));
+            Util.ValidateHTTPStatusCode(R, 204);
 
-
-
-            // //CREATE WIDGET
-            // dynamic w = new JObject();
-            // w.name = Util.Uniquify("WIDGET_TAG");
-            // w.created = DateTime.Now.ToString();
-            // w.dollarAmount = 1.11m;
-            // w.active = true;
-            // w.roles = 0;
-
-            // R = await Util.PostAsync("Widget", await Util.GetTokenAsync("BizAdminFull"), w.ToString());
-            // Util.ValidateDataReturnResponseOk(R);
-            // long widgetId = R.ObjectResponse["result"]["id"].Value<long>();
-
-            // //CREATE TAGMAP (tag the widget)
-            // /*
-            // {
-            // "tagId": 0,
-            // "tagToObjectId": 0,
-            // "tagToObjectType": 0
-            // }
-            //  */
-            // dynamic tm = new JObject();
-            // tm.tagId = TestTagId;
-            // tm.tagToObjectId = widgetId;
-            // tm.tagToObjectType = 2;//widget
-
-
-            // R = await Util.PostAsync("TagMap", await Util.GetTokenAsync("BizAdminFull"), tm.ToString());
-            // Util.ValidateDataReturnResponseOk(R);
-            // long tagMapId = R.ObjectResponse["result"]["id"].Value<long>();
-
-            // //VERIFY TAGMAP
-            // R = await Util.GetAsync("TagMap/" + tagMapId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
-            // Util.ValidateDataReturnResponseOk(R);
-            // R.ObjectResponse["result"]["id"].Value<long>().Should().Be(tagMapId);
-
-
-            // //ATTEMPT TO DELETE TAG THAT HAS TAGMAP SHOULD FAIL with 2200 / 400
-            // R = await Util.DeleteAsync("Tag/" + TestTagId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
-            // Util.ValidateViolatesReferentialIntegrityError(R);
-
-            // //DELETE TAGMAP
-            // R = await Util.DeleteAsync("TagMap/" + tagMapId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
-            // Util.ValidateHTTPStatusCode(R, 204);
-
-            // //DELETE TAG
-            // R = await Util.DeleteAsync("Tag/" + TestTagId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
-            // Util.ValidateHTTPStatusCode(R, 204);
-
-            // //DELETE WIDGET
-            // R = await Util.DeleteAsync("Widget/" + widgetId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
-            // Util.ValidateHTTPStatusCode(R, 204);
         }