diff --git a/build/Common.Build.props b/build/Common.Build.props
index 258582f..2900d5a 100644
--- a/build/Common.Build.props
+++ b/build/Common.Build.props
@@ -15,7 +15,7 @@
     <!-- set version for CI build -->
     <Version Condition="$(Version) == '' AND $(BuildVersion) != ''">$(BuildVersion)</Version>
     
-    <Version Condition="$(Version) == ''">0.2.0-dev</Version>
+    <Version Condition="$(Version) == ''">0.3.0-dev</Version>
     <Authors>Eto.Toolkit Authors</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryUrl>https://github.com/picoe/Eto.Toolkit</RepositoryUrl>
diff --git a/src/Eto.UnitTest/Filters/AndFilter.cs b/src/Eto.UnitTest/Filters/AndFilter.cs
index 8ad3371..19ccd6b 100644
--- a/src/Eto.UnitTest/Filters/AndFilter.cs
+++ b/src/Eto.UnitTest/Filters/AndFilter.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Eto.UnitTest
+namespace Eto.UnitTest.Filters
 {
-    class AndFilter : ITestFilter
+    public class AndFilter : ITestFilter
     {
         public List<ITestFilter> Filters { get; }
 
diff --git a/src/Eto.UnitTest/Filters/BaseFilter.cs b/src/Eto.UnitTest/Filters/BaseFilter.cs
index 1a21579..36cf6e4 100644
--- a/src/Eto.UnitTest/Filters/BaseFilter.cs
+++ b/src/Eto.UnitTest/Filters/BaseFilter.cs
@@ -1,8 +1,8 @@
 using System.Linq;
 
-namespace Eto.UnitTest
+namespace Eto.UnitTest.Filters
 {
-    abstract class BaseFilter : ITestFilter
+    public abstract class BaseFilter : ITestFilter
     {
         public bool IsExplicitMatch(ITest test) => Matches(test);
 
diff --git a/src/Eto.UnitTest/Filters/CategoryFilter.cs b/src/Eto.UnitTest/Filters/CategoryFilter.cs
index cac64ef..e18ab86 100644
--- a/src/Eto.UnitTest/Filters/CategoryFilter.cs
+++ b/src/Eto.UnitTest/Filters/CategoryFilter.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Eto.UnitTest
+namespace Eto.UnitTest.Filters
 {
-    class CategoryFilter : BaseFilter
+    public class CategoryFilter : BaseFilter
     {
         public List<string> Categories { get; }
 
diff --git a/src/Eto.UnitTest/Filters/EmptyFilter.cs b/src/Eto.UnitTest/Filters/EmptyFilter.cs
index 01615ee..a4b50c2 100644
--- a/src/Eto.UnitTest/Filters/EmptyFilter.cs
+++ b/src/Eto.UnitTest/Filters/EmptyFilter.cs
@@ -1,6 +1,6 @@
-namespace Eto.UnitTest
+namespace Eto.UnitTest.Filters
 {
-    class EmptyFilter : ITestFilter
+    public class EmptyFilter : ITestFilter
     {
         public bool IsExplicitMatch(ITest test) => true;
 
diff --git a/src/Eto.UnitTest/Filters/KeywordFilter.cs b/src/Eto.UnitTest/Filters/KeywordFilter.cs
index 7b4e9ce..e3cf19f 100644
--- a/src/Eto.UnitTest/Filters/KeywordFilter.cs
+++ b/src/Eto.UnitTest/Filters/KeywordFilter.cs
@@ -2,9 +2,9 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 
-namespace Eto.UnitTest
+namespace Eto.UnitTest.Filters
 {
-    class KeywordFilter : BaseFilter
+    public class KeywordFilter : BaseFilter
     {
         string keywords;
         string[][] keywordTokens;
diff --git a/src/Eto.UnitTest/Filters/NotFilter.cs b/src/Eto.UnitTest/Filters/NotFilter.cs
index e13df67..a8d70ff 100644
--- a/src/Eto.UnitTest/Filters/NotFilter.cs
+++ b/src/Eto.UnitTest/Filters/NotFilter.cs
@@ -1,6 +1,6 @@
-namespace Eto.UnitTest
+namespace Eto.UnitTest.Filters
 {
-    class NotFilter : ITestFilter
+    public class NotFilter : ITestFilter
     {
         public ITestFilter Filter { get; set; }
 
diff --git a/src/Eto.UnitTest/Filters/NotRunFilter.cs b/src/Eto.UnitTest/Filters/NotRunFilter.cs
index ace5e85..2739750 100644
--- a/src/Eto.UnitTest/Filters/NotRunFilter.cs
+++ b/src/Eto.UnitTest/Filters/NotRunFilter.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Linq;
 
-namespace Eto.UnitTest
+namespace Eto.UnitTest.Filters
 {
-    class NotRunFilter : ITestFilter
+    public class NotRunFilter : ITestFilter
     {
         Func<ITest, ITestResult> LookupResult { get; }
 
diff --git a/src/Eto.UnitTest/Filters/OrFilter.cs b/src/Eto.UnitTest/Filters/OrFilter.cs
index 163730a..6cfd106 100644
--- a/src/Eto.UnitTest/Filters/OrFilter.cs
+++ b/src/Eto.UnitTest/Filters/OrFilter.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Eto.UnitTest
+namespace Eto.UnitTest.Filters
 {
-    class OrFilter : ITestFilter
+    public class OrFilter : ITestFilter
     {
         public List<ITestFilter> Filters { get; }
 
diff --git a/src/Eto.UnitTest/Filters/SingleTestFilter.cs b/src/Eto.UnitTest/Filters/SingleTestFilter.cs
index e06102a..858b348 100644
--- a/src/Eto.UnitTest/Filters/SingleTestFilter.cs
+++ b/src/Eto.UnitTest/Filters/SingleTestFilter.cs
@@ -1,8 +1,8 @@
 using System.Reflection;
 
-namespace Eto.UnitTest
+namespace Eto.UnitTest.Filters
 {
-    class SingleTestFilter : ITestFilter
+    public class SingleTestFilter : ITestFilter
     {
         public ITest Test { get; set; }
 
diff --git a/src/Eto.UnitTest/Filters/StatusFilter.cs b/src/Eto.UnitTest/Filters/StatusFilter.cs
index 625e4e9..bfc50fe 100644
--- a/src/Eto.UnitTest/Filters/StatusFilter.cs
+++ b/src/Eto.UnitTest/Filters/StatusFilter.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Linq;
 
-namespace Eto.UnitTest
+namespace Eto.UnitTest.Filters
 {
-    class StatusFilter : ITestFilter
+    public class StatusFilter : ITestFilter
     {
         Func<ITest, ITestResult> _lookupResult;
 
diff --git a/src/Eto.UnitTest/Filters/TestFilter.cs b/src/Eto.UnitTest/Filters/TestFilter.cs
index 7a218d3..9c14559 100644
--- a/src/Eto.UnitTest/Filters/TestFilter.cs
+++ b/src/Eto.UnitTest/Filters/TestFilter.cs
@@ -1,6 +1,7 @@
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Collections;
+using Eto.UnitTest.Filters;
 
 namespace Eto.UnitTest
 {
diff --git a/src/Eto.UnitTest/UI/UnitTestPanel.cs b/src/Eto.UnitTest/UI/UnitTestPanel.cs
index 4fd3c30..a2faa3e 100644
--- a/src/Eto.UnitTest/UI/UnitTestPanel.cs
+++ b/src/Eto.UnitTest/UI/UnitTestPanel.cs
@@ -10,6 +10,7 @@
 using System.Collections.Concurrent;
 using System.ComponentModel;
 using Eto.UnitTest.Runners;
+using Eto.UnitTest.Filters;
 
 namespace Eto.UnitTest.UI
 {