diff --git a/Solutions/Ais.Net.Specs/Ais/Net/Specs/NmeaStreamParserSpecsSteps.cs b/Solutions/Ais.Net.Specs/Ais/Net/Specs/NmeaStreamParserSpecsSteps.cs
index f4f829a..b13c5a3 100644
--- a/Solutions/Ais.Net.Specs/Ais/Net/Specs/NmeaStreamParserSpecsSteps.cs
+++ b/Solutions/Ais.Net.Specs/Ais/Net/Specs/NmeaStreamParserSpecsSteps.cs
@@ -124,7 +124,7 @@ public void ThenTheLineErrorReportShouldIncludeAnExceptionReportingThatTheExpect
             Assert.IsInstanceOf<ArgumentException>(call.Error);
 
             var e = (ArgumentException)call.Error;
-            Assert.AreEqual("Invalid data. Expected '!' at sentence start", e.Message);
+            Assert.AreEqual("Invalid data. Expected '!' at sentence start (Parameter 'line')", e.Message);
         }
 
         [Then("the message error report (.*) should include an exception reporting that the message appears to be incomplete")]
@@ -134,7 +134,7 @@ public void ThenTheMessageErrorReportShouldIncludeAnExceptionReportingThatTheMes
             Assert.IsInstanceOf<ArgumentException>(call.Error);
 
             var e = (ArgumentException)call.Error;
-            Assert.AreEqual("Invalid data. The message appears to be missing some characters - it may have been corrupted or truncated.", e.Message);
+            Assert.AreEqual("Invalid data. The message appears to be missing some characters - it may have been corrupted or truncated. (Parameter 'line')", e.Message);
         }
 
         [Then("the message error report (.*) should include an exception reporting that the padding is missing")]
@@ -144,7 +144,7 @@ public void ThenTheMessageErrorReportShouldIncludeAnExceptionReportingThatThePad
             Assert.IsInstanceOf<ArgumentException>(call.Error);
 
             var e = (ArgumentException)call.Error;
-            Assert.AreEqual("Invalid data. Payload padding field not present - the message may have been corrupted or truncated", e.Message);
+            Assert.AreEqual("Invalid data. Payload padding field not present - the message may have been corrupted or truncated (Parameter 'line')", e.Message);
         }
 
         [Then("the message error report (.*) should include an exception reporting that the checksum is missing")]
@@ -154,7 +154,7 @@ public void ThenTheMessageErrorReportShouldIncludeAnExceptionReportingThatTheChe
             Assert.IsInstanceOf<ArgumentException>(call.Error);
 
             var e = (ArgumentException)call.Error;
-            Assert.AreEqual("Invalid data. Payload checksum not present - the message may have been corrupted or truncated", e.Message);
+            Assert.AreEqual("Invalid data. Payload checksum not present - the message may have been corrupted or truncated (Parameter 'line')", e.Message);
         }
 
         [Then("the message error report (.*) should include an exception reporting that the expected exclamation mark is missing")]
@@ -164,7 +164,7 @@ public void ThenTheMessageErrorReportShouldIncludeAnExceptionReportingThatTheExp
             Assert.IsInstanceOf<ArgumentException>(call.Error);
 
             var e = (ArgumentException)call.Error;
-            Assert.AreEqual("Invalid data. Expected '!' at sentence start", e.Message);
+            Assert.AreEqual("Invalid data. Expected '!' at sentence start (Parameter 'line')", e.Message);
         }
 
         [Then("the message error report (.*) should include an exception reporting that an unrecognized field is present")]
diff --git a/Solutions/Ais.Net.Specs/Ais/Net/Specs/ParsePayloadSpecs.feature.cs b/Solutions/Ais.Net.Specs/Ais/Net/Specs/ParsePayloadSpecs.feature.cs
index 5364de0..2116566 100644
--- a/Solutions/Ais.Net.Specs/Ais/Net/Specs/ParsePayloadSpecs.feature.cs
+++ b/Solutions/Ais.Net.Specs/Ais/Net/Specs/ParsePayloadSpecs.feature.cs
@@ -26,7 +26,7 @@ public partial class ParsePayloadSpecsFeature
         
         private TechTalk.SpecFlow.ITestRunner testRunner;
         
