diff --git a/Source/Mockolate.Analyzers/MockabilityAnalyzer.cs b/Source/Mockolate.Analyzers/MockabilityAnalyzer.cs
index 32814751..ae02416b 100644
--- a/Source/Mockolate.Analyzers/MockabilityAnalyzer.cs
+++ b/Source/Mockolate.Analyzers/MockabilityAnalyzer.cs
@@ -93,12 +93,6 @@ private static bool IsMockable(ITypeSymbol typeSymbol, [NotNullWhen(false)] out
 			return false;
 		}
 
-		if (typeSymbol.IsStatic)
-		{
-			reason = "type is static";
-			return false;
-		}
-
 		if (typeSymbol.TypeKind != TypeKind.Interface &&
 		    typeSymbol.TypeKind != TypeKind.Class &&
 		    typeSymbol.TypeKind != TypeKind.Delegate)
diff --git a/Tests/Mockolate.Analyzers.Tests/MockabilityAnalyzerTests.cs b/Tests/Mockolate.Analyzers.Tests/MockabilityAnalyzerTests.cs
index f8fc493f..8b280b45 100644
--- a/Tests/Mockolate.Analyzers.Tests/MockabilityAnalyzerTests.cs
+++ b/Tests/Mockolate.Analyzers.Tests/MockabilityAnalyzerTests.cs
@@ -27,6 +27,34 @@ public void MyTest()
 			  """
 		);
 
+	[Fact]
+	public async Task WhenMockingArray_ShouldBeFlagged() => await Verifier
+		.VerifyAnalyzerAsync(
+			$$"""
+			  using System;
+
+			  {{GeneratedPrefix}}
+
+			  namespace MyNamespace
+			  {
+			  	public interface IMyInterface
+			  	{
+			  	}
+
+			  	public class MyClass
+			  	{
+			  		public void MyTest()
+			  		{
+			  			Mockolate.Mock.Create<{|#0:IMyInterface[]|}>();
+			  		}
+			  	}
+			  }
+			  """,
+			Verifier.Diagnostic(Rules.MockabilityRule)
+				.WithLocation(0)
+				.WithArguments("MyNamespace.IMyInterface[]", "type kind 'Array' is not supported")
+		);
+
 	[Fact]
 	public async Task WhenMockingClass_ShouldNotBeFlagged() => await Verifier
 		.VerifyAnalyzerAsync(
@@ -119,11 +147,14 @@ public interface IGlobalInterface
 			  	void DoSomething();
 			  }
 
-			  public class MyClass
+			  namespace MyNamespace
 			  {
-			  	public void MyTest()
+			  	public class MyClass
 			  	{
-			  		Mockolate.Mock.Create<{|#0:IGlobalInterface|}>();
+			  		public void MyTest()
+			  		{
+			  			Mockolate.Mock.Create<{|#0:IGlobalInterface|}>();
+			  		}
 			  	}
 			  }
 			  """,
@@ -158,6 +189,45 @@ public void MyTest()
 			  """
 		);
 
+	[Fact]
+	public async Task WhenMockingMockGeneratorWithoutAttributes_ShouldNotBeFlagged() => await Verifier
+		.VerifyAnalyzerAsync(
+			$$"""
+			  using System;
+
+			  {{GeneratedPrefix}}
+
+			  namespace MyNamespace
+			  {
+			  	public class MyClass
+			  	{
+			  		public void MyTest()
+			  		{
+			  			Mockolate.MyMock.Create();
+			  		}
+			  	}
+			  }
+			  namespace Mockolate
+			  {
+			      public interface IGlobalInterface
+			      {
+			      	void DoSomething();
+			      }
+
+			      [AttributeUsage(AttributeTargets.Method)]
+			      internal class MockGeneratorAttribute : Attribute
+			      {
+			      }
+			      
+			      public static class MyMock
+			      {
+			          [MockGenerator]
+			          public static IGlobalInterface Create() => default!;
+			      }
+			  }
+			  """
+		);
+
 	[Fact]
 	public async Task WhenMockingRecord_ShouldBeFlagged() => await Verifier
 		.VerifyAnalyzerAsync(
diff --git a/Tests/Mockolate.Analyzers.Tests/WrappabilityAnalyzerTests.cs b/Tests/Mockolate.Analyzers.Tests/WrappabilityAnalyzerTests.cs
index c408b313..74869f25 100644
--- a/Tests/Mockolate.Analyzers.Tests/WrappabilityAnalyzerTests.cs
+++ b/Tests/Mockolate.Analyzers.Tests/WrappabilityAnalyzerTests.cs
@@ -96,6 +96,38 @@ public void MyTest()
 				.WithArguments("MyNamespace.MyBaseClass", "only interface types can be wrapped")
 		);
 
+	[Fact]
+	public async Task WhenWrappingGenericInterface_ShouldNotBeFlagged() => await Verifier
+		.VerifyAnalyzerAsync(
+			$$"""
+			  using System;
+
+			  {{GeneratedPrefix}}
+
+			  namespace MyNamespace
+			  {
+			  	public interface IMyInterface<T>
+			  	{
+			  		void DoSomething(T value);
+			  	}
+
+			  	public class MyImplementation : IMyInterface<int>
+			  	{
+			  		public void DoSomething(int value) { }
+			  	}
+
+			  	public class MyClass
+			  	{
+			  		public void MyTest()
+			  		{
+			  			MyImplementation instance = new MyImplementation();
+			  			Mockolate.Mock.Wrap<IMyInterface<int>>(instance);
+			  		}
+			  	}
+			  }
+			  """
+		);
+
 	[Fact]
 	public async Task WhenWrappingInterface_ShouldNotBeFlagged() => await Verifier
 		.VerifyAnalyzerAsync(