diff --git a/src/BBT.StructureTools.Tests/Convert/ConvertRootTreeLeafWithMasterDataTests.cs b/src/BBT.StructureTools.Tests/Convert/ConvertRootTreeLeafWithMasterDataTests.cs
index 6af0682..5f9f4b8 100644
--- a/src/BBT.StructureTools.Tests/Convert/ConvertRootTreeLeafWithMasterDataTests.cs
+++ b/src/BBT.StructureTools.Tests/Convert/ConvertRootTreeLeafWithMasterDataTests.cs
@@ -31,7 +31,7 @@ public ConvertRootTreeLeafWithMasterDataTests()
             kernel.Bind<IConvertRegistrations<TreeMasterData, TargetTree, ITestConvertIntention>>().To<TreeMasterDataToTreeConvertRegistrations>();
 
             kernel.Bind<IConvertRegistrations<Leaf, TargetLeaf, ITestConvertIntention>>().To<LeafTargetLeafConvertRegistrations>();
-            kernel.Bind<IConvertRegistrations<LeafMasterData, TargetLeaf, ITestConvertIntention>>().To<LeafMasterDattargetLeafConvertRegistrations>();
+            kernel.Bind<IConvertRegistrations<LeafMasterData, TargetLeaf, ITestConvertIntention>>().To<LeafMasterDataTargetLeafConvertRegistrations>();
             kernel.Bind<IConvertRegistrations<TemporalLeafMasterData, TargetLeaf, ITestConvertIntention>>().To<TemporalLeafMasterDataTemporalLeafDatconvertRegistrations>();
 
             kernel.Bind<ICopyRegistrations<ITemporalData>>().To<TemporalDatcopyRegistrations>();
@@ -79,12 +79,12 @@ public void StructureFromRootToLeafIsConvertIntoTargetStructure()
             leaf.TemporalLeafMasterData.Add(temporalleafmasterdata2);
 
             // Add values to properties
-            root.CreateValueForProperty(x => x.RootName);
-            tree.CreateValueForProperty(x => x.TreeName);
-            treemasterdata.CreateValueForProperty(x => x.TreeMasterDataName);
-            leaf.CreateValueForProperty(x => x.LeafName);
-            leafmasterdata.CreateValueForProperty(x => x.LeafMasterDataName);
-            leafmasterdata2.CreateValueForProperty(x => x.LeafMasterDataName);
+            root.CreateStringForProperty(x => x.RootName);
+            tree.CreateStringForProperty(x => x.TreeName);
+            treemasterdata.CreateStringForProperty(x => x.TreeMasterDataName);
+            leaf.CreateStringForProperty(x => x.LeafName);
+            leafmasterdata.CreateStringForProperty(x => x.LeafMasterDataName);
+            leafmasterdata2.CreateStringForProperty(x => x.LeafMasterDataName);
 
             // Act
             var target = new TargetRoot();
diff --git a/src/BBT.StructureTools.Tests/Convert/TestStructure/Registration/LeafMasterDattargetLeafConvertRegistrations.cs b/src/BBT.StructureTools.Tests/Convert/TestStructure/Registration/LeafMasterDataTargetLeafConvertRegistrations.cs
similarity index 82%
rename from src/BBT.StructureTools.Tests/Convert/TestStructure/Registration/LeafMasterDattargetLeafConvertRegistrations.cs
rename to src/BBT.StructureTools.Tests/Convert/TestStructure/Registration/LeafMasterDataTargetLeafConvertRegistrations.cs
index 10ebcd6..1bcbcda 100644
--- a/src/BBT.StructureTools.Tests/Convert/TestStructure/Registration/LeafMasterDattargetLeafConvertRegistrations.cs
+++ b/src/BBT.StructureTools.Tests/Convert/TestStructure/Registration/LeafMasterDataTargetLeafConvertRegistrations.cs
@@ -6,7 +6,7 @@
     using BBT.StructureTools.Tests.Convert.TestStructure.Target;
     using FluentAssertions;
 