-        private string[] _featureTags = ((string[])(null));
+        private static string[] featureTags = ((string[])(null));
         
 #line 1 "ParsePayloadSpecs.feature"
 #line hidden
@@ -36,7 +36,7 @@ public virtual void FeatureSetup()
         {
             testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner();
             TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Ais/Net/Specs", "ParsePayloadSpecs", "    In order process AIS messages from an nm4 file\r\n    As a developer\r\n    I wan" +
-                    "t the NmeaPayloadParser to be able report the message type", ProgrammingLanguage.CSharp, ((string[])(null)));
+                    "t the NmeaPayloadParser to be able report the message type", ProgrammingLanguage.CSharp, featureTags);
             testRunner.OnFeatureStart(featureInfo);
         }
         
@@ -48,28 +48,28 @@ public virtual void FeatureTearDown()
         }
         
         [NUnit.Framework.SetUpAttribute()]
-        public virtual void TestInitialize()
+        public void TestInitialize()
         {
         }
         
         [NUnit.Framework.TearDownAttribute()]
-        public virtual void TestTearDown()
+        public void TestTearDown()
         {
             testRunner.OnScenarioEnd();
         }
         
-        public virtual void ScenarioInitialize(TechTalk.SpecFlow.ScenarioInfo scenarioInfo)
+        public void ScenarioInitialize(TechTalk.SpecFlow.ScenarioInfo scenarioInfo)
         {
             testRunner.OnScenarioInitialize(scenarioInfo);
             testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs<NUnit.Framework.TestContext>(NUnit.Framework.TestContext.CurrentContext);
         }
         
-        public virtual void ScenarioStart()
+        public void ScenarioStart()
         {
             testRunner.OnScenarioStart();
         }
         
-        public virtual void ScenarioCleanup()
+        public void ScenarioCleanup()
         {
             testRunner.CollectScenarioErrors();
         }
@@ -88,28 +88,18 @@ public virtual void ScenarioCleanup()
         [NUnit.Framework.TestCaseAttribute("B3o8B<00F8:0h694gOtbgwqUoP06", "0", "18", null)]
         [NUnit.Framework.TestCaseAttribute("H000000000000000000000000000", "0", "24", null)]
         [NUnit.Framework.TestCaseAttribute("H3m9b308tL5<d`4E80000000000", "2", "24", null)]
-        public virtual void PeekMessageTypeWithoutDecodingInFull(string payload, string padding, string type, string[] exampleTags)
+        public void PeekMessageTypeWithoutDecodingInFull(string payload, string padding, string type, string[] exampleTags)
         {
             string[] tagsOfScenario = exampleTags;
             System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
             argumentsOfScenario.Add("payload", payload);
             argumentsOfScenario.Add("padding", padding);
             argumentsOfScenario.Add("type", type);
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Peek message type without decoding in full", null, tagsOfScenario, argumentsOfScenario, this._featureTags);
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Peek message type without decoding in full", null, tagsOfScenario, argumentsOfScenario, featureTags);
 #line 15
 this.ScenarioInitialize(scenarioInfo);
 #line hidden
-            bool isScenarioIgnored = default(bool);
-            bool isFeatureIgnored = default(bool);
-            if ((tagsOfScenario != null))
-            {
-                isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((this._featureTags != null))
-            {
-                isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((isScenarioIgnored || isFeatureIgnored))
+            if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags)))
             {
                 testRunner.SkipScenario();
             }
diff --git a/Solutions/Ais.Net.Specs/Ais/Net/Specs/SentenceLayerSpecs.feature.cs b/Solutions/Ais.Net.Specs/Ais/Net/Specs/SentenceLayerSpecs.feature.cs
index f6fe0b5..d48bfcf 100644
--- a/Solutions/Ais.Net.Specs/Ais/Net/Specs/SentenceLayerSpecs.feature.cs
+++ b/Solutions/Ais.Net.Specs/Ais/Net/Specs/SentenceLayerSpecs.feature.cs
@@ -26,7 +26,7 @@ public partial class SentenceLayerSpecsFeature
         
         private TechTalk.SpecFlow.ITestRunner testRunner;
         
