diff --git a/GUIs.Test.ZUGFeRDTest/Form1.vb b/GUIs.Test.ZUGFeRDTest/Form1.vb
index 7643dbaf..d1df0fe0 100644
--- a/GUIs.Test.ZUGFeRDTest/Form1.vb
+++ b/GUIs.Test.ZUGFeRDTest/Form1.vb
@@ -1,13 +1,9 @@
 Imports System.IO
-Imports System.Reflection
 Imports System.Security.Cryptography
-Imports System.Text.RegularExpressions
-Imports System.Xml
 Imports DigitalData.Modules
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Interfaces
 Imports DigitalData.Modules.Jobs
-Imports DigitalData.Modules.Jobs.ImportZUGFeRDFiles
 Imports DigitalData.Modules.Logging
 
 Public Class Form1
@@ -36,7 +32,7 @@ Public Class Form1
             Dim oResult As DataTable = _mssql.GetDatatable(oSQL)
 
             For Each oRow As DataRow In oResult.Rows
-                Dim xmlPath = oRow.Item("XML_PATH")
+                Dim xmlPath As String = oRow.Item("XML_PATH")
                 Dim tableName = oRow.Item("TABLE_NAME")
                 Dim tableColumn = oRow.Item("TABLE_COLUMN")
                 Dim description = oRow.Item("DESCRIPTION")
@@ -52,7 +48,8 @@ Public Class Form1
                     .IsRequired = isRequired,
                     .IsGrouped = isGrouped,
                     .GroupScope = groupScope,
-                    .Specification = specification
+                    .Specification = specification,
+                    .XMLPath = xmlPath.Replace(".Value", "")
                 })
             Next
 
@@ -86,7 +83,8 @@ Public Class Form1
                .OriginalEmailDirectory = "E:\TestFiles\ZUGFERDService\Result\Original_eml",
                .RejectedEmailDirectory = "E:\TestFiles\ZUGFERDService\Result\Rejected_eml",
                .AttachmentsSubDirectory = "Attachments",
-               .RejectionTemplateId = 1
+               .RejectionTemplateId = 1,
+               .MinFileAgeInMinutes = 1
             }
             args = LoadPropertyMapFor(args)
 
@@ -154,7 +152,7 @@ Public Class Form1
 
                 WriteLog("Missing Properties: [{0}]", oResult2.MissingProperties.Count)
                 For Each Prop In oResult2.MissingProperties
-                    WriteLog("Missing Property: [{0}]", Prop)
+                    WriteLog("Missing Property: [{0}]", Prop.Description)
                 Next
 
                 WriteLog("--------------------------------")
diff --git a/Services.ZUGFeRDService/ThreadRunner.vb b/Services.ZUGFeRDService/ThreadRunner.vb
index 531a5448..721b1f7e 100644
--- a/Services.ZUGFeRDService/ThreadRunner.vb
+++ b/Services.ZUGFeRDService/ThreadRunner.vb
@@ -173,7 +173,7 @@ Public Class ThreadRunner
         Dim oResult As DataTable = _mssql.GetDatatable(oSQL)
 
         For Each oRow As DataRow In oResult.Rows
-            Dim oXmlPath = oRow.Item("XML_PATH")
+            Dim oXmlPath As String = oRow.Item("XML_PATH")
             Dim oTableName = oRow.Item("TABLE_NAME")
             Dim oTableColumn = oRow.Item("TABLE_COLUMN")
             Dim oDescription = oRow.Item("DESCRIPTION")
@@ -189,7 +189,8 @@ Public Class ThreadRunner
                 .IsRequired = oIsRequired,
                 .IsGrouped = oIsGrouped,
                 .GroupScope = oGroupScope,
-                .Specification = oSpecification
+                .Specification = oSpecification,
+                .XMLPath = oXmlPath.Replace(".Value", "")
             })
         Next