diff --git a/src/Messaging/Common/ArtifactTypes.cs b/src/Messaging/Common/ArtifactTypes.cs
index bd1771b..51bccf5 100755
--- a/src/Messaging/Common/ArtifactTypes.cs
+++ b/src/Messaging/Common/ArtifactTypes.cs
@@ -22,6 +22,7 @@ public static class ArtifactTypes
         {
             { ArtifactType.Unset, "Unset" },
             { ArtifactType.Folder, "Folders" },
+            { ArtifactType.HL7, "HL7 message" },
             { ArtifactType.AR, "Autorefract" },
             { ArtifactType.ASMT, "Content Assessment Results" },
             { ArtifactType.AU, "Audio" },
diff --git a/src/Messaging/Tests/Common/ArtifactTypesTests.cs b/src/Messaging/Tests/Common/ArtifactTypesTests.cs
index 9f31b72..d665447 100755
--- a/src/Messaging/Tests/Common/ArtifactTypesTests.cs
+++ b/src/Messaging/Tests/Common/ArtifactTypesTests.cs
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+using System;
 using Monai.Deploy.Messaging.Common;
 using Xunit;
 
@@ -32,5 +33,21 @@ public void ArtifactTypeInvalid_ShouldReturnFalse()
         {
             Assert.False(ArtifactTypes.Validate("false"));
         }
+
+        [Fact]
+        public void ArtifactTypeNull_ShouldReturnFalse()
+        {
+            Assert.False(ArtifactTypes.Validate(null));
+        }
+
+        [Fact]
+        public void ArtifactTypes_Should_Contain_All()
+        {
+            foreach (var artifactType in Enum.GetValues(typeof(ArtifactType)))
+            {
+                Assert.True(ArtifactTypes.ListOfModularity.ContainsKey((ArtifactType)artifactType));
+            }
+        }
+
     }
 }