-        private string[] _featureTags = ((string[])(null));
+        private static string[] featureTags = ((string[])(null));
         
 #line 1 "SentenceLayerSpecs.feature"
 #line hidden
@@ -37,7 +37,7 @@ public virtual void FeatureSetup()
             testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner();
             TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Ais/Net/Specs", "SentenceLayerSpecs", "    In order process AIS messages from an nm4 file\r\n    As a developer\r\n    I wan" +
                     "t to the NmeaLineParser to be able to identify the main parts of a line from an " +
-                    "NMEA file", ProgrammingLanguage.CSharp, ((string[])(null)));
+                    "NMEA file", ProgrammingLanguage.CSharp, featureTags);
             testRunner.OnFeatureStart(featureInfo);
         }
         
@@ -49,53 +49,43 @@ public virtual void FeatureTearDown()
         }
         
         [NUnit.Framework.SetUpAttribute()]
-        public virtual void TestInitialize()
+        public void TestInitialize()
         {
         }
         
         [NUnit.Framework.TearDownAttribute()]
-        public virtual void TestTearDown()
+        public void TestTearDown()
         {
             testRunner.OnScenarioEnd();
         }
         
-        public virtual void ScenarioInitialize(TechTalk.SpecFlow.ScenarioInfo scenarioInfo)
+        public void ScenarioInitialize(TechTalk.SpecFlow.ScenarioInfo scenarioInfo)
         {
             testRunner.OnScenarioInitialize(scenarioInfo);
             testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs<NUnit.Framework.TestContext>(NUnit.Framework.TestContext.CurrentContext);
         }
         
-        public virtual void ScenarioStart()
+        public void ScenarioStart()
         {
             testRunner.OnScenarioStart();
         }
         
-        public virtual void ScenarioCleanup()
+        public void ScenarioCleanup()
         {
             testRunner.CollectScenarioErrors();
         }
         
         [NUnit.Framework.TestAttribute()]
         [NUnit.Framework.DescriptionAttribute("Tag block not present")]
-        public virtual void TagBlockNotPresent()
+        public void TagBlockNotPresent()
         {
             string[] tagsOfScenario = ((string[])(null));
             System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Tag block not present", null, tagsOfScenario, argumentsOfScenario, this._featureTags);
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Tag block not present", null, tagsOfScenario, argumentsOfScenario, featureTags);
 #line 15
 this.ScenarioInitialize(scenarioInfo);
 #line hidden
-            bool isScenarioIgnored = default(bool);
-            bool isFeatureIgnored = default(bool);
-            if ((tagsOfScenario != null))
-            {
-                isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((this._featureTags != null))
-            {
-                isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((isScenarioIgnored || isFeatureIgnored))
+            if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags)))
             {
                 testRunner.SkipScenario();
             }
@@ -114,25 +104,15 @@ public virtual void TagBlockNotPresent()
         
         [NUnit.Framework.TestAttribute()]
         [NUnit.Framework.DescriptionAttribute("Tag block present")]
-        public virtual void TagBlockPresent()
+        public void TagBlockPresent()
         {
             string[] tagsOfScenario = ((string[])(null));
             System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Tag block present", null, tagsOfScenario, argumentsOfScenario, this._featureTags);
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Tag block present", null, tagsOfScenario, argumentsOfScenario, featureTags);
 #line 19
 this.ScenarioInitialize(scenarioInfo);
 #line hidden
-            bool isScenarioIgnored = default(bool);
-            bool isFeatureIgnored = default(bool);
-            if ((tagsOfScenario != null))
-            {
-                isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((this._featureTags != null))
-            {
-                isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((isScenarioIgnored || isFeatureIgnored))
+            if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags)))
             {
                 testRunner.SkipScenario();
             }
