diff --git a/src/Irihi.Avalonia.Shared.sln b/src/Irihi.Avalonia.Shared.sln
index b380d55..9171eaf 100644
--- a/src/Irihi.Avalonia.Shared.sln
+++ b/src/Irihi.Avalonia.Shared.sln
@@ -11,6 +11,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Irihi.Avalonia.Shared.UnitT
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Irihi.Avalonia.Shared.Public", "Irihi.Avalonia.Shared.Public\Irihi.Avalonia.Shared.Public.shproj", "{F7A8869A-C381-4445-BC80-F87739D6A496}"
 EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Irihi.Avalonia.Shared.UnitTest.Public", "..\test\Irihi.Avalonia.Shared.UnitTest.Public\Irihi.Avalonia.Shared.UnitTest.Public.shproj", "{222449F9-96D5-409E-9627-AA1DE6219B26}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -34,7 +36,9 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		Irihi.Avalonia.Shared.ShareProject\Irihi.Avalonia.Shared.ShareProject.projitems*{2c350a8c-4253-45ce-b565-6f4275fc11cd}*SharedItemsImports = 5
-		Irihi.Avalonia.Shared.ShareProject\Irihi.Avalonia.Shared.ShareProject.projitems*{f7a8869a-c381-4445-bc80-f87739d6a496}*SharedItemsImports = 13
+		..\test\Irihi.Avalonia.Shared.UnitTest.Public\Irihi.Avalonia.Shared.UnitTest.Public.projitems*{222449f9-96d5-409e-9627-aa1de6219b26}*SharedItemsImports = 13
+		Irihi.Avalonia.Shared.Public\Irihi.Avalonia.Shared.Public.projitems*{2c350a8c-4253-45ce-b565-6f4275fc11cd}*SharedItemsImports = 5
+		..\test\Irihi.Avalonia.Shared.UnitTest.Public\Irihi.Avalonia.Shared.UnitTest.Public.projitems*{5ad4a73b-4b85-4c56-bab3-a25d526f0b07}*SharedItemsImports = 5
+		Irihi.Avalonia.Shared.Public\Irihi.Avalonia.Shared.Public.projitems*{f7a8869a-c381-4445-bc80-f87739d6a496}*SharedItemsImports = 13
 	EndGlobalSection
 EndGlobal
