diff --git a/src/Umbraco.ModelsBuilder/Building/Builder.cs b/src/Umbraco.ModelsBuilder/Building/Builder.cs
index 885e51133b..bba19c3b9f 100644
--- a/src/Umbraco.ModelsBuilder/Building/Builder.cs
+++ b/src/Umbraco.ModelsBuilder/Building/Builder.cs
@@ -213,9 +213,10 @@ namespace Umbraco.ModelsBuilder.Building
             if (!string.IsNullOrWhiteSpace(ModelsNamespace))
                 return ModelsNamespace;
 
-            // default
-            // fixme - should NOT reference config here, should make ModelsNamespace mandatory
-            return string.IsNullOrWhiteSpace(Config.ModelsNamespace) ? ModelsBuilderConfig.DefaultModelsNamespace : Config.ModelsNamespace;
+            // use configured else fallback to default
+            return string.IsNullOrWhiteSpace(Config.ModelsNamespace)
+                ? ModelsBuilderConfig.DefaultModelsNamespace
+                : Config.ModelsNamespace;
         }
 
         protected string GetModelsBaseClassName(TypeModel type)
diff --git a/src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs b/src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs
index e9824b9799..99012643aa 100644
--- a/src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs
+++ b/src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs
@@ -15,13 +15,6 @@ namespace Umbraco.ModelsBuilder.Tests
     [TestFixture]
     public class BuilderTests
     {
-    //    [SetUp]
-    //    public void Setup()
-    //    {
-    //        Current.Reset();
-    //        Current.UnlockConfigs();
-    //        Current.Configs.Add(() => new ModelsBuilderConfig());
-    //    }
 
         [Test]
         public void GenerateSimpleType()