@@ -162,27 +142,17 @@ public virtual void TagBlockPresent()
         [NUnit.Framework.TestCaseAttribute("AXVDM", "RepeaterStation", null)]
         [NUnit.Framework.TestCaseAttribute("BSVDM", "DeprecatedBaseStation", null)]
         [NUnit.Framework.TestCaseAttribute("SAVDM", "PhysicalShoreStation", null)]
-        public virtual void AISTalkerId(string tag, string talkerId, string[] exampleTags)
+        public void AISTalkerId(string tag, string talkerId, string[] exampleTags)
         {
             string[] tagsOfScenario = exampleTags;
             System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
             argumentsOfScenario.Add("tag", tag);
             argumentsOfScenario.Add("talkerId", talkerId);
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("AIS talker id", null, tagsOfScenario, argumentsOfScenario, this._featureTags);
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("AIS talker id", null, tagsOfScenario, argumentsOfScenario, featureTags);
 #line 23
 this.ScenarioInitialize(scenarioInfo);
 #line hidden
-            bool isScenarioIgnored = default(bool);
-            bool isFeatureIgnored = default(bool);
-            if ((tagsOfScenario != null))
-            {
-                isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((this._featureTags != null))
-            {
-                isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((isScenarioIgnored || isFeatureIgnored))
+            if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags)))
             {
                 testRunner.SkipScenario();
             }
