diff --git a/src/Danom/Danom.csproj b/src/Danom/Danom.csproj
index 9fc3ed9..c57f52b 100644
--- a/src/Danom/Danom.csproj
+++ b/src/Danom/Danom.csproj
@@ -21,7 +21,7 @@
 
     <!-- NuGet config -->
     <PackageId>Danom</PackageId>
-    <PackageTags>fsharp;functional;database;sql;ado;adonet</PackageTags>
+    <PackageTags>monads;error-handling;option-type;option;result;railway-oriented-programming;result-type</PackageTags>
     <PackageProjectUrl>https://github.com/pimbrouwers/Danom</PackageProjectUrl>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageReadmeFile>README.md</PackageReadmeFile>
diff --git a/test/Danom.Tests/UnitTests.cs b/test/Danom.Tests/Unit/UnitTests.cs
similarity index 100%
rename from test/Danom.Tests/UnitTests.cs
rename to test/Danom.Tests/Unit/UnitTests.cs