diff --git a/test/Program.cs b/test/Program.cs
index 568af13..36956c2 100644
--- a/test/Program.cs
+++ b/test/Program.cs
@@ -580,7 +580,7 @@ public void RemoveTrailingComponentsTest_OnlyTrailingComponentsRemoved()
         {
             var message = new Message();
 
-            var orcSegment = new Segment("ORC", new HL7Encoding());
+            var orcSegment = new Segment("ORC", message.Encoding);
             for (int eachField = 1; eachField <= 12; eachField++)
             {
                 orcSegment.AddEmptyField();
@@ -588,7 +588,7 @@ public void RemoveTrailingComponentsTest_OnlyTrailingComponentsRemoved()
 
             for (int eachComponent = 1; eachComponent < 8; eachComponent++)
             {
-                orcSegment.Fields(12).AddNewComponent(new Component(new HL7Encoding()));
+                orcSegment.Fields(12).AddNewComponent(new Component(message.Encoding));
             }
 
             orcSegment.Fields(12).Components(1).Value = "should not be removed";
@@ -613,7 +613,7 @@ public void RemoveTrailingComponentsTest_RemoveAllFieldComponentsIfEmpty()
         {
             var message = new Message();
 
-            var orcSegment = new Segment("ORC", new HL7Encoding());
+            var orcSegment = new Segment("ORC", message.Encoding);
             for (int eachField = 1; eachField <= 12; eachField++)
             {
                 orcSegment.AddEmptyField();
@@ -621,7 +621,7 @@ public void RemoveTrailingComponentsTest_RemoveAllFieldComponentsIfEmpty()
 
             for (int eachComponent = 1; eachComponent < 8; eachComponent++)
             {
-                orcSegment.Fields(12).AddNewComponent(new Component(new HL7Encoding()));
+                orcSegment.Fields(12).AddNewComponent(new Component(message.Encoding));
                 orcSegment.Fields(12).Components(eachComponent).Value = string.Empty;
             }