@@ -203,27 +173,17 @@ public virtual void AISTalkerId(string tag, string talkerId, string[] exampleTag
         [NUnit.Framework.DescriptionAttribute("AIS Origin")]
         [NUnit.Framework.TestCaseAttribute("AIVDM", "Vdm", null)]
         [NUnit.Framework.TestCaseAttribute("AIVDO", "Vdo", null)]
-        public virtual void AISOrigin(string tag, string dataOrigin, string[] exampleTags)
+        public void AISOrigin(string tag, string dataOrigin, string[] exampleTags)
         {
             string[] tagsOfScenario = exampleTags;
             System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
             argumentsOfScenario.Add("tag", tag);
             argumentsOfScenario.Add("dataOrigin", dataOrigin);
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("AIS Origin", null, tagsOfScenario, argumentsOfScenario, this._featureTags);
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("AIS Origin", null, tagsOfScenario, argumentsOfScenario, featureTags);
 #line 40
 this.ScenarioInitialize(scenarioInfo);
 #line hidden
-            bool isScenarioIgnored = default(bool);
-            bool isFeatureIgnored = default(bool);
-            if ((tagsOfScenario != null))
-            {
-                isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((this._featureTags != null))
-            {
-                isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((isScenarioIgnored || isFeatureIgnored))
+            if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags)))
             {
                 testRunner.SkipScenario();
             }
@@ -242,25 +202,15 @@ public virtual void AISOrigin(string tag, string dataOrigin, string[] exampleTag
         
         [NUnit.Framework.TestAttribute()]
         [NUnit.Framework.DescriptionAttribute("Non-fragmented messages")]
-        public virtual void Non_FragmentedMessages()
+        public void Non_FragmentedMessages()
         {
             string[] tagsOfScenario = ((string[])(null));
             System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Non-fragmented messages", null, tagsOfScenario, argumentsOfScenario, this._featureTags);
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Non-fragmented messages", null, tagsOfScenario, argumentsOfScenario, featureTags);
 #line 51
 this.ScenarioInitialize(scenarioInfo);
 #line hidden
-            bool isScenarioIgnored = default(bool);
-            bool isFeatureIgnored = default(bool);
-            if ((tagsOfScenario != null))
-            {
-                isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((this._featureTags != null))
-            {
-                isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((isScenarioIgnored || isFeatureIgnored))
+            if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags)))
             {
                 testRunner.SkipScenario();
             }
@@ -293,7 +243,7 @@ public virtual void Non_FragmentedMessages()
         [NUnit.Framework.TestCaseAttribute("3", "1", "0", "3451", null)]
         [NUnit.Framework.TestCaseAttribute("3", "2", "0", "3451", null)]
         [NUnit.Framework.TestCaseAttribute("3", "3", "0", "3451", null)]
-        public virtual void FragmentedMessages(string totalFragments, string currentFragment, string sequentialMessageId, string sentenceGroupId, string[] exampleTags)
+        public void FragmentedMessages(string totalFragments, string currentFragment, string sequentialMessageId, string sentenceGroupId, string[] exampleTags)
         {
             string[] tagsOfScenario = exampleTags;
             System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
@@ -301,21 +251,11 @@ public virtual void FragmentedMessages(string totalFragments, string currentFrag
             argumentsOfScenario.Add("currentFragment", currentFragment);
             argumentsOfScenario.Add("sequentialMessageId", sequentialMessageId);
             argumentsOfScenario.Add("sentenceGroupId", sentenceGroupId);
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Fragmented messages", null, tagsOfScenario, argumentsOfScenario, this._featureTags);
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Fragmented messages", null, tagsOfScenario, argumentsOfScenario, featureTags);
 #line 74
 this.ScenarioInitialize(scenarioInfo);
 #line hidden
-            bool isScenarioIgnored = default(bool);
-            bool isFeatureIgnored = default(bool);
-            if ((tagsOfScenario != null))
-            {
-                isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((this._featureTags != null))
-            {
-                isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((isScenarioIgnored || isFeatureIgnored))
+            if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags)))
             {
                 testRunner.SkipScenario();
             }
@@ -349,28 +289,18 @@ public virtual void FragmentedMessages(string totalFragments, string currentFrag
         [NUnit.Framework.TestCaseAttribute("3", "1", "0", null)]
         [NUnit.Framework.TestCaseAttribute("3", "2", "0", null)]
         [NUnit.Framework.TestCaseAttribute("3", "3", "0", null)]
-        public virtual void FragmentedMessagesWithoutGroupIdsInHeader(string totalFragments, string currentFragment, string sequentialMessageId, string[] exampleTags)
+        public void FragmentedMessagesWithoutGroupIdsInHeader(string totalFragments, string currentFragment, string sequentialMessageId, string[] exampleTags)
         {
             string[] tagsOfScenario = exampleTags;
             System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
             argumentsOfScenario.Add("totalFragments", totalFragments);
             argumentsOfScenario.Add("currentFragment", currentFragment);
             argumentsOfScenario.Add("sequentialMessageId", sequentialMessageId);
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Fragmented messages without group ids in header", null, tagsOfScenario, argumentsOfScenario, this._featureTags);
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Fragmented messages without group ids in header", null, tagsOfScenario, argumentsOfScenario, featureTags);
 #line 92
 this.ScenarioInitialize(scenarioInfo);
 #line hidden
-            bool isScenarioIgnored = default(bool);
-            bool isFeatureIgnored = default(bool);
-            if ((tagsOfScenario != null))
-            {
-                isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((this._featureTags != null))
-            {
-                isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((isScenarioIgnored || isFeatureIgnored))
+            if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags)))
             {
                 testRunner.SkipScenario();
             }
@@ -400,26 +330,16 @@ public virtual void FragmentedMessagesWithoutGroupIdsInHeader(string totalFragme
         [NUnit.Framework.TestCaseAttribute("B", null)]
         [NUnit.Framework.TestCaseAttribute("1", null)]
         [NUnit.Framework.TestCaseAttribute("2", null)]
-        public virtual void RadioChannelCode(string channelCode, string[] exampleTags)
+        public void RadioChannelCode(string channelCode, string[] exampleTags)
         {
             string[] tagsOfScenario = exampleTags;
             System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
             argumentsOfScenario.Add("channelCode", channelCode);
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Radio channel code", null, tagsOfScenario, argumentsOfScenario, this._featureTags);
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Radio channel code", null, tagsOfScenario, argumentsOfScenario, featureTags);
 #line 107
 this.ScenarioInitialize(scenarioInfo);
 #line hidden
-            bool isScenarioIgnored = default(bool);
-            bool isFeatureIgnored = default(bool);
-            if ((tagsOfScenario != null))
-            {
-                isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((this._featureTags != null))
-            {
-                isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((isScenarioIgnored || isFeatureIgnored))
+            if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags)))
             {
                 testRunner.SkipScenario();
             }
@@ -438,25 +358,15 @@ public virtual void RadioChannelCode(string channelCode, string[] exampleTags)
         
         [NUnit.Framework.TestAttribute()]
         [NUnit.Framework.DescriptionAttribute("Payload")]
-        public virtual void Payload()
+        public void Payload()
         {
             string[] tagsOfScenario = ((string[])(null));
             System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Payload", null, tagsOfScenario, argumentsOfScenario, this._featureTags);
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Payload", null, tagsOfScenario, argumentsOfScenario, featureTags);
 #line 118
 this.ScenarioInitialize(scenarioInfo);
 #line hidden
-            bool isScenarioIgnored = default(bool);
-            bool isFeatureIgnored = default(bool);
-            if ((tagsOfScenario != null))
-            {
-                isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((this._featureTags != null))
-            {
-                isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((isScenarioIgnored || isFeatureIgnored))
+            if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags)))
             {
                 testRunner.SkipScenario();
             }
@@ -475,25 +385,15 @@ public virtual void Payload()
         
         [NUnit.Framework.TestAttribute()]
         [NUnit.Framework.DescriptionAttribute("Padding")]
-        public virtual void Padding()
+        public void Padding()
         {
             string[] tagsOfScenario = ((string[])(null));
             System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Padding", null, tagsOfScenario, argumentsOfScenario, this._featureTags);
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Padding", null, tagsOfScenario, argumentsOfScenario, featureTags);
 #line 124
 this.ScenarioInitialize(scenarioInfo);
 #line hidden
-            bool isScenarioIgnored = default(bool);
-            bool isFeatureIgnored = default(bool);
-            if ((tagsOfScenario != null))
-            {
-                isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((this._featureTags != null))
-            {
-                isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((isScenarioIgnored || isFeatureIgnored))
+            if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags)))
             {
                 testRunner.SkipScenario();
             }
diff --git a/Solutions/Ais.Net/Ais/Net/NmeaLineParser.cs b/Solutions/Ais.Net/Ais/Net/NmeaLineParser.cs
index 043375d..c0e0047 100644
--- a/Solutions/Ais.Net/Ais/Net/NmeaLineParser.cs
+++ b/Solutions/Ais.Net/Ais/Net/NmeaLineParser.cs
@@ -35,6 +35,7 @@ public NmeaLineParser(ReadOnlySpan<byte> line)
         /// Ignore non-standard and unsupported tag block field types. Useful when working with
         /// data sources that add non-standard fields.
         /// </param>
+        /// <exception cref="System.ArgumentException"><paramref name="line"/> contains unparsable data.</exception>
         public NmeaLineParser(ReadOnlySpan<byte> line, bool throwWhenTagBlockContainsUnknownFields)
         {
             this.Line = line;
@@ -47,7 +48,7 @@ public NmeaLineParser(ReadOnlySpan<byte> line, bool throwWhenTagBlockContainsUnk
 
                 if (tagBlockEndIndex < 0)
                 {
-                    throw new ArgumentException("Invalid data. Unclosed tag block");
+                    throw new ArgumentException("Invalid data. Unclosed tag block", nameof(line));
                 }
 
                 this.TagBlockAsciiWithoutDelimiters = line.Slice(1, tagBlockEndIndex);
@@ -76,12 +77,12 @@ public NmeaLineParser(ReadOnlySpan<byte> line, bool throwWhenTagBlockContainsUnk
             // So that's 18 characters before we get to any payload.
             if (this.Sentence.Length < 18)
             {
-                throw new ArgumentException("Invalid data. The message appears to be missing some characters - it may have been corrupted or truncated.");
+                throw new ArgumentException("Invalid data. The message appears to be missing some characters - it may have been corrupted or truncated.", nameof(line));
             }
 
             if (this.Sentence[0] != ExclamationMark)
             {
-                throw new ArgumentException("Invalid data. Expected '!' at sentence start");
+                throw new ArgumentException("Invalid data. Expected '!' at sentence start", nameof(line));
             }
 
             byte talkerFirstChar = this.Sentence[1];
@@ -99,19 +100,19 @@ public NmeaLineParser(ReadOnlySpan<byte> line, bool throwWhenTagBlockContainsUnk
                     (byte)'S' => TalkerId.LimitedBaseStation,
                     (byte)'T' => TalkerId.TransmittingStation,
                     (byte)'X' => TalkerId.RepeaterStation,
-                    _ => throw new ArgumentException("Invalid data. Unrecognized talker id - cannot start with " + talkerFirstChar),
+                    _ => throw new ArgumentException("Invalid data. Unrecognized talker id - cannot start with " + talkerFirstChar, nameof(line)),
                 },
 
                 (byte)'B' => talkerSecondChar switch
                 {
                     (byte)'S' => TalkerId.DeprecatedBaseStation,
-                    _ => throw new ArgumentException("Invalid data. Unrecognized talker id - cannot end with " + talkerSecondChar),
+                    _ => throw new ArgumentException("Invalid data. Unrecognized talker id - cannot end with " + talkerSecondChar, nameof(line)),
                 },
 
                 (byte)'S' => talkerSecondChar switch
                 {
                     (byte)'A' => TalkerId.PhysicalShoreStation,
-                    _ => throw new ArgumentException("Invalid data. Unrecognized talker id - cannot end with " + talkerSecondChar),
+                    _ => throw new ArgumentException("Invalid data. Unrecognized talker id - cannot end with " + talkerSecondChar, nameof(line)),
                 },
 
                 _ => throw new ArgumentException("Invalid data. Unrecognized talker id"),
@@ -126,12 +127,12 @@ public NmeaLineParser(ReadOnlySpan<byte> line, bool throwWhenTagBlockContainsUnk
             }
             else
             {
-                throw new ArgumentException("Invalid data. Unrecognized origin in AIS talker ID - must be VDM or VDO");
+                throw new ArgumentException("Invalid data. Unrecognized origin in AIS talker ID - must be VDM or VDO", nameof(line));
             }
 
             if (this.Sentence[6] != (byte)',')
             {
-                throw new ArgumentException("Invalid data. Talker ID must be followed by ','");
+                throw new ArgumentException("Invalid data. Talker ID must be followed by ','", nameof(line));
             }
 
             ReadOnlySpan<byte> remainingFields = this.Sentence.Slice(7);
@@ -148,7 +149,7 @@ public NmeaLineParser(ReadOnlySpan<byte> line, bool throwWhenTagBlockContainsUnk
 
             if (nextComma > 1)
             {
-                throw new ArgumentException("Invalid data. Channel code must be only one character");
+                throw new ArgumentException("Invalid data. Channel code must be only one character", nameof(line));
             }
 
             this.ChannelCode = nextComma == 0 ? default : (char)remainingFields[0];
@@ -158,7 +159,7 @@ public NmeaLineParser(ReadOnlySpan<byte> line, bool throwWhenTagBlockContainsUnk
 
             if (nextComma < 0 || remainingFields.Length <= (nextComma + 1) || !char.IsDigit((char)remainingFields[nextComma + 1]))
             {
-                throw new ArgumentException("Invalid data. Payload padding field not present - the message may have been corrupted or truncated");
+                throw new ArgumentException("Invalid data. Payload padding field not present - the message may have been corrupted or truncated", nameof(line));
             }
 
             this.Payload = remainingFields.Slice(0, nextComma);
@@ -167,7 +168,7 @@ public NmeaLineParser(ReadOnlySpan<byte> line, bool throwWhenTagBlockContainsUnk
 
             if (remainingFields.Length < 4)
             {
-                throw new ArgumentException("Invalid data. Payload checksum not present - the message may have been corrupted or truncated");
+                throw new ArgumentException("Invalid data. Payload checksum not present - the message may have been corrupted or truncated", nameof(line));
             }
 
             this.Padding = (uint)GetSingleDigitField(ref remainingFields, true);