diff --git a/test/Irihi.Avalonia.Shared.UnitTest.Public/GlobalUsings.cs b/test/Irihi.Avalonia.Shared.UnitTest.Public/GlobalUsings.cs
new file mode 100644
index 0000000..a611174
--- /dev/null
+++ b/test/Irihi.Avalonia.Shared.UnitTest.Public/GlobalUsings.cs
@@ -0,0 +1 @@
+global using Xunit;
\ No newline at end of file
diff --git a/test/Irihi.Avalonia.Shared.UnitTest/Helpers/AvaloniaPropertyExtensionTest.cs b/test/Irihi.Avalonia.Shared.UnitTest.Public/Helpers/AvaloniaPropertyExtensionTest.cs
similarity index 100%
rename from test/Irihi.Avalonia.Shared.UnitTest/Helpers/AvaloniaPropertyExtensionTest.cs
rename to test/Irihi.Avalonia.Shared.UnitTest.Public/Helpers/AvaloniaPropertyExtensionTest.cs
diff --git a/test/Irihi.Avalonia.Shared.UnitTest/Helpers/BindingExtensionTest.cs b/test/Irihi.Avalonia.Shared.UnitTest.Public/Helpers/BindingExtensionTest.cs
similarity index 100%
rename from test/Irihi.Avalonia.Shared.UnitTest/Helpers/BindingExtensionTest.cs
rename to test/Irihi.Avalonia.Shared.UnitTest.Public/Helpers/BindingExtensionTest.cs
diff --git a/test/Irihi.Avalonia.Shared.UnitTest/Helpers/ObservableExtensionTest.cs b/test/Irihi.Avalonia.Shared.UnitTest.Public/Helpers/ObservableExtensionTest.cs
similarity index 100%
rename from test/Irihi.Avalonia.Shared.UnitTest/Helpers/ObservableExtensionTest.cs
rename to test/Irihi.Avalonia.Shared.UnitTest.Public/Helpers/ObservableExtensionTest.cs
diff --git a/test/Irihi.Avalonia.Shared.UnitTest/Helpers/PropertyPseudoClassHelperTest.cs b/test/Irihi.Avalonia.Shared.UnitTest.Public/Helpers/PropertyPseudoClassHelperTest.cs
similarity index 100%
rename from test/Irihi.Avalonia.Shared.UnitTest/Helpers/PropertyPseudoClassHelperTest.cs
rename to test/Irihi.Avalonia.Shared.UnitTest.Public/Helpers/PropertyPseudoClassHelperTest.cs
diff --git a/test/Irihi.Avalonia.Shared.UnitTest/Helpers/RoutedEventExtensionTest.cs b/test/Irihi.Avalonia.Shared.UnitTest.Public/Helpers/RoutedEventExtensionTest.cs
similarity index 100%
rename from test/Irihi.Avalonia.Shared.UnitTest/Helpers/RoutedEventExtensionTest.cs
rename to test/Irihi.Avalonia.Shared.UnitTest.Public/Helpers/RoutedEventExtensionTest.cs
diff --git a/test/Irihi.Avalonia.Shared.UnitTest.Public/Irihi.Avalonia.Shared.UnitTest.Public.projitems b/test/Irihi.Avalonia.Shared.UnitTest.Public/Irihi.Avalonia.Shared.UnitTest.Public.projitems
new file mode 100644
index 0000000..53ee4cd
--- /dev/null
+++ b/test/Irihi.Avalonia.Shared.UnitTest.Public/Irihi.Avalonia.Shared.UnitTest.Public.projitems
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>DA1E3BE1-D211-4BAF-8581-34DC94D57F02</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>Irihi.Avalonia.Shared.UnitTest.Public</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)GlobalUsings.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Helpers\AvaloniaPropertyExtensionTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Helpers\BindingExtensionTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Helpers\ObservableExtensionTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Helpers\PropertyPseudoClassHelperTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Helpers\RoutedEventExtensionTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Shapes\PureCircleTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Shapes\PureRingTest.cs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/test/Irihi.Avalonia.Shared.UnitTest.Public/Irihi.Avalonia.Shared.UnitTest.Public.shproj b/test/Irihi.Avalonia.Shared.UnitTest.Public/Irihi.Avalonia.Shared.UnitTest.Public.shproj
new file mode 100644
index 0000000..2c2ba7a
--- /dev/null
+++ b/test/Irihi.Avalonia.Shared.UnitTest.Public/Irihi.Avalonia.Shared.UnitTest.Public.shproj
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup Label="Globals">
+        <ProjectGuid>{222449F9-96D5-409E-9627-AA1DE6219B26}</ProjectGuid>
+    </PropertyGroup>
+    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
+            Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"/>
+    <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props"/>
+    <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props"/>
+    <Import Project="Irihi.Avalonia.Shared.UnitTest.Public.projitems" Label="Shared"/>
+    <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets"/>
+</Project>
diff --git a/test/Irihi.Avalonia.Shared.UnitTest/Shapes/PureCircleTest.cs b/test/Irihi.Avalonia.Shared.UnitTest.Public/Shapes/PureCircleTest.cs
similarity index 100%
rename from test/Irihi.Avalonia.Shared.UnitTest/Shapes/PureCircleTest.cs
rename to test/Irihi.Avalonia.Shared.UnitTest.Public/Shapes/PureCircleTest.cs
diff --git a/test/Irihi.Avalonia.Shared.UnitTest/Shapes/PureRingTest.cs b/test/Irihi.Avalonia.Shared.UnitTest.Public/Shapes/PureRingTest.cs
similarity index 100%
rename from test/Irihi.Avalonia.Shared.UnitTest/Shapes/PureRingTest.cs
rename to test/Irihi.Avalonia.Shared.UnitTest.Public/Shapes/PureRingTest.cs
diff --git a/test/Irihi.Avalonia.Shared.UnitTest/GlobalUsings.cs b/test/Irihi.Avalonia.Shared.UnitTest/GlobalUsings.cs
index 8c927eb..e69de29 100644
--- a/test/Irihi.Avalonia.Shared.UnitTest/GlobalUsings.cs
+++ b/test/Irihi.Avalonia.Shared.UnitTest/GlobalUsings.cs
@@ -1 +0,0 @@
-global using Xunit;
\ No newline at end of file
diff --git a/test/Irihi.Avalonia.Shared.UnitTest/Irihi.Avalonia.Shared.UnitTest.csproj b/test/Irihi.Avalonia.Shared.UnitTest/Irihi.Avalonia.Shared.UnitTest.csproj
index 7b28897..ad357a8 100644
--- a/test/Irihi.Avalonia.Shared.UnitTest/Irihi.Avalonia.Shared.UnitTest.csproj
+++ b/test/Irihi.Avalonia.Shared.UnitTest/Irihi.Avalonia.Shared.UnitTest.csproj
@@ -9,8 +9,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0"/>
-        <PackageReference Include="xunit" Version="2.4.2"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
+        <PackageReference Include="xunit" Version="2.4.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
@@ -25,4 +25,6 @@
       <ProjectReference Include="..\..\src\Irihi.Avalonia.Shared\Irihi.Avalonia.Shared.csproj" />
     </ItemGroup>
 
+    <Import Project="..\Irihi.Avalonia.Shared.UnitTest.Public\Irihi.Avalonia.Shared.UnitTest.Public.projitems" Label="Shared" />
+
 </Project>