diff --git a/OctaneSdkTests/StoryTests.cs b/OctaneSdkTests/StoryTests.cs
index 82a6cb4..a150bf7 100644
--- a/OctaneSdkTests/StoryTests.cs
+++ b/OctaneSdkTests/StoryTests.cs
@@ -116,6 +116,7 @@ public static Story CreateStory(string customName = null)
         [TestMethod]
         public void SearchStories()
         {
+            CreateStory();
             EntityListResult<WorkItem> searchResult = null;
             SpinWait.SpinUntil(() =>
             {
diff --git a/OctaneSdkTests/TestGherkinTests.cs b/OctaneSdkTests/TestGherkinTests.cs
index 2ca7cd6..92d59a4 100644
--- a/OctaneSdkTests/TestGherkinTests.cs
+++ b/OctaneSdkTests/TestGherkinTests.cs
@@ -82,11 +82,12 @@ private static TestGherkin CreateGherkinTestInternal(string customName = null)
         public void SearchGherkinTests()
         {
             var guid = Guid.NewGuid();
-            var gherkinTest1 = CreateGherkinTestInternal("GherkinTest1_CustomName_" + guid);
-            var gherkinTest2 = CreateGherkinTestInternal("GherkinTest2_CustomName_" + guid);
-            var gherkinTest3 = CreateGherkinTestInternal("GherkinTest3_CustomName_" + guid);
-            var gherkinTest4 = CreateGherkinTestInternal("GherkinTest4_CustomName_" + guid);
-            var gherkinTest5 = CreateGherkinTestInternal("GherkinTest5_CustomName_" + guid);
+            var nameSuffix = "CustomName_" + guid;
+            var gherkinTest1 = CreateGherkinTestInternal("GherkinTest1 " + nameSuffix);
+            var gherkinTest2 = CreateGherkinTestInternal("GherkinTest2 " + nameSuffix);
+            var gherkinTest3 = CreateGherkinTestInternal("GherkinTest3 " + nameSuffix);
+            var gherkinTest4 = CreateGherkinTestInternal("GherkinTest4 " + nameSuffix);
+            var gherkinTest5 = CreateGherkinTestInternal("GherkinTest5 " + nameSuffix);
 
             var possibleExpectedTests = new List<TestGherkin>
             {
@@ -97,7 +98,7 @@ public void SearchGherkinTests()
             SpinWait.SpinUntil(() =>
             {
                 Thread.Sleep(1000);
-                searchResult = entityService.SearchAsync<Test>(workspaceContext, "_CustomName_" + guid,
+                searchResult = entityService.SearchAsync<Test>(workspaceContext, nameSuffix,
                     new List<string> { TestGherkin.SUBTYPE_GHERKIN_TEST }, 4).Result;
                 return searchResult.data.Count == 4;
             }, new TimeSpan(0, 2, 0));
diff --git a/OctaneSdkTests/WorkItemTests.cs b/OctaneSdkTests/WorkItemTests.cs
index 4d26ef4..368d946 100644
--- a/OctaneSdkTests/WorkItemTests.cs
+++ b/OctaneSdkTests/WorkItemTests.cs
@@ -201,10 +201,11 @@ public void GetOnlyDefectWithGroupSeverityTest()
         public void SearchWorkItems()
         {
             var guid = Guid.NewGuid();
-            var story = StoryTests.CreateStory("Story_WorkItem_CustomName_" + guid);
-            var epic = CreateEpic("Epic_WorkItem_CustomName_" + guid);
-            var feature = CreateFeature(epic, "Feature_WorkItem_CustomName_" + guid);
-            var defect = DefectTests.CreateDefect("Defect_WorkItem_CustomName_" + guid);
+            var nameSuffix = "CustomName_" + guid;
+            var story = StoryTests.CreateStory("Story " + nameSuffix);
+            var epic = CreateEpic("Epic " + nameSuffix);
+            var feature = CreateFeature(epic, "Feature " + nameSuffix);
+            var defect = DefectTests.CreateDefect("Defect " + nameSuffix);
 
             var expectedWorkItems = new List<WorkItem>
             {
@@ -216,7 +217,7 @@ public void SearchWorkItems()
             {
                 Thread.Sleep(1000);
 
-                searchResult = entityService.SearchAsync<WorkItem>(workspaceContext, "_WorkItem_CustomName_" + guid,
+                searchResult = entityService.SearchAsync<WorkItem>(workspaceContext, nameSuffix,
                     new List<string> { WorkItem.SUBTYPE_STORY, WorkItem.SUBTYPE_EPIC, WorkItem.SUBTYPE_FEATURE }).Result;
 
                 return searchResult.data.Count == 3;