diff --git a/src/Radical.Tests/ChangeArgsTests.cs b/src/Radical.Tests/ChangeArgsTests.cs
index 3350f069..d689335e 100644
--- a/src/Radical.Tests/ChangeArgsTests.cs
+++ b/src/Radical.Tests/ChangeArgsTests.cs
@@ -15,10 +15,10 @@ public class ChangeArgsTests
         public void changeArgs_generic_ctor_normal_should_correctly_set_values()
         {
             var entity = new object();
-            var cachedValue = new GenericParameterHelper();
+            var cachedValue = new TestTypeHelper();
             var iChange = A.Dummy<IChange>();
 
-            var target = new ChangeEventArgs<GenericParameterHelper>(entity, cachedValue, iChange);
+            var target = new ChangeEventArgs<TestTypeHelper>(entity, cachedValue, iChange);
 
             target.Entity.Should().Be.EqualTo(entity);
             target.CachedValue.Should().Be.EqualTo(cachedValue);
@@ -31,10 +31,10 @@ public void changeArgs_ctor_using_null_reference_entity_should_raise_ArgumentNul
             Assert.ThrowsExactly<ArgumentNullException>(() =>
             {
                 object entity = null;
-                var cachedValue = new GenericParameterHelper();
+                var cachedValue = new TestTypeHelper();
                 var iChange = A.Dummy<IChange>();
 
-                var target = new ChangeEventArgs<GenericParameterHelper>(entity, cachedValue, iChange);
+                var target = new ChangeEventArgs<TestTypeHelper>(entity, cachedValue, iChange);
             });
         }
 
@@ -44,10 +44,10 @@ public void changeArgs_ctor_using_null_reference_iChange_should_raise_ArgumentNu
             Assert.ThrowsExactly<ArgumentNullException>(() =>
             {
                 var entity = new object();
-                var cachedValue = new GenericParameterHelper();
+                var cachedValue = new TestTypeHelper();
                 IChange iChange = null;
 
-                var target = new ChangeEventArgs<GenericParameterHelper>(entity, cachedValue, iChange);
+                var target = new ChangeEventArgs<TestTypeHelper>(entity, cachedValue, iChange);
             });
         }
     }
diff --git a/src/Radical.Tests/ChangeCommittedArgsTests.cs b/src/Radical.Tests/ChangeCommittedArgsTests.cs
index b390b5ea..d7e1749e 100644
--- a/src/Radical.Tests/ChangeCommittedArgsTests.cs
+++ b/src/Radical.Tests/ChangeCommittedArgsTests.cs
@@ -14,11 +14,11 @@ public class ChangeCommittedArgsTests : ChangeArgsTests
         public void changeCommittedArgs_generic_ctor_normal_should_correctly_set_values()
         {
             var entity = new object();
-            var cachedValue = new GenericParameterHelper();
+            var cachedValue = new TestTypeHelper();
             var iChange = A.Dummy<IChange>();
             var reason = CommitReason.AcceptChanges;
 
-            var target = new ChangeCommittedEventArgs<GenericParameterHelper>(entity, cachedValue, iChange, reason);
+            var target = new ChangeCommittedEventArgs<TestTypeHelper>(entity, cachedValue, iChange, reason);
 
             target.Entity.Should().Be.EqualTo(entity);
             target.CachedValue.Should().Be.EqualTo(cachedValue);
diff --git a/src/Radical.Tests/ChangeRejectedArgsTests.cs b/src/Radical.Tests/ChangeRejectedArgsTests.cs
index 769378d4..ceb39278 100644
--- a/src/Radical.Tests/ChangeRejectedArgsTests.cs
+++ b/src/Radical.Tests/ChangeRejectedArgsTests.cs
@@ -14,11 +14,11 @@ public class ChangeRejectedArgsTests : ChangeArgsTests
         public void changeRejectedArgs_generic_ctor_normal_should_correctly_set_values()
         {
             var entity = new object();
-            var cachedValue = new GenericParameterHelper();
+            var cachedValue = new TestTypeHelper();
             var iChange = A.Dummy<IChange>();
             var reason = RejectReason.Redo;
 
-            var target = new ChangeRejectedEventArgs<GenericParameterHelper>(entity, cachedValue, iChange, reason);
+            var target = new ChangeRejectedEventArgs<TestTypeHelper>(entity, cachedValue, iChange, reason);
 
             target.Entity.Should().Be.EqualTo(entity);
             target.CachedValue.Should().Be.EqualTo(cachedValue);
diff --git a/src/Radical.Tests/ChangeTracking/AdvisedActionTests.cs b/src/Radical.Tests/ChangeTracking/AdvisedActionTests.cs
index 76a92847..f5bfae69 100644
--- a/src/Radical.Tests/ChangeTracking/AdvisedActionTests.cs
+++ b/src/Radical.Tests/ChangeTracking/AdvisedActionTests.cs
@@ -14,7 +14,7 @@ public class AdvisedActionTests
         [TestCategory("ChangeTracking")]
         public void advisedAction_ctor()
         {
-            GenericParameterHelper target = new GenericParameterHelper();
+            TestTypeHelper target = new TestTypeHelper();
 
             AdvisedAction actual = new AdvisedAction(target, ProposedActions.Delete);
 
diff --git a/src/Radical.Tests/ChangeTracking/ReferenceEqualityComparerTest.cs b/src/Radical.Tests/ChangeTracking/ReferenceEqualityComparerTest.cs
index bcec8279..5537422b 100644
--- a/src/Radical.Tests/ChangeTracking/ReferenceEqualityComparerTest.cs
+++ b/src/Radical.Tests/ChangeTracking/ReferenceEqualityComparerTest.cs
@@ -13,16 +13,16 @@ public class ReferenceEqualityComparerTest
         [TestCategory("ChangeTracking")]
         public void referenceEqualityComparer_ctor()
         {
-            ReferenceEqualityComparer<GenericParameterHelper> instance = new ReferenceEqualityComparer<GenericParameterHelper>();
+            ReferenceEqualityComparer<TestTypeHelper> instance = new ReferenceEqualityComparer<TestTypeHelper>();
         }
 
         [TestMethod]
         [TestCategory("ChangeTracking")]
         public void generic_iEqualityComparer_equals_with_equal_instances()
         {
-            var instance = new ReferenceEqualityComparer<GenericParameterHelper>();
+            var instance = new ReferenceEqualityComparer<TestTypeHelper>();
 
-            var x = new GenericParameterHelper();
+            var x = new TestTypeHelper();
             var y = x;
 
             bool actual = instance.Equals(x, y);
@@ -34,9 +34,9 @@ public void generic_iEqualityComparer_equals_with_equal_instances()
         [TestCategory("ChangeTracking")]
         public void generic_iEqualityComparer_equals_with_instance_and_null()
         {
-            var instance = new ReferenceEqualityComparer<GenericParameterHelper>();
+            var instance = new ReferenceEqualityComparer<TestTypeHelper>();
 
-            var x = new GenericParameterHelper();
+            var x = new TestTypeHelper();
             bool actual = instance.Equals(x, null);
 
             actual.Should().Be.False();
@@ -46,9 +46,9 @@ public void generic_iEqualityComparer_equals_with_instance_and_null()
         [TestCategory("ChangeTracking")]
         public void generic_iEqualityComparer_equals_with_null_and_instance()
         {
-            var instance = new ReferenceEqualityComparer<GenericParameterHelper>();
+            var instance = new ReferenceEqualityComparer<TestTypeHelper>();
 
-            var y = new GenericParameterHelper();
+            var y = new TestTypeHelper();
             bool actual = instance.Equals(null, y);
 
             actual.Should().Be.False();
@@ -58,7 +58,7 @@ public void generic_iEqualityComparer_equals_with_null_and_instance()
         [TestCategory("ChangeTracking")]
         public void generic_iEqualityComparer_equals_with_null_and_null()
         {
-            var instance = new ReferenceEqualityComparer<GenericParameterHelper>();
+            var instance = new ReferenceEqualityComparer<TestTypeHelper>();
             bool actual = instance.Equals(null, null);
 
             actual.Should().Be.True();
@@ -68,9 +68,9 @@ public void generic_iEqualityComparer_equals_with_null_and_null()
         [TestCategory("ChangeTracking")]
         public void generic_iEqualityComparer_getHashCode()
         {
-            IEqualityComparer<GenericParameterHelper> instance = new ReferenceEqualityComparer<GenericParameterHelper>();
+            IEqualityComparer<TestTypeHelper> instance = new ReferenceEqualityComparer<TestTypeHelper>();
 
-            var obj = new GenericParameterHelper();
+            var obj = new TestTypeHelper();
             int expected = obj.GetHashCode();
 
             int actual = instance.GetHashCode(obj);
@@ -84,7 +84,7 @@ public void generic_iEqualityComparer_getHashCode_null_reference()
         {
             Assert.ThrowsExactly<ArgumentNullException>(() =>
             {
-                IEqualityComparer<GenericParameterHelper> instance = new ReferenceEqualityComparer<GenericParameterHelper>();
+                IEqualityComparer<TestTypeHelper> instance = new ReferenceEqualityComparer<TestTypeHelper>();
                 int actual = instance.GetHashCode(null);
             });
         }
@@ -93,9 +93,9 @@ public void generic_iEqualityComparer_getHashCode_null_reference()
         [TestCategory("ChangeTracking")]
         public void iEqualityComparer_equals_with_equal_instances()
         {
-            IEqualityComparer instance = new ReferenceEqualityComparer<GenericParameterHelper>();
+            IEqualityComparer instance = new ReferenceEqualityComparer<TestTypeHelper>();
 
-            var x = new GenericParameterHelper();
+            var x = new TestTypeHelper();
             var y = x;
 
             bool actual = instance.Equals(x, y);
@@ -107,9 +107,9 @@ public void iEqualityComparer_equals_with_equal_instances()
         [TestCategory("ChangeTracking")]
         public void iEqualityComparer_equals_with_instance_and_null()
         {
-            IEqualityComparer instance = new ReferenceEqualityComparer<GenericParameterHelper>();
+            IEqualityComparer instance = new ReferenceEqualityComparer<TestTypeHelper>();
 
-            var x = new GenericParameterHelper();
+            var x = new TestTypeHelper();
             bool actual = instance.Equals(x, null);
 
             actual.Should().Be.False();
@@ -119,9 +119,9 @@ public void iEqualityComparer_equals_with_instance_and_null()
         [TestCategory("ChangeTracking")]
         public void iEqualityComparer_equals_with_null_and_instance()
         {
-            IEqualityComparer instance = new ReferenceEqualityComparer<GenericParameterHelper>();
+            IEqualityComparer instance = new ReferenceEqualityComparer<TestTypeHelper>();
 
-            var y = new GenericParameterHelper();
+            var y = new TestTypeHelper();
             bool actual = instance.Equals(null, y);
 
             actual.Should().Be.False();
@@ -131,7 +131,7 @@ public void iEqualityComparer_equals_with_null_and_instance()
         [TestCategory("ChangeTracking")]
         public void iEqualityComparer_equals_with_null_and_null()
         {
-            IEqualityComparer instance = new ReferenceEqualityComparer<GenericParameterHelper>();
+            IEqualityComparer instance = new ReferenceEqualityComparer<TestTypeHelper>();
             bool actual = instance.Equals(null, null);
 
             actual.Should().Be.True();
@@ -141,8 +141,8 @@ public void iEqualityComparer_equals_with_null_and_null()
         [TestCategory("ChangeTracking")]
         public void iEqualityComparer_getHashCode()
         {
-            IEqualityComparer instance = new ReferenceEqualityComparer<GenericParameterHelper>();
-            var obj = new GenericParameterHelper();
+            IEqualityComparer instance = new ReferenceEqualityComparer<TestTypeHelper>();
+            var obj = new TestTypeHelper();
 
             int expected = obj.GetHashCode();
             int actual = instance.GetHashCode(obj);
@@ -156,7 +156,7 @@ public void iEqualityComparer_getHashCode_null_reference()
         {
             Assert.ThrowsExactly<ArgumentNullException>(() =>
             {
-                IEqualityComparer instance = new ReferenceEqualityComparer<GenericParameterHelper>();
+                IEqualityComparer instance = new ReferenceEqualityComparer<TestTypeHelper>();
                 int actual = instance.GetHashCode(null);
             });
         }
diff --git a/src/Radical.Tests/Model/AddingNewEventArgsTest.cs b/src/Radical.Tests/Model/AddingNewEventArgsTest.cs
index 69ca86f2..8a416363 100644
--- a/src/Radical.Tests/Model/AddingNewEventArgsTest.cs
+++ b/src/Radical.Tests/Model/AddingNewEventArgsTest.cs
@@ -10,8 +10,8 @@ public class AddingNewEventArgsTest
         [TestMethod]
         public void addingNewEventArgs_ctor_normal_should_set_expected_values()
         {
-            var expected = new GenericParameterHelper();
-            var target = new AddingNewEventArgs<GenericParameterHelper>();
+            var expected = new TestTypeHelper();
+            var target = new AddingNewEventArgs<TestTypeHelper>();
             target.NewItem = expected;
 
             var actual = target.NewItem;
diff --git a/src/Radical.Tests/Model/CollectionClearedDescriptorTest.cs b/src/Radical.Tests/Model/CollectionClearedDescriptorTest.cs
index 615a94f6..630b0848 100644
--- a/src/Radical.Tests/Model/CollectionClearedDescriptorTest.cs
+++ b/src/Radical.Tests/Model/CollectionClearedDescriptorTest.cs
@@ -12,12 +12,12 @@ public void collectionClearedDescriptor_ctor_normal_should_set_expected_values()
         {
             var items = new[]
             {
-                new GenericParameterHelper(),
-                new GenericParameterHelper(),
-                new GenericParameterHelper()
+                new TestTypeHelper(),
+                new TestTypeHelper(),
+                new TestTypeHelper()
             };
 
-            var target = new CollectionRangeDescriptor<GenericParameterHelper>(items);
+            var target = new CollectionRangeDescriptor<TestTypeHelper>(items);
 
             target.Items.Should().Have.SameSequenceAs(items);
         }
diff --git a/src/Radical.Tests/Model/EntityCollection/EntityCollectionTests.cs b/src/Radical.Tests/Model/EntityCollection/EntityCollectionTests.cs
index 512de951..44539b59 100644
--- a/src/Radical.Tests/Model/EntityCollection/EntityCollectionTests.cs
+++ b/src/Radical.Tests/Model/EntityCollection/EntityCollectionTests.cs
@@ -34,7 +34,7 @@ protected virtual EntityCollection<T> CreateMock<T>(IEnumerable<T> list) where T
         [TestMethod]
         public void entityCollection_ctor_default_should_initialize_expected_values()
         {
-            var target = CreateMock<GenericParameterHelper>();
+            var target = CreateMock<TestTypeHelper>();
 
             target.Count.Should().Be.EqualTo(0);
             target.AllowNew.Should().Be.True();
@@ -43,7 +43,7 @@ public void entityCollection_ctor_default_should_initialize_expected_values()
         [TestMethod]
         public void entityCollection_ctor_capacity_should_initialize_expected_values()
         {
-            var target = CreateMock<GenericParameterHelper>(10);
+            var target = CreateMock<TestTypeHelper>(10);
 
             target.Count.Should().Be.EqualTo(0);
             target.AllowNew.Should().Be.True();
@@ -52,7 +52,7 @@ public void entityCollection_ctor_capacity_should_initialize_expected_values()
         [TestMethod]
         public void entityCollection_ctor_iEnumerable_should_initialize_expected_values()
         {
-            var target = CreateMock<GenericParameterHelper>(new GenericParameterHelper[0]);
+            var target = CreateMock<TestTypeHelper>(new TestTypeHelper[0]);
 
             target.Count.Should().Be.EqualTo(0);
             target.AllowNew.Should().Be.True();
@@ -63,7 +63,7 @@ public void entityCollection_ctor_iEnumerable_null_list_should_raise_ArgumentNul
         {
             Assert.ThrowsExactly<ArgumentNullException>(() =>
             {
-                CreateMock((IEnumerable<GenericParameterHelper>)null);
+                CreateMock((IEnumerable<TestTypeHelper>)null);
             });
         }
 
@@ -72,15 +72,15 @@ public void entityCollection_ctor_int_less_then_zero_should_raise_ArgumentNullEx
         {
             Assert.ThrowsExactly<ArgumentOutOfRangeException>(() =>
             {
-                CreateMock<GenericParameterHelper>(-1);
+                CreateMock<TestTypeHelper>(-1);
             });
         }
 
         [TestMethod]
         public void entityCollection_add_normal_should_increment_count_property()
         {
-            var target = CreateMock<GenericParameterHelper>();
-            target.Add(new GenericParameterHelper());
+            var target = CreateMock<TestTypeHelper>();
+            target.Add(new TestTypeHelper());
 
             target.Count.Should().Be.EqualTo(1);
         }
@@ -88,7 +88,7 @@ public void entityCollection_add_normal_should_increment_count_property()
         [TestMethod]
         public void entityCollection_add_null_value_should_increment_count_property()
         {
-            var target = CreateMock<GenericParameterHelper>();
+            var target = CreateMock<TestTypeHelper>();
             target.Add(null);
 
             target.Count.Should().Be.EqualTo(1);
@@ -97,9 +97,9 @@ public void entityCollection_add_null_value_should_increment_count_property()
         [TestMethod]
         public void entityCollection_add_more_then_once_the_same_reference_works_as_expected()
         {
-            var target = CreateMock<GenericParameterHelper>();
+            var target = CreateMock<TestTypeHelper>();
 
-            GenericParameterHelper item = new GenericParameterHelper();
+            TestTypeHelper item = new TestTypeHelper();
             target.Add(item);
             target.Add(item);
             target.Add(item);
@@ -110,11 +110,11 @@ public void entityCollection_add_more_then_once_the_same_reference_works_as_expe
         [TestMethod]
         public void entityCollection_add_more_then_one_different_reference_works_as_expected()
         {
-            var target = CreateMock<GenericParameterHelper>();
+            var target = CreateMock<TestTypeHelper>();
 
-            target.Add(new GenericParameterHelper());
-            target.Add(new GenericParameterHelper());
-            target.Add(new GenericParameterHelper());
+            target.Add(new TestTypeHelper());
+            target.Add(new TestTypeHelper());
+            target.Add(new TestTypeHelper());
 
             target.Count.Should().Be.EqualTo(3);
         }
@@ -122,13 +122,13 @@ public void entityCollection_add_more_then_one_different_reference_works_as_expe
         [TestMethod]
         public void entityCollection_remove_normal_removes_the_item_from_the_collection()
         {
-            var item = new GenericParameterHelper(2);
-            var data = new GenericParameterHelper[]
+            var item = new TestTypeHelper(2);
+            var data = new TestTypeHelper[]
             {
-                new GenericParameterHelper(0),
-                new GenericParameterHelper(1),
+                new TestTypeHelper(0),
+                new TestTypeHelper(1),
                 item,
-                new GenericParameterHelper(3)
+                new TestTypeHelper(3)
             };
 
             var target = CreateMock(data);
@@ -143,7 +143,7 @@ public void entityCollection_remove_normal_removes_the_item_from_the_collection(
         [TestMethod]
         public void entityCollection_remove_null_reference_should_return_false()
         {
-            var target = CreateMock<GenericParameterHelper>();
+            var target = CreateMock<TestTypeHelper>();
             var actual = target.Remove(null);
 
             actual.Should().Be.False();
@@ -152,12 +152,12 @@ public void entityCollection_remove_null_reference_should_return_false()
         [TestMethod]
         public void entityCollection_remove_a_reference_not_in_the_collection_should_return_false()
         {
-            var target = CreateMock<GenericParameterHelper>();
-            target.Add(new GenericParameterHelper(0));
-            target.Add(new GenericParameterHelper(1));
-            target.Add(new GenericParameterHelper(2));
+            var target = CreateMock<TestTypeHelper>();
+            target.Add(new TestTypeHelper(0));
+            target.Add(new TestTypeHelper(1));
+            target.Add(new TestTypeHelper(2));
 
-            var actual = target.Remove(new GenericParameterHelper());
+            var actual = target.Remove(new TestTypeHelper());
 
             actual.Should().Be.False();
         }
@@ -183,14 +183,14 @@ public void entityCollection_deserialization_normal_should_deserialize_the_same_
         [TestMethod]
         public void entityCollection_normal_isInitializing_should_be_false()
         {
-            var target = CreateMock<GenericParameterHelper>();
+            var target = CreateMock<TestTypeHelper>();
             target.IsInitializing.Should().Be.False();
         }
 
         [TestMethod]
         public void entityCollection_beginInit_normal_should_set_isInitializing_to_true()
         {
-            var target = CreateMock<GenericParameterHelper>();
+            var target = CreateMock<TestTypeHelper>();
             target.BeginInit();
             target.IsInitializing.Should().Be.True();
         }
@@ -198,7 +198,7 @@ public void entityCollection_beginInit_normal_should_set_isInitializing_to_true(
         [TestMethod]
         public void entityCollection_endInit_normal_should_set_isInitializing_to_false()
         {
-            var target = CreateMock<GenericParameterHelper>();
+            var target = CreateMock<TestTypeHelper>();
             target.BeginInit();
             target.EndInit();
             target.IsInitializing.Should().Be.False();
@@ -207,7 +207,7 @@ public void entityCollection_endInit_normal_should_set_isInitializing_to_false()
         [TestMethod]
         public void entityCollection_endInit_without_calling_beginInit_should_not_fail_and_set_isInitializing_to_false()
         {
-            var target = CreateMock<GenericParameterHelper>();
+            var target = CreateMock<TestTypeHelper>();
             target.EndInit();
             target.IsInitializing.Should().Be.False();
         }
@@ -218,7 +218,7 @@ public void entityCollection_endInit_normal_should_raise_collectionChanged_event
             var expected = 1;
             var actual = 0;
 
-            var target = CreateMock<GenericParameterHelper>();
+            var target = CreateMock<TestTypeHelper>();
             target.CollectionChanged += (s, e) => { actual++; };
 
             target.BeginInit();
@@ -233,7 +233,7 @@ public void entityCollection_endInit_without_calling_beginInit_should_not_raise_
             var expected = 0;
             var actual = 0;
 
-            var target = CreateMock<GenericParameterHelper>();
+            var target = CreateMock<TestTypeHelper>();
             target.CollectionChanged += (s, e) => { actual++; };
 
             target.EndInit();
@@ -247,7 +247,7 @@ public void entityCollection_endInit_false_should_not_raise_collectionChanged_ev
             var expected = 0;
             var actual = 0;
 
-            var target = CreateMock<GenericParameterHelper>();
+            var target = CreateMock<TestTypeHelper>();
             target.CollectionChanged += (s, e) => { actual++; };
 
             target.BeginInit();
@@ -262,7 +262,7 @@ public void entityCollection_endInit_true_should_raise_collectionChanged_event()
             var expected = 1;
             var actual = 0;
 
-            var target = CreateMock<GenericParameterHelper>();
+            var target = CreateMock<TestTypeHelper>();
             target.CollectionChanged += (s, e) => { actual++; };
 
             target.BeginInit();
@@ -277,15 +277,15 @@ public void entityCollection_bulkLoad_should_not_raise_collectionChanged_event()
             var expected = 1;
             var actual = 0;
 
-            var target = CreateMock<GenericParameterHelper>();
+            var target = CreateMock<TestTypeHelper>();
             target.CollectionChanged += (s, e) => { actual++; };
 
             target.BeginInit();
 
-            target.Add(new GenericParameterHelper());
-            target.Add(new GenericParameterHelper());
-            target.Add(new GenericParameterHelper());
-            target.Add(new GenericParameterHelper());
+            target.Add(new TestTypeHelper());
+            target.Add(new TestTypeHelper());
+            target.Add(new TestTypeHelper());
+            target.Add(new TestTypeHelper());
 
             target.EndInit(true);
 
@@ -295,12 +295,12 @@ public void entityCollection_bulkLoad_should_not_raise_collectionChanged_event()
         [TestMethod]
         public void entityCollection_set_Item_normal_should_set_correct_item()
         {
-            var expected = new GenericParameterHelper(0);
+            var expected = new TestTypeHelper(0);
 
-            var target = CreateMock<GenericParameterHelper>();
-            target.Add(new GenericParameterHelper(1));
-            target.Add(new GenericParameterHelper(2));
-            target.Add(new GenericParameterHelper(3));
+            var target = CreateMock<TestTypeHelper>();
+            target.Add(new TestTypeHelper(1));
+            target.Add(new TestTypeHelper(2));
+            target.Add(new TestTypeHelper(3));
 
             target[1] = expected;
             var actual = target[1];
@@ -313,9 +313,9 @@ public void entityCollection_set_Item_invalid_index_should_raise_ArgumentOutOfRa
         {
             Assert.ThrowsExactly<ArgumentOutOfRangeException>(() =>
             {
-                var target = CreateMock<GenericParameterHelper>();
+                var target = CreateMock<TestTypeHelper>();
 
-                target[2] = new GenericParameterHelper();
+                target[2] = new TestTypeHelper();
             });
         }
 
@@ -324,7 +324,7 @@ public void entityCollection_get_Item_invalid_index_should_raise_ArgumentOutOfRa
         {
             Assert.ThrowsExactly<ArgumentOutOfRangeException>(() =>
             {
-                var target = CreateMock<GenericParameterHelper>();
+                var target = CreateMock<TestTypeHelper>();
 
                 var actual = target[2];
             });
@@ -333,16 +333,16 @@ public void entityCollection_get_Item_invalid_index_should_raise_ArgumentOutOfRa
         [TestMethod]
         public void entityCollection_add_handler_to_collectionChanged_normal_should_work_as_expected()
         {
-            var target = CreateMock<GenericParameterHelper>();
+            var target = CreateMock<TestTypeHelper>();
             target.CollectionChanged += (s, e) => { };
         }
 
         [TestMethod]
         public void entityCollection_revove_handler_to_collectionChanged_normal_should_work_as_expected()
         {
-            EventHandler<CollectionChangedEventArgs<GenericParameterHelper>> h = (s, e) => { };
+            EventHandler<CollectionChangedEventArgs<TestTypeHelper>> h = (s, e) => { };
 
-            var target = CreateMock<GenericParameterHelper>();
+            var target = CreateMock<TestTypeHelper>();
             target.CollectionChanged += h;
             target.CollectionChanged -= h;
         }
@@ -350,22 +350,22 @@ public void entityCollection_revove_handler_to_collectionChanged_normal_should_w
         [TestMethod]
         public void entityCollection_revove_handler_to_collectionChanged_even_if_add_handler_has_not_been_called_should_work_as_expected()
         {
-            EventHandler<CollectionChangedEventArgs<GenericParameterHelper>> h = (s, e) => { };
+            EventHandler<CollectionChangedEventArgs<TestTypeHelper>> h = (s, e) => { };
 
-            var target = CreateMock<GenericParameterHelper>();
+            var target = CreateMock<TestTypeHelper>();
             target.CollectionChanged -= h;
         }
 
         [TestMethod]
         public void entityCollection_addRange_normal_should_add_items()
         {
-            var target = CreateMock<GenericParameterHelper>();
+            var target = CreateMock<TestTypeHelper>();
 
             var range = new[]
             {
-                new GenericParameterHelper( 0 ),
-                new GenericParameterHelper( 1 ),
-                new GenericParameterHelper( 2 )
+                new TestTypeHelper( 0 ),
+                new TestTypeHelper( 1 ),
+                new TestTypeHelper( 2 )
             };
 
             target.AddRange(range);
@@ -376,13 +376,13 @@ public void entityCollection_addRange_normal_should_add_items()
         [TestMethod]
         public void entityCollection_addRange_normal_should_increment_count()
         {
-            var target = CreateMock<GenericParameterHelper>();
+            var target = CreateMock<TestTypeHelper>();
 
             var range = new[]
             {
-                new GenericParameterHelper( 0 ),
-                new GenericParameterHelper( 1 ),
-                new GenericParameterHelper( 2 )
+                new TestTypeHelper( 0 ),
+                new TestTypeHelper( 1 ),
+                new TestTypeHelper( 2 )
             };
 
             target.AddRange(range);
@@ -395,7 +395,7 @@ public void entityCollection_addRange_null_reference_should_raise_ArgumentNullEx
         {
             Assert.ThrowsExactly<ArgumentNullException>(() =>
             {
-                var target = CreateMock<GenericParameterHelper>();
+                var target = CreateMock<TestTypeHelper>();
 
                 target.AddRange(null);
             });
@@ -404,10 +404,10 @@ public void entityCollection_addRange_null_reference_should_raise_ArgumentNullEx
         [TestMethod]
         public void entityCollection_clear_normal_should_empty_the_collection()
         {
-            var target = CreateMock<GenericParameterHelper>();
-            target.Add(new GenericParameterHelper(0));
-            target.Add(new GenericParameterHelper(1));
-            target.Add(new GenericParameterHelper(2));
+            var target = CreateMock<TestTypeHelper>();
+            target.Add(new TestTypeHelper(0));
+            target.Add(new TestTypeHelper(1));
+            target.Add(new TestTypeHelper(2));
 
             target.Clear();
             target.Count.Should().Be.EqualTo(0);
@@ -416,7 +416,7 @@ public void entityCollection_clear_normal_should_empty_the_collection()
         [TestMethod]
         public void entityCollection_clear_empty_collection_should_behave_as_expected()
         {
-            var target = CreateMock<GenericParameterHelper>();
+            var target = CreateMock<TestTypeHelper>();
 
             target.Clear();
             target.Count.Should().Be.EqualTo(0);
@@ -425,12 +425,12 @@ public void entityCollection_clear_empty_collection_should_behave_as_expected()
         [TestMethod]
         public void entityCollection_copyTo_array_normal_should_copy_elements_to_given_array()
         {
-            var target = CreateMock<GenericParameterHelper>();
-            target.Add(new GenericParameterHelper(0));
-            target.Add(new GenericParameterHelper(1));
-            target.Add(new GenericParameterHelper(2));
+            var target = CreateMock<TestTypeHelper>();
+            target.Add(new TestTypeHelper(0));
+            target.Add(new TestTypeHelper(1));
+            target.Add(new TestTypeHelper(2));
 
-            var destination = new GenericParameterHelper[3];
+            var destination = new TestTypeHelper[3];
             target.CopyTo(destination);
 
             destination.Should().Have.SameSequenceAs(target);
@@ -441,10 +441,10 @@ public void entityCollection_copyTo_array_null_reference_destination_array_shoul
         {
             Assert.ThrowsExactly<ArgumentNullException>(() =>
             {
-                var target = CreateMock<GenericParameterHelper>();
-                target.Add(new GenericParameterHelper(0));
-                target.Add(new GenericParameterHelper(1));
-                target.Add(new GenericParameterHelper(2));
+                var target = CreateMock<TestTypeHelper>();
+                target.Add(new TestTypeHelper(0));
+                target.Add(new TestTypeHelper(1));
+                target.Add(new TestTypeHelper(2));
 
                 target.CopyTo(null);
             });
@@ -455,12 +455,12 @@ public void entityCollection_copyTo_array_destination_array_smaller_then_source_
         {
             Assert.ThrowsExactly<ArgumentException>(() =>
             {
-                var target = CreateMock<GenericParameterHelper>();
-                target.Add(new GenericParameterHelper(0));
-                target.Add(new GenericParameterHelper(1));
-                target.Add(new GenericParameterHelper(2));
+                var target = CreateMock<TestTypeHelper>();
+                target.Add(new TestTypeHelper(0));
+                target.Add(new TestTypeHelper(1));
+                target.Add(new TestTypeHelper(2));
 
-                var destination = new GenericParameterHelper[1];
+                var destination = new TestTypeHelper[1];
                 target.CopyTo(destination);
             });
         }
@@ -468,12 +468,12 @@ public void entityCollection_copyTo_array_destination_array_smaller_then_source_
         [TestMethod]
         public void entityCollection_copyTo_array_destination_array_greater_then_source_should_copy_elements_to_given_array()
         {
-            var target = CreateMock<GenericParameterHelper>();
-            target.Add(new GenericParameterHelper(0));
-            target.Add(new GenericParameterHelper(1));
-            target.Add(new GenericParameterHelper(2));
+            var target = CreateMock<TestTypeHelper>();
+            target.Add(new TestTypeHelper(0));
+            target.Add(new TestTypeHelper(1));
+            target.Add(new TestTypeHelper(2));
 
-            var destination = new GenericParameterHelper[5];
+            var destination = new TestTypeHelper[5];
             target.CopyTo(destination);
 
             target[0].Should().Be.EqualTo(destination[0]);
@@ -484,12 +484,12 @@ public void entityCollection_copyTo_array_destination_array_greater_then_source_
         [TestMethod]
         public void entityCollection_copyTo_array_index_should_copy_elements_starting_at_the_given_index()
         {
-            var target = CreateMock<GenericParameterHelper>();
-            target.Add(new GenericParameterHelper(0));
-            target.Add(new GenericParameterHelper(1));
-            target.Add(new GenericParameterHelper(2));
+            var target = CreateMock<TestTypeHelper>();
+            target.Add(new TestTypeHelper(0));
+            target.Add(new TestTypeHelper(1));
+            target.Add(new TestTypeHelper(2));
 
-            var destination = new GenericParameterHelper[5];
+            var destination = new TestTypeHelper[5];
             target.CopyTo(destination, 2);
 
             destination[0].Should().Be.Null();
@@ -502,7 +502,7 @@ public void entityCollection_copyTo_array_index_should_copy_elements_starting_at
         [TestMethod]
         public void entityCollection_createView_normal_should_create_non_null_view()
         {
-            var target = CreateMock<GenericParameterHelper>();
+            var target = CreateMock<TestTypeHelper>();
             var actual = target.CreateView();
 
             actual.Should().Not.Be.Null();
@@ -511,7 +511,7 @@ public void entityCollection_createView_normal_should_create_non_null_view()
         [TestMethod]
         public void entityCollection_createView_normal_should_create_different_views()
         {
-            var target = CreateMock<GenericParameterHelper>();
+            var target = CreateMock<TestTypeHelper>();
             var first = target.CreateView();
             var second = target.CreateView();
 
@@ -521,7 +521,7 @@ public void entityCollection_createView_normal_should_create_different_views()
         [TestMethod]
         public void entityCollection_defaultView_normal_should_return_non_null_view()
         {
-            var target = CreateMock<GenericParameterHelper>();
+            var target = CreateMock<TestTypeHelper>();
             var actual = target.DefaultView;
 
             actual.Should().Not.Be.Null();
@@ -530,7 +530,7 @@ public void entityCollection_defaultView_normal_should_return_non_null_view()
         [TestMethod]
         public void entityCollection_defaultView_normal_should_return_singleton_view()
         {
-            var target = CreateMock<GenericParameterHelper>();
+            var target = CreateMock<TestTypeHelper>();
             var first = target.DefaultView;
             var second = target.DefaultView;
 
@@ -540,10 +540,10 @@ public void entityCollection_defaultView_normal_should_return_singleton_view()
         [TestMethod]
         public void entityCollection_reverse_should_reverse_elements()
         {
-            var target = new EntityCollection<GenericParameterHelper>
+            var target = new EntityCollection<TestTypeHelper>
             {
-                new GenericParameterHelper() { Data = 1 },
-                new GenericParameterHelper() { Data = 2 }
+                new TestTypeHelper() { Data = 1 },
+                new TestTypeHelper() { Data = 2 }
             };
 
             target.Reverse();
@@ -557,10 +557,10 @@ public void entityCollection_reverse_should_reverse_elements()
         [TestMethod]
         public void entityCollection_defaultView_should_respect_reverse()
         {
-            var target = new EntityCollection<GenericParameterHelper>
+            var target = new EntityCollection<TestTypeHelper>
             {
-                new GenericParameterHelper() { Data = 1 },
-                new GenericParameterHelper() { Data = 2 }
+                new TestTypeHelper() { Data = 1 },
+                new TestTypeHelper() { Data = 2 }
             };
 
             //this creates the default view that is cached internally
diff --git a/src/Radical.Tests/Model/EntityView/EntityItemViewPropertyDescriptorTests.cs b/src/Radical.Tests/Model/EntityView/EntityItemViewPropertyDescriptorTests.cs
index 426223b9..7b14ece2 100644
--- a/src/Radical.Tests/Model/EntityView/EntityItemViewPropertyDescriptorTests.cs
+++ b/src/Radical.Tests/Model/EntityView/EntityItemViewPropertyDescriptorTests.cs
@@ -15,12 +15,12 @@ public class EntityItemViewPropertyDescriptorTests
         public void entityItemViewPropertyDescriptor_ctor_default_should_correctly_set_default_values()
         {
             var expected = "Data";
-            var target = new EntityItemViewPropertyDescriptor<GenericParameterHelper>(expected);
+            var target = new EntityItemViewPropertyDescriptor<TestTypeHelper>(expected);
 
             target.Category.Should().Be.EqualTo("Misc");
             target.Attributes.OfType<Attribute>().Should().Have.SameSequenceAs(new Attribute[0]);
-            target.ComponentType.Should().Be.EqualTo(typeof(IEntityItemView<GenericParameterHelper>));
-            target.Converter.GetType().Should().Be.EqualTo(typeof(Int32Converter));
+            target.ComponentType.Should().Be.EqualTo(typeof(IEntityItemView<TestTypeHelper>));
+            target.Converter.GetType().Should().Be.EqualTo(typeof(NullableConverter));
             target.Description.Should().Be.EqualTo(string.Empty);
             target.DesignTimeOnly.Should().Be.False();
             target.DisplayName.Should().Be.EqualTo(expected);
@@ -28,7 +28,7 @@ public void entityItemViewPropertyDescriptor_ctor_default_should_correctly_set_d
             target.IsLocalizable.Should().Be.False();
             target.IsReadOnly.Should().Be.False();
             target.Name.Should().Be.EqualTo(expected);
-            target.PropertyType.Should().Be.EqualTo(typeof(int));
+            target.PropertyType.Should().Be.EqualTo(typeof(int?));
         }
 
         [TestMethod]
@@ -37,12 +37,12 @@ public void entityItemViewPropertyDescriptor_ctor_propertyName_customDisplayName
             var propertyName = "Data";
             var customDisplayName = "Foo";
 
-            var target = new EntityItemViewPropertyDescriptor<GenericParameterHelper>(propertyName, customDisplayName);
+            var target = new EntityItemViewPropertyDescriptor<TestTypeHelper>(propertyName, customDisplayName);
 
             target.Category.Should().Be.EqualTo("Misc");
             target.Attributes.OfType<Attribute>().Should().Have.SameSequenceAs(new Attribute[0]);
-            target.ComponentType.Should().Be.EqualTo(typeof(IEntityItemView<GenericParameterHelper>));
-            target.Converter.GetType().Should().Be.EqualTo(typeof(Int32Converter));
+            target.ComponentType.Should().Be.EqualTo(typeof(IEntityItemView<TestTypeHelper>));
+            target.Converter.GetType().Should().Be.EqualTo(typeof(NullableConverter));
             target.Description.Should().Be.EqualTo(string.Empty);
             target.DesignTimeOnly.Should().Be.False();
             target.DisplayName.Should().Be.EqualTo(customDisplayName);
@@ -50,20 +50,20 @@ public void entityItemViewPropertyDescriptor_ctor_propertyName_customDisplayName
             target.IsLocalizable.Should().Be.False();
             target.IsReadOnly.Should().Be.False();
             target.Name.Should().Be.EqualTo(propertyName);
-            target.PropertyType.Should().Be.EqualTo(typeof(int));
+            target.PropertyType.Should().Be.EqualTo(typeof(int?));
         }
 
         [TestMethod]
         public void entityItemViewPropertyDescriptor_ctor_propertyInfo_should_correctly_set_default_values()
         {
-            var expected = typeof(GenericParameterHelper).GetProperty("Data");
+            var expected = typeof(TestTypeHelper).GetProperty("Data");
 
-            var target = new EntityItemViewPropertyDescriptor<GenericParameterHelper>(expected);
+            var target = new EntityItemViewPropertyDescriptor<TestTypeHelper>(expected);
 
             target.Category.Should().Be.EqualTo("Misc");
             target.Attributes.OfType<Attribute>().Should().Have.SameSequenceAs(new Attribute[0]);
-            target.ComponentType.Should().Be.EqualTo(typeof(IEntityItemView<GenericParameterHelper>));
-            target.Converter.GetType().Should().Be.EqualTo(typeof(Int32Converter));
+            target.ComponentType.Should().Be.EqualTo(typeof(IEntityItemView<TestTypeHelper>));
+            target.Converter.GetType().Should().Be.EqualTo(typeof(NullableConverter));
             target.Description.Should().Be.EqualTo(string.Empty);
             target.DesignTimeOnly.Should().Be.False();
             target.DisplayName.Should().Be.EqualTo(expected.Name);
@@ -78,13 +78,13 @@ public void entityItemViewPropertyDescriptor_ctor_propertyInfo_should_correctly_
         public void entityItemViewCustomPropertyDescriptor_ctor_customDisplayName_propertyType_valueGetter_should_correctly_set_default_values()
         {
             var customPropertyName = "Foo";
-            EntityItemViewValueGetter<GenericParameterHelper, int> getter = (obj) => { return null; };
+            EntityItemViewValueGetter<TestTypeHelper, int> getter = (obj) => { return null; };
 
-            var target = new EntityItemViewCustomPropertyDescriptor<GenericParameterHelper, int>(customPropertyName, getter);
+            var target = new EntityItemViewCustomPropertyDescriptor<TestTypeHelper, int>(customPropertyName, getter);
 
             target.Category.Should().Be.EqualTo("Misc");
             target.Attributes.OfType<Attribute>().Should().Have.SameSequenceAs(new Attribute[0]);
-            target.ComponentType.Should().Be.EqualTo(typeof(IEntityItemView<GenericParameterHelper>));
+            target.ComponentType.Should().Be.EqualTo(typeof(IEntityItemView<TestTypeHelper>));
             target.Converter.GetType().Should().Be.EqualTo(typeof(Int32Converter));
             target.Description.Should().Be.EqualTo(string.Empty);
             target.DesignTimeOnly.Should().Be.False();
@@ -100,14 +100,14 @@ public void entityItemViewCustomPropertyDescriptor_ctor_customDisplayName_proper
         public void entityItemViewCustomPropertyDescriptor_ctor_customDisplayName_propertyType_valueGetter_valueSetter_should_correctly_set_default_values()
         {
             var customPropertyName = "Foo";
-            EntityItemViewValueGetter<GenericParameterHelper, int> getter = arg => { return null; };
-            EntityItemViewValueSetter<GenericParameterHelper, int> setter = arg => { };
+            EntityItemViewValueGetter<TestTypeHelper, int> getter = arg => { return null; };
+            EntityItemViewValueSetter<TestTypeHelper, int> setter = arg => { };
 
-            var target = new EntityItemViewCustomPropertyDescriptor<GenericParameterHelper, int>(customPropertyName, getter, setter);
+            var target = new EntityItemViewCustomPropertyDescriptor<TestTypeHelper, int>(customPropertyName, getter, setter);
 
             target.Category.Should().Be.EqualTo("Misc");
             target.Attributes.OfType<Attribute>().Should().Have.SameSequenceAs(new Attribute[0]);
-            target.ComponentType.Should().Be.EqualTo(typeof(IEntityItemView<GenericParameterHelper>));
+            target.ComponentType.Should().Be.EqualTo(typeof(IEntityItemView<TestTypeHelper>));
             target.Converter.GetType().Should().Be.EqualTo(typeof(Int32Converter));
             target.Description.Should().Be.EqualTo(string.Empty);
             target.DesignTimeOnly.Should().Be.False();
@@ -122,7 +122,7 @@ public void entityItemViewCustomPropertyDescriptor_ctor_customDisplayName_proper
         [TestMethod]
         public void entityItemViewPropertyDescriptor_canResetValue_normal_should_return_always_false()
         {
-            var target = new EntityItemViewPropertyDescriptor<GenericParameterHelper>("Data");
+            var target = new EntityItemViewPropertyDescriptor<TestTypeHelper>("Data");
 
             bool actual = target.CanResetValue(null);
             actual.Should().Be.False();
@@ -131,15 +131,15 @@ public void entityItemViewPropertyDescriptor_canResetValue_normal_should_return_
         [TestMethod]
         public void entityItemViewPropertyDescriptor_resetValue_normal_should_do_nothing()
         {
-            var target = new EntityItemViewPropertyDescriptor<GenericParameterHelper>("Data");
-            target.ResetValue(new GenericParameterHelper());
+            var target = new EntityItemViewPropertyDescriptor<TestTypeHelper>("Data");
+            target.ResetValue(new TestTypeHelper());
         }
 
         [TestMethod]
         public void entityItemViewPropertyDescriptor_shouldSerializeValue_normal_return_false()
         {
-            var target = new EntityItemViewPropertyDescriptor<GenericParameterHelper>("Data");
-            bool actual = target.ShouldSerializeValue(new GenericParameterHelper());
+            var target = new EntityItemViewPropertyDescriptor<TestTypeHelper>("Data");
+            bool actual = target.ShouldSerializeValue(new TestTypeHelper());
 
             actual.Should().Be.False();
         }
@@ -148,12 +148,12 @@ public void entityItemViewPropertyDescriptor_shouldSerializeValue_normal_return_
         public void entityItemViewPropertyDescriptor_getValue_using_default_ctor_should_return_expected_value()
         {
             var expected = 100;
-            var component = A.Fake<IEntityItemView<GenericParameterHelper>>();
+            var component = A.Fake<IEntityItemView<TestTypeHelper>>();
             A.CallTo(() => component.EntityItem)
-                .Returns(new GenericParameterHelper(expected))
+                .Returns(new TestTypeHelper(expected))
                 .NumberOfTimes(1);
 
-            var target = new EntityItemViewPropertyDescriptor<GenericParameterHelper>("Data");
+            var target = new EntityItemViewPropertyDescriptor<TestTypeHelper>("Data");
             int actual = (int)target.GetValue(component);
 
             actual.Should().Be.EqualTo(expected);
@@ -164,14 +164,14 @@ public void entityItemViewPropertyDescriptor_getValue_using_default_ctor_should_
         public void entityItemViewPropertyDescriptor_setValue_using_default_ctor_should_set_expected_value()
         {
             var expected = 100;
-            var entityItem = new GenericParameterHelper(0);
+            var entityItem = new TestTypeHelper(0);
 
-            var component = A.Fake<IEntityItemView<GenericParameterHelper>>();
+            var component = A.Fake<IEntityItemView<TestTypeHelper>>();
             A.CallTo(() => component.EntityItem)
                 .Returns(entityItem)
                 .NumberOfTimes(1);
 
-            var target = new EntityItemViewPropertyDescriptor<GenericParameterHelper>("Data");
+            var target = new EntityItemViewPropertyDescriptor<TestTypeHelper>("Data");
             target.SetValue(component, expected);
 
             entityItem.Data.Should().Be.EqualTo(expected);
@@ -183,7 +183,7 @@ public void entityItemViewPropertyDescriptor_getValue_using_null_reference_compo
         {
             Assert.ThrowsExactly<ArgumentNullException>(() =>
             {
-                var target = new EntityItemViewPropertyDescriptor<GenericParameterHelper>("Data");
+                var target = new EntityItemViewPropertyDescriptor<TestTypeHelper>("Data");
                 target.GetValue(null);
             });
         }
@@ -193,7 +193,7 @@ public void entityItemViewPropertyDescriptor_setValue_using_null_reference_compo
         {
             Assert.ThrowsExactly<ArgumentNullException>(() =>
             {
-                var target = new EntityItemViewPropertyDescriptor<GenericParameterHelper>("Data");
+                var target = new EntityItemViewPropertyDescriptor<TestTypeHelper>("Data");
                 target.SetValue(null, 100);
             });
         }
@@ -203,7 +203,7 @@ public void entityItemViewPropertyDescriptor_getValue_using_invalid_reference_co
         {
             Assert.ThrowsExactly<ArgumentException>(() =>
             {
-                var target = new EntityItemViewPropertyDescriptor<GenericParameterHelper>("Data");
+                var target = new EntityItemViewPropertyDescriptor<TestTypeHelper>("Data");
                 target.GetValue(new object());
             });
         }
@@ -213,7 +213,7 @@ public void entityItemViewPropertyDescriptor_setValue_using_invalid_reference_co
         {
             Assert.ThrowsExactly<ArgumentException>(() =>
             {
-                var target = new EntityItemViewPropertyDescriptor<GenericParameterHelper>("Data");
+                var target = new EntityItemViewPropertyDescriptor<TestTypeHelper>("Data");
                 target.SetValue(new object(), 100);
             });
         }
diff --git a/src/Radical.Tests/Model/ItemChangedDescriptorTest.cs b/src/Radical.Tests/Model/ItemChangedDescriptorTest.cs
index 8f56203c..0bf7b47e 100644
--- a/src/Radical.Tests/Model/ItemChangedDescriptorTest.cs
+++ b/src/Radical.Tests/Model/ItemChangedDescriptorTest.cs
@@ -10,10 +10,10 @@ public class ItemChangedDescriptorTest
         [TestMethod]
         public void itemChangedDescriptor_ctor_normal_should_set_expected_values()
         {
-            var item = new GenericParameterHelper();
+            var item = new TestTypeHelper();
             var index = 10;
 
-            var target = new ItemChangedDescriptor<GenericParameterHelper>(item, index);
+            var target = new ItemChangedDescriptor<TestTypeHelper>(item, index);
 
             target.Index.Should().Be.EqualTo(index);
             target.Item.Should().Be.EqualTo(item);
diff --git a/src/Radical.Tests/Model/ItemMovedDescriptorTest.cs b/src/Radical.Tests/Model/ItemMovedDescriptorTest.cs
index c754422c..77fd80b5 100644
--- a/src/Radical.Tests/Model/ItemMovedDescriptorTest.cs
+++ b/src/Radical.Tests/Model/ItemMovedDescriptorTest.cs
@@ -11,11 +11,11 @@ public class ItemMovedDescriptorTest
         [TestMethod]
         public void itemMovedDescriptor_ctor_normal_should_set_expected_values()
         {
-            var item = new GenericParameterHelper();
+            var item = new TestTypeHelper();
             var newIndex = 50;
             var oldIndex = 2;
 
-            var target = new ItemMovedDescriptor<GenericParameterHelper>(item, newIndex, oldIndex);
+            var target = new ItemMovedDescriptor<TestTypeHelper>(item, newIndex, oldIndex);
 
             target.Index.Should().Be.EqualTo(newIndex);
             target.Item.Should().Be.EqualTo(item);
diff --git a/src/Radical.Tests/Model/ItemReplacedDescriptorTest.cs b/src/Radical.Tests/Model/ItemReplacedDescriptorTest.cs
index ca366f1d..7fe13b82 100644
--- a/src/Radical.Tests/Model/ItemReplacedDescriptorTest.cs
+++ b/src/Radical.Tests/Model/ItemReplacedDescriptorTest.cs
@@ -10,11 +10,11 @@ public class ItemReplacedDescriptorTest
         [TestMethod]
         public void itemReplacedDescriptor_ctor_normal_should_set_expected_values()
         {
-            var newItem = new GenericParameterHelper();
-            var replacedItem = new GenericParameterHelper();
+            var newItem = new TestTypeHelper();
+            var replacedItem = new TestTypeHelper();
             var index = 102;
 
-            var target = new ItemReplacedDescriptor<GenericParameterHelper>(newItem, replacedItem, index);
+            var target = new ItemReplacedDescriptor<TestTypeHelper>(newItem, replacedItem, index);
 
             target.Index.Should().Be.EqualTo(index);
             target.Item.Should().Be.EqualTo(newItem);
diff --git a/src/Radical.Tests/Model/PredicateEntityItemViewFilterTest.cs b/src/Radical.Tests/Model/PredicateEntityItemViewFilterTest.cs
index ea5afb70..f8305af3 100644
--- a/src/Radical.Tests/Model/PredicateEntityItemViewFilterTest.cs
+++ b/src/Radical.Tests/Model/PredicateEntityItemViewFilterTest.cs
@@ -15,13 +15,13 @@ public void predicateEntityItemViewFilter_ctor_predicate_should_set_expected_val
             var expected = 1;
             var actual = 0;
 
-            var target = new PredicateEntityItemViewFilter<GenericParameterHelper>(v =>
+            var target = new PredicateEntityItemViewFilter<TestTypeHelper>(v =>
            {
                actual++;
                return true;
            });
 
-            target.ShouldInclude(new GenericParameterHelper());
+            target.ShouldInclude(new TestTypeHelper());
 
             actual.Should().Be.EqualTo(expected);
             target.ToString().Should().Be.EqualTo(expectedName);
@@ -34,13 +34,13 @@ public void predicateEntityItemViewFilter_ctor_predicate_string_should_set_expec
             var expected = 1;
             var actual = 0;
 
-            var target = new PredicateEntityItemViewFilter<GenericParameterHelper>(v =>
+            var target = new PredicateEntityItemViewFilter<TestTypeHelper>(v =>
            {
                actual++;
                return true;
            }, expectedName);
 
-            target.ShouldInclude(new GenericParameterHelper());
+            target.ShouldInclude(new TestTypeHelper());
 
             actual.Should().Be.EqualTo(expected);
             target.ToString().Should().Be.EqualTo(expectedName);
@@ -53,13 +53,13 @@ public void predicateEntityItemViewFilter_ctor_predicate_null_string_should_set_
             var expected = 1;
             var actual = 0;
 
-            var target = new PredicateEntityItemViewFilter<GenericParameterHelper>(v =>
+            var target = new PredicateEntityItemViewFilter<TestTypeHelper>(v =>
            {
                actual++;
                return true;
            }, null);
 
-            target.ShouldInclude(new GenericParameterHelper());
+            target.ShouldInclude(new TestTypeHelper());
 
             actual.Should().Be.EqualTo(expected);
             target.ToString().Should().Be.EqualTo(expectedName);
@@ -70,7 +70,7 @@ public void predicateEntityItemViewFilter_ctor_null_predicate_should_raise_Argum
         {
             Assert.ThrowsExactly<ArgumentNullException>(() =>
             {
-                var target = new PredicateEntityItemViewFilter<GenericParameterHelper>(null);
+                var target = new PredicateEntityItemViewFilter<TestTypeHelper>(null);
             });
         }
 
@@ -79,7 +79,7 @@ public void predicateEntityItemViewFilter_ctor_null_predicate_null_string_should
         {
             Assert.ThrowsExactly<ArgumentNullException>(() =>
             {
-                var target = new PredicateEntityItemViewFilter<GenericParameterHelper>(null, null);
+                var target = new PredicateEntityItemViewFilter<TestTypeHelper>(null, null);
             });
         }
     }
diff --git a/src/Radical.Tests/Model/ViewAllEntityItemViewFilterTest.cs b/src/Radical.Tests/Model/ViewAllEntityItemViewFilterTest.cs
index 5e70312a..7e9bfc42 100644
--- a/src/Radical.Tests/Model/ViewAllEntityItemViewFilterTest.cs
+++ b/src/Radical.Tests/Model/ViewAllEntityItemViewFilterTest.cs
@@ -11,8 +11,8 @@ public class ViewAllEntityItemViewFilterTest
         [TestMethod]
         public void viewAllEntityItemViewFilter_instance_normal_is_singleton()
         {
-            var expected = ViewAllEntityItemViewFilter<GenericParameterHelper>.Instance;
-            var actual = ViewAllEntityItemViewFilter<GenericParameterHelper>.Instance;
+            var expected = ViewAllEntityItemViewFilter<TestTypeHelper>.Instance;
+            var actual = ViewAllEntityItemViewFilter<TestTypeHelper>.Instance;
 
             actual.Should().Be.EqualTo(expected);
         }
@@ -20,7 +20,7 @@ public void viewAllEntityItemViewFilter_instance_normal_is_singleton()
         [TestMethod]
         public void viewAllEntityItemViewFilter_instance_using_different_generic_types_is_not_singleton()
         {
-            var expected = ViewAllEntityItemViewFilter<GenericParameterHelper>.Instance;
+            var expected = ViewAllEntityItemViewFilter<TestTypeHelper>.Instance;
             var actual = ViewAllEntityItemViewFilter<object>.Instance;
 
             actual.Should().Not.Be.EqualTo(expected);
@@ -29,8 +29,8 @@ public void viewAllEntityItemViewFilter_instance_using_different_generic_types_i
         [TestMethod]
         public void viewAllEntityItemViewFilter_shouldInclude_should_always_return_true()
         {
-            var target = ViewAllEntityItemViewFilter<GenericParameterHelper>.Instance;
-            var actual = target.ShouldInclude(new GenericParameterHelper());
+            var target = ViewAllEntityItemViewFilter<TestTypeHelper>.Instance;
+            var actual = target.ShouldInclude(new TestTypeHelper());
 
             actual.Should().Be.True();
         }
@@ -40,8 +40,8 @@ public void viewAllEntityItemViewFilter_shouldInclude_using_null_reference_shoul
         {
             Assert.ThrowsExactly<ArgumentNullException>(() =>
             {
-                var target = ViewAllEntityItemViewFilter<GenericParameterHelper>.Instance;
-                ((ViewAllEntityItemViewFilter<GenericParameterHelper>)target).ShouldInclude(null);
+                var target = ViewAllEntityItemViewFilter<TestTypeHelper>.Instance;
+                ((ViewAllEntityItemViewFilter<TestTypeHelper>)target).ShouldInclude(null);
             });
         }
 
@@ -49,7 +49,7 @@ public void viewAllEntityItemViewFilter_shouldInclude_using_null_reference_shoul
         public void viewAllEntityItemViewFilter_toString_normal_should_return_expected_value()
         {
             var expected = "View all.";
-            var target = ViewAllEntityItemViewFilter<GenericParameterHelper>.Instance;
+            var target = ViewAllEntityItemViewFilter<TestTypeHelper>.Instance;
 
             var actual = target.ToString();
 
diff --git a/src/Radical.Tests/Radical.Tests.csproj b/src/Radical.Tests/Radical.Tests.csproj
index 82021523..13eed70b 100644
--- a/src/Radical.Tests/Radical.Tests.csproj
+++ b/src/Radical.Tests/Radical.Tests.csproj
@@ -14,8 +14,8 @@
     <PackageReference Include="FakeItEasy" Version="8.3.0" />
     <PackageReference Include="MessagePack" Version="3.1.4" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.11.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.11.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
     <PackageReference Include="PublicApiGenerator" Version="11.5.0" />
     <PackageReference Include="SharpTestsEx" Version="2.0.0" />
   </ItemGroup>
diff --git a/src/Radical.Tests/TestTypeHelper.cs b/src/Radical.Tests/TestTypeHelper.cs
new file mode 100644
index 00000000..265e190d
--- /dev/null
+++ b/src/Radical.Tests/TestTypeHelper.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections;
+using System.Linq;
+
+namespace Radical.Tests;
+
+public class TestTypeHelper : IComparable, IEnumerable, ICloneable
+{
+    public int? Data { get; set; }
+
+    public TestTypeHelper() { }
+    public TestTypeHelper(int? data) => Data = data;
+
+    public int CompareTo(object obj) => Data == (obj as TestTypeHelper)?.Data ? 0 : -1;
+
+    public IEnumerator GetEnumerator()
+    {
+        if (Data == null)
+        {
+            yield break;
+        }
+
+        Enumerable.Range(0, Data.Value).GetEnumerator();
+    }
+
+    public object Clone() => new TestTypeHelper(Data);
+    
+    public override bool Equals(object obj) => 
+        obj is TestTypeHelper other && Data == other.Data;
+    
+    public override int GetHashCode() => Data.GetHashCode();
+}
\ No newline at end of file