diff --git a/Filtration.Parser.Tests/Services/TestItemFilterBlockTranslator.cs b/Filtration.Parser.Tests/Services/TestItemFilterBlockTranslator.cs
index 3fcc7bc..70e5d06 100644
--- a/Filtration.Parser.Tests/Services/TestItemFilterBlockTranslator.cs
+++ b/Filtration.Parser.Tests/Services/TestItemFilterBlockTranslator.cs
@@ -541,8 +541,8 @@ namespace Filtration.Parser.Tests.Services
             var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
-            Assert.AreEqual(1, result.BlockItems.Count(b => b is BaseTypeBlockItem));
-            var blockItem = result.BlockItems.OfType<BaseTypeBlockItem>().First();
+            Assert.AreEqual(1, result.BlockItems.Count(b => b is HasExplicitModBlockItem));
+            var blockItem = result.BlockItems.OfType<HasExplicitModBlockItem>().First();
             Assert.Contains("Test Mod 1", blockItem.Items);
             Assert.Contains("TestOneWordModInQuotes", blockItem.Items);
             Assert.Contains("TestOneWordModNotInQuotes", blockItem.Items);
@@ -1848,6 +1848,8 @@ namespace Filtration.Parser.Tests.Services
             _testUtility.TestBlock.BlockItems.Add(new ItemLevelBlockItem(FilterPredicateOperator.GreaterThan, 70));
             _testUtility.TestBlock.BlockItems.Add(new ItemLevelBlockItem(FilterPredicateOperator.LessThanOrEqual, 85));
             _testUtility.TestBlock.BlockItems.Add(new DropLevelBlockItem(FilterPredicateOperator.GreaterThan, 56));
+            _testUtility.TestBlock.BlockItems.Add(new GemLevelBlockItem(FilterPredicateOperator.LessThan, 15));
+            _testUtility.TestBlock.BlockItems.Add(new StackSizeBlockItem(FilterPredicateOperator.GreaterThanOrEqual, 4));
             _testUtility.TestBlock.BlockItems.Add(new QualityBlockItem(FilterPredicateOperator.GreaterThan, 2));
             _testUtility.TestBlock.BlockItems.Add(new RarityBlockItem(FilterPredicateOperator.Equal, (int)ItemRarity.Unique));
             var classItemblockItem = new ClassBlockItem();
diff --git a/Filtration.Parser.Tests/Services/TestItemFilterScriptTranslator.cs b/Filtration.Parser.Tests/Services/TestItemFilterScriptTranslator.cs
index 2412bc0..8f197a2 100644
--- a/Filtration.Parser.Tests/Services/TestItemFilterScriptTranslator.cs
+++ b/Filtration.Parser.Tests/Services/TestItemFilterScriptTranslator.cs
@@ -156,7 +156,7 @@ namespace Filtration.Parser.Tests.Services
             script.ItemFilterBlocks.Add(block2);
 
             var expectedOutput = "# Script edited with Filtration - https://github.com/ben-wallis/Filtration" + Environment.NewLine +
-                                 "# Test Filter 1" + Environment.NewLine +
+                                 "# Test Filter 1" + Environment.NewLine + Environment.NewLine +
                                  "Show" + Environment.NewLine +
                                  "    ItemLevel > 5" + Environment.NewLine +
                                  "Show" + Environment.NewLine +
@@ -194,7 +194,7 @@ namespace Filtration.Parser.Tests.Services
             script.ItemFilterBlocks.Add(block1);
             script.ItemFilterBlocks.Add(block2);
 
-            var expectedOutput = "# Script edited with Filtration - https://github.com/ben-wallis/Filtration" + Environment.NewLine +
+            var expectedOutput = "# Script edited with Filtration - https://github.com/ben-wallis/Filtration" + Environment.NewLine + Environment.NewLine +
                                  "# Test script description" + Environment.NewLine +
                                  "# This is a really great script!" + Environment.NewLine + 
                                  "# Multiple line script descriptions are fun!" + Environment.NewLine +
@@ -228,7 +228,7 @@ namespace Filtration.Parser.Tests.Services
             };
 
             var expectedOutput = "# Script edited with Filtration - https://github.com/ben-wallis/Filtration" +
-                                 Environment.NewLine +
+                                 Environment.NewLine + Environment.NewLine +
                                  "# Test script description" + Environment.NewLine + Environment.NewLine;
 
             var translator = CreateItemFilterScriptTranslator();