-    public class LeafMasterDattargetLeafConvertRegistrations : IConvertRegistrations<LeafMasterData, TargetLeaf, ITestConvertIntention>
+    public class LeafMasterDataTargetLeafConvertRegistrations : IConvertRegistrations<LeafMasterData, TargetLeaf, ITestConvertIntention>
     {
         public void DoRegistrations(IConvertRegistration<LeafMasterData, TargetLeaf> registrations)
         {
diff --git a/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToManyFromGenericStrategyIntTests.cs b/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToManyFromGenericStrategyIntTests.cs
index 4bacedf..41e5c79 100644
--- a/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToManyFromGenericStrategyIntTests.cs
+++ b/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToManyFromGenericStrategyIntTests.cs
@@ -125,7 +125,6 @@ public void Copy_MustCopyEmptyCollection()
         /// <summary>
         /// An interface, defining a test class to be used as child in the tests above.
         /// </summary>
-        [SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1201:ElementsMustAppearInTheCorrectOrder", Justification = "Suppression is OK here.")]
         private interface IChildTestClass
         {
             /// <summary>
diff --git a/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToOneWithReverseRelationIntTests.cs b/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToOneWithReverseRelationIntTests.cs
index 6e39372..371eb0b 100644
--- a/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToOneWithReverseRelationIntTests.cs
+++ b/src/BBT.StructureTools.Tests/Copy/CopyOperationCreateToOneWithReverseRelationIntTests.cs
@@ -137,7 +137,6 @@ public void DoRegistrations(ICopyHelperRegistration<IChildTestClass> registratio
             }
         }
 
-        [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Class instantiated through IOC when IComparer<> is instantiated")]
         private class TestClassCopyRegistrations : ICopyRegistrations<IParentTestClass>
         {
             public void DoRegistrations(ICopyHelperRegistration<IParentTestClass> registrations)
diff --git a/src/BBT.StructureTools.Tests/Copy/CopyOperationCrossReferenceProcessingIntTests.cs b/src/BBT.StructureTools.Tests/Copy/CopyOperationCrossReferenceProcessingIntTests.cs
index 66bd68f..bfefd20 100644
--- a/src/BBT.StructureTools.Tests/Copy/CopyOperationCrossReferenceProcessingIntTests.cs
+++ b/src/BBT.StructureTools.Tests/Copy/CopyOperationCrossReferenceProcessingIntTests.cs
@@ -69,7 +69,6 @@ private class TestClassCrossReferencedChild
             public TestClass Parent { get; set; }
         }
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Class instantiated through IOC when IComparer<> is instantiated")]
         private class TestClassCopyRegistrations : ICopyRegistrations<TestClass>
         {
             public void DoRegistrations(ICopyHelperRegistration<TestClass> registrations)
@@ -88,7 +87,6 @@ public void DoRegistrations(ICopyHelperRegistration<TestClass> registrations)
             }
         }
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Class instantiated through IOC when IComparer<> is instantiated")]
         private class TestClassCrossReferencedChildCopyRegistrations : ICopyRegistrations<TestClassCrossReferencedChild>
         {
             public void DoRegistrations(ICopyHelperRegistration<TestClassCrossReferencedChild> registrations)
@@ -97,7 +95,6 @@ public void DoRegistrations(ICopyHelperRegistration<TestClassCrossReferencedChil
             }
         }
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Class instantiated through IOC when IComparer<> is instantiated")]
         private class TestClassChildCopyRegistrations : ICopyRegistrations<TestClassChild>
         {
             public void DoRegistrations(ICopyHelperRegistration<TestClassChild> registrations)
diff --git a/src/BBT.StructureTools.Tests/TestTools/IoC/NinjectResolver.cs b/src/BBT.StructureTools.Tests/TestTools/IoC/NinjectResolver.cs
index 7517e67..3ac06c8 100644
--- a/src/BBT.StructureTools.Tests/TestTools/IoC/NinjectResolver.cs
+++ b/src/BBT.StructureTools.Tests/TestTools/IoC/NinjectResolver.cs
@@ -23,20 +23,17 @@ public NinjectResolver(IKernel kernel)
 
         public IEnumerable<TService> GetAllInstances<TService>()
         {
-            var resolved = this.kernel.GetAll<TService>();
-            return resolved;
+            return this.kernel.GetAll<TService>();
         }
 
         public TService GetInstance<TService>()
         {
-            var resolved = this.kernel.Get<TService>();
-            return resolved;
+            return this.kernel.Get<TService>();
         }
 
         public object GetInstance(Type serviceType)
         {
-            var resolved = this.kernel.Get(serviceType);
-            return resolved;
+            return this.kernel.Get(serviceType);
         }
     }
 }
diff --git a/src/BBT.StructureTools.Tests/TestTools/PopPropValueExtensions.cs b/src/BBT.StructureTools.Tests/TestTools/PopPropValueExtensions.cs
index f601371..89f7cd6 100644
--- a/src/BBT.StructureTools.Tests/TestTools/PopPropValueExtensions.cs
+++ b/src/BBT.StructureTools.Tests/TestTools/PopPropValueExtensions.cs
@@ -11,7 +11,7 @@
     /// </summary>
     public static class PopPropValueExtensions
     {
-        public static void CreateValueForProperty<T>(this T target, Expression<Func<T, string>> propex)
+        public static void CreateStringForProperty<T>(this T target, Expression<Func<T, string>> propex)
             where T : class
         {
             var propname = ReflectionUtils.GetPropertyName(propex);
diff --git a/src/BBT.StructureTools.Tests/TestTools/TestIoContainer.cs b/src/BBT.StructureTools.Tests/TestTools/TestIoContainer.cs
index 32fe273..e016237 100644
--- a/src/BBT.StructureTools.Tests/TestTools/TestIoContainer.cs
+++ b/src/BBT.StructureTools.Tests/TestTools/TestIoContainer.cs
@@ -39,18 +39,17 @@ public static IKernel Initialize()
 
             var kernel = new StandardKernel(settings);
 
+            var resolver = new NinjectResolver(kernel);
+            IocHandler.Instance.IocResolver = resolver;
+
             // Dependencies from BBT.StrategyPattern
             kernel.Bind(typeof(IStrategyLocator<>)).To(typeof(NinjectStrategyLocator<>));
             kernel.Bind(typeof(IInstanceCreator<,>)).To(typeof(GenericInstanceCreator<,>));
 
-            var resolver = new NinjectResolver(kernel);
-
             IocHandler.Instance.DoIocRegistrations(
                 (Type abstraction, Type implementation) =>
                     kernel.Bind(abstraction).To(implementation));
 
-            IocHandler.Instance.IocResolver = resolver;
-
             return kernel;
         }
     }
diff --git a/src/BBT.StructureTools/AssemblyInfo.cs b/src/BBT.StructureTools/AssemblyInfo.cs
index dd35b51..c390df9 100644
--- a/src/BBT.StructureTools/AssemblyInfo.cs
+++ b/src/BBT.StructureTools/AssemblyInfo.cs
@@ -1,5 +1 @@
-using System.Runtime.CompilerServices;
-
-[assembly: System.CLSCompliant(true)]
-
-[assembly: InternalsVisibleTo("BBT.StructureTools.Tests")]
\ No newline at end of file
+[assembly: System.CLSCompliant(true)]
\ No newline at end of file
diff --git a/src/BBT.StructureTools/BBT.StructureTools.csproj b/src/BBT.StructureTools/BBT.StructureTools.csproj
index 380c061..9ea119d 100644
--- a/src/BBT.StructureTools/BBT.StructureTools.csproj
+++ b/src/BBT.StructureTools/BBT.StructureTools.csproj
@@ -21,10 +21,6 @@
     <DebugType>pdbonly</DebugType>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Remove="Convert\Strategy\ve-CB2B.tmp" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="BBT.Maybe" Version="2.0.0" />
     <PackageReference Include="BBT.StrategyPattern" Version="1.0.0" />