diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/tests/Azure.ResourceManager.SelfHelp.Tests.csproj b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/tests/Azure.ResourceManager.SelfHelp.Tests.csproj
index f36b9096a4c9f..af8486f990616 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/tests/Azure.ResourceManager.SelfHelp.Tests.csproj
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/tests/Azure.ResourceManager.SelfHelp.Tests.csproj
@@ -1,9 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <ItemGroup>
-    <Compile Remove="NewFolder\**" />
-    <EmbeddedResource Remove="NewFolder\**" />
-    <None Remove="NewFolder\**" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\src\Azure.ResourceManager.SelfHelp.csproj" />
   </ItemGroup>
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/tests/CheckNameAvailabilityTests.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/tests/CheckNameAvailabilityTests.cs
index 04f1ff7c41f19..26d09f6bff3c9 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/tests/CheckNameAvailabilityTests.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/tests/CheckNameAvailabilityTests.cs
@@ -6,7 +6,6 @@ namespace Azure.ResourceManager.SelfHelp.Tests
     using Azure.Core.TestFramework;
     using Azure.Core;
     using System.Threading.Tasks;
-    using Azure.ResourceManager.SelfHelp.Tests;
     using NUnit.Framework;
     using System;
     using Azure.ResourceManager.SelfHelp.Models;
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/tests/DiagnosticsTests.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/tests/DiagnosticsTests.cs
index 7d3041ded1a3b..5445016d4bc0b 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/tests/DiagnosticsTests.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/tests/DiagnosticsTests.cs
@@ -1,12 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace Azure.ResourceManager.SelfHelp.Tests.Scenario
+namespace Azure.ResourceManager.SelfHelp.Tests
 {
     using Azure.Core.TestFramework;
     using Azure.Core;
     using System.Threading.Tasks;
-    using Azure.ResourceManager.SelfHelp.Tests;
     using NUnit.Framework;
     using System;
     using Azure.ResourceManager.SelfHelp.Models;
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/tests/DiscoverySolutionsTests.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/tests/DiscoverySolutionsTests.cs
index ff7011e002cca..c91fe75b4828d 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/tests/DiscoverySolutionsTests.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/tests/DiscoverySolutionsTests.cs
@@ -6,7 +6,6 @@ namespace Azure.ResourceManager.SelfHelp.Tests
     using Azure.Core.TestFramework;
     using Azure.Core;
     using System.Threading.Tasks;
-    using Azure.ResourceManager.SelfHelp.Tests;
     using NUnit.Framework;
     using System;
     using Azure.ResourceManager.SelfHelp.Models;
@@ -28,7 +27,7 @@ public async Task ListDisocverySolutionsTest()
             var insightsResourceName = Recording.GenerateAssetName("testResource");
             ResourceIdentifier scope = new ResourceIdentifier($"/subscriptions/{subId}/resourceGroups/{resourceGroupName}/providers/Microsoft.KeyVault/vaults/{resourceName}");
 
-            var listDisocverySolutionsData = Client.GetSelfHelpDiscoverySolutionsAsync(scope);
+            var listDisocverySolutionsData = Client.GetSelfHelpDiscoverySolutionsAsync(scope, "ProblemClassificationId eq 'a93e16a3-9f43-a003-6ac0-e5f6caa90cb9'");
             var response = await listDisocverySolutionsData.ToEnumerableAsync();
             Assert.NotNull(response.First());
         }