diff --git a/FileProcessor.IntegrationTests/Features/FileProfile.feature b/FileProcessor.IntegrationTests/Features/FileProfile.feature
index c5beeaf..4d58508 100644
--- a/FileProcessor.IntegrationTests/Features/FileProfile.feature
+++ b/FileProcessor.IntegrationTests/Features/FileProfile.feature
@@ -41,4 +41,4 @@ Scenario: Reject duplicate file profile name and request type
 	| DuplicateType | BasedOn |
 	| Name | Profile A |
 	| RequestType | Profile B |
-	#And the file profiles list should contain 2 items
+	And the file profiles list should contain 2 items
diff --git a/FileProcessor.IntegrationTests/Features/FileProfile.feature.cs b/FileProcessor.IntegrationTests/Features/FileProfile.feature.cs
index 9011d05..7100bac 100644
--- a/FileProcessor.IntegrationTests/Features/FileProfile.feature.cs
+++ b/FileProcessor.IntegrationTests/Features/FileProfile.feature.cs
@@ -339,6 +339,9 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                             "Profile B"});
 #line 40
  await testRunner.AndAsync("I try to create the following duplicate file profiles", ((string)(null)), table9, "And ");
+#line hidden
+#line 44
+ await testRunner.AndAsync("the file profiles list should contain 2 items", ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
 #line hidden
             }
             await this.ScenarioCleanupAsync();
diff --git a/FileProcessor.IntegrationTests/Features/FileProfileSteps.cs b/FileProcessor.IntegrationTests/Features/FileProfileSteps.cs
index f1b9306..023014a 100644
--- a/FileProcessor.IntegrationTests/Features/FileProfileSteps.cs
+++ b/FileProcessor.IntegrationTests/Features/FileProfileSteps.cs
@@ -85,6 +85,7 @@ public async Task WhenITryToCreateTheFollowingDuplicateFileProfiles(DataTable ta
     }
 
     [Then(@"the file profiles list should contain (.*) items")]
+    [When(@"the file profiles list should contain (.*) items")]
     public async Task ThenTheFileProfilesListShouldContainItems(int expectedCount)
     {
         Result<List<FileProfile>> fileProfilesResult = await this.FileProcessorSteps.GetFileProfiles(this.TestingContext.AccessToken, CancellationToken.None);
diff --git a/FileProcessor.IntegrationTests/Features/GetFileImportDetails.feature b/FileProcessor.IntegrationTests/Features/GetFileImportDetails.feature
index eb9b3dd..3c36283 100644
--- a/FileProcessor.IntegrationTests/Features/GetFileImportDetails.feature
+++ b/FileProcessor.IntegrationTests/Features/GetFileImportDetails.feature
@@ -83,7 +83,6 @@ Background:
 	| Deposit1  | 300.00 | Today    | Test Merchant 2 | Test Estate 1 |
 
 @PRTest
-@Nightly1
 Scenario: Get File Import Log Details
 	Given I have a file named 'SafarcomTopup1.txt' with the following contents
 	| Column1 | Column2     | Column3 |
diff --git a/FileProcessor.IntegrationTests/Features/GetFileImportDetails.feature.cs b/FileProcessor.IntegrationTests/Features/GetFileImportDetails.feature.cs
index 7f34e7b..72dde1d 100644
--- a/FileProcessor.IntegrationTests/Features/GetFileImportDetails.feature.cs
+++ b/FileProcessor.IntegrationTests/Features/GetFileImportDetails.feature.cs
@@ -113,66 +113,66 @@ public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo, globa
         {
 #line 4
 #line hidden
-            global::Reqnroll.Table table10 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table1 = new global::Reqnroll.Table(new string[] {
                         "Name",
                         "DisplayName",
                         "Description"});
-            table10.AddRow(new string[] {
+            table1.AddRow(new string[] {
                         "transactionProcessor",
                         "Transaction Processor REST  Scope",
                         "A scope for Transaction Processor REST"});
-            table10.AddRow(new string[] {
+            table1.AddRow(new string[] {
                         "fileProcessor",
                         "File Processor REST Scope",
                         "A scope for File Processor REST"});
 #line 5
- await testRunner.GivenAsync("I create the following api scopes", ((string)(null)), table10, "Given ");
+ await testRunner.GivenAsync("I create the following api scopes", ((string)(null)), table1, "Given ");
 #line hidden
-            global::Reqnroll.Table table11 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table2 = new global::Reqnroll.Table(new string[] {
                         "Name",
                         "DisplayName",
                         "Secret",
                         "Scopes",
                         "UserClaims"});
-            table11.AddRow(new string[] {
+            table2.AddRow(new string[] {
                         "transactionProcessor",
                         "Transaction Processor REST",
                         "Secret1",
                         "transactionProcessor",
                         "MerchantId, EstateId, role"});
-            table11.AddRow(new string[] {
+            table2.AddRow(new string[] {
                         "fileProcessor",
                         "File Processor REST",
                         "Secret1",
                         "fileProcessor",
                         ""});
 #line 10
- await testRunner.GivenAsync("the following api resources exist", ((string)(null)), table11, "Given ");
+ await testRunner.GivenAsync("the following api resources exist", ((string)(null)), table2, "Given ");
 #line hidden
-            global::Reqnroll.Table table12 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table3 = new global::Reqnroll.Table(new string[] {
                         "ClientId",
                         "ClientName",
                         "Secret",
                         "Scopes",
                         "GrantTypes"});
-            table12.AddRow(new string[] {
+            table3.AddRow(new string[] {
                         "serviceClient",
                         "Service Client",
                         "Secret1",
                         "transactionProcessor,fileProcessor",
                         "client_credentials"});
 #line 15
- await testRunner.GivenAsync("the following clients exist", ((string)(null)), table12, "Given ");
+ await testRunner.GivenAsync("the following clients exist", ((string)(null)), table3, "Given ");
 #line hidden
-            global::Reqnroll.Table table13 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table4 = new global::Reqnroll.Table(new string[] {
                         "ClientId"});
-            table13.AddRow(new string[] {
+            table4.AddRow(new string[] {
                         "serviceClient"});
 #line 19
  await testRunner.GivenAsync("I have a token to access the estate management and transaction processor resource" +
-                    "s", ((string)(null)), table13, "Given ");
+                    "s", ((string)(null)), table4, "Given ");
 #line hidden
-            global::Reqnroll.Table table14 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table5 = new global::Reqnroll.Table(new string[] {
                         "Alias",
                         "FileProfileId",
                         "Name",
@@ -181,7 +181,7 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "OperatorName",
                         "LineTerminator",
                         "FileFormatHandler"});
-            table14.AddRow(new string[] {
+            table5.AddRow(new string[] {
                         "Safaricom Topup",
                         "B2A59ABF-293D-4A6B-B81B-7007503C3476",
                         "Safaricom Topup",
@@ -190,7 +190,7 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "Safaricom",
                         "\n",
                         "SafaricomFileFormatHandler"});
-            table14.AddRow(new string[] {
+            table5.AddRow(new string[] {
                         "Voucher Issue",
                         "8806EDBC-3ED6-406B-9E5F-A9078356BE99",
                         "Voucher Issue",
@@ -200,61 +200,61 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "\n",
                         "VoucherFileFormatHandler"});
 #line 23
- await testRunner.WhenAsync("I create the following file profiles", ((string)(null)), table14, "When ");
+ await testRunner.WhenAsync("I create the following file profiles", ((string)(null)), table5, "When ");
 #line hidden
-            global::Reqnroll.Table table15 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table6 = new global::Reqnroll.Table(new string[] {
                         "EstateName"});
-            table15.AddRow(new string[] {
+            table6.AddRow(new string[] {
                         "Test Estate 1"});
 #line 28
- await testRunner.GivenAsync("I have created the following estates", ((string)(null)), table15, "Given ");
+ await testRunner.GivenAsync("I have created the following estates", ((string)(null)), table6, "Given ");
 #line hidden
-            global::Reqnroll.Table table16 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table7 = new global::Reqnroll.Table(new string[] {
                         "EstateName",
                         "OperatorName",
                         "RequireCustomMerchantNumber",
                         "RequireCustomTerminalNumber"});
-            table16.AddRow(new string[] {
+            table7.AddRow(new string[] {
                         "Test Estate 1",
                         "Safaricom",
                         "True",
                         "True"});
-            table16.AddRow(new string[] {
+            table7.AddRow(new string[] {
                         "Test Estate 1",
                         "Voucher",
                         "True",
                         "True"});
 #line 32
- await testRunner.GivenAsync("I have created the following operators", ((string)(null)), table16, "Given ");
+ await testRunner.GivenAsync("I have created the following operators", ((string)(null)), table7, "Given ");
 #line hidden
-            global::Reqnroll.Table table17 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table8 = new global::Reqnroll.Table(new string[] {
                         "EstateName",
                         "OperatorName"});
-            table17.AddRow(new string[] {
+            table8.AddRow(new string[] {
                         "Test Estate 1",
                         "Safaricom"});
-            table17.AddRow(new string[] {
+            table8.AddRow(new string[] {
                         "Test Estate 1",
                         "Voucher"});
 #line 37
- await testRunner.AndAsync("I have assigned the following operators to the estates", ((string)(null)), table17, "And ");
+ await testRunner.AndAsync("I have assigned the following operators to the estates", ((string)(null)), table8, "And ");
 #line hidden
-            global::Reqnroll.Table table18 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table9 = new global::Reqnroll.Table(new string[] {
                         "EstateName",
                         "OperatorName",
                         "ContractDescription"});
-            table18.AddRow(new string[] {
+            table9.AddRow(new string[] {
                         "Test Estate 1",
                         "Safaricom",
                         "Safaricom Contract"});
-            table18.AddRow(new string[] {
+            table9.AddRow(new string[] {
                         "Test Estate 1",
                         "Voucher",
                         "Hospital 1 Contract"});
 #line 42
- await testRunner.GivenAsync("I create a contract with the following values", ((string)(null)), table18, "Given ");
+ await testRunner.GivenAsync("I create a contract with the following values", ((string)(null)), table9, "Given ");
 #line hidden
-            global::Reqnroll.Table table19 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table10 = new global::Reqnroll.Table(new string[] {
                         "EstateName",
                         "OperatorName",
                         "ContractDescription",
@@ -262,7 +262,7 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "DisplayText",
                         "Value",
                         "ProductType"});
-            table19.AddRow(new string[] {
+            table10.AddRow(new string[] {
                         "Test Estate 1",
                         "Safaricom",
                         "Safaricom Contract",
@@ -270,7 +270,7 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "Custom",
                         "",
                         "MobileTopup"});
-            table19.AddRow(new string[] {
+            table10.AddRow(new string[] {
                         "Test Estate 1",
                         "Voucher",
                         "Hospital 1 Contract",
@@ -279,9 +279,9 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "",
                         "Voucher"});
 #line 47
- await testRunner.WhenAsync("I create the following Products", ((string)(null)), table19, "When ");
+ await testRunner.WhenAsync("I create the following Products", ((string)(null)), table10, "When ");
 #line hidden
-            global::Reqnroll.Table table20 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table11 = new global::Reqnroll.Table(new string[] {
                         "EstateName",
                         "OperatorName",
                         "ContractDescription",
@@ -289,7 +289,7 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "CalculationType",
                         "FeeDescription",
                         "Value"});
-            table20.AddRow(new string[] {
+            table11.AddRow(new string[] {
                         "Test Estate 1",
                         "Safaricom",
                         "Safaricom Contract",
@@ -298,9 +298,9 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "Merchant Commission",
                         "2.50"});
 #line 52
- await testRunner.WhenAsync("I add the following Transaction Fees", ((string)(null)), table20, "When ");
+ await testRunner.WhenAsync("I add the following Transaction Fees", ((string)(null)), table11, "When ");
 #line hidden
-            global::Reqnroll.Table table21 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table12 = new global::Reqnroll.Table(new string[] {
                         "MerchantName",
                         "AddressLine1",
                         "Town",
@@ -310,7 +310,7 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "ContactName",
                         "EmailAddress",
                         "EstateName"});
-            table21.AddRow(new string[] {
+            table12.AddRow(new string[] {
                         "Test Merchant 1",
                         "Address Line 1",
                         "TestTown",
@@ -320,7 +320,7 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "Test Contact 1",
                         "testcontact1@merchant1.co.uk",
                         "Test Estate 1"});
-            table21.AddRow(new string[] {
+            table12.AddRow(new string[] {
                         "Test Merchant 2",
                         "Address Line 1",
                         "TestTown",
@@ -331,99 +331,99 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "testcontact1@merchant2.co.uk",
                         "Test Estate 1"});
 #line 56
- await testRunner.GivenAsync("I create the following merchants", ((string)(null)), table21, "Given ");
+ await testRunner.GivenAsync("I create the following merchants", ((string)(null)), table12, "Given ");
 #line hidden
-            global::Reqnroll.Table table22 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table13 = new global::Reqnroll.Table(new string[] {
                         "OperatorName",
                         "MerchantName",
                         "MerchantNumber",
                         "TerminalNumber",
                         "EstateName"});
-            table22.AddRow(new string[] {
+            table13.AddRow(new string[] {
                         "Safaricom",
                         "Test Merchant 1",
                         "00000001",
                         "10000001",
                         "Test Estate 1"});
-            table22.AddRow(new string[] {
+            table13.AddRow(new string[] {
                         "Voucher",
                         "Test Merchant 1",
                         "00000001",
                         "10000001",
                         "Test Estate 1"});
-            table22.AddRow(new string[] {
+            table13.AddRow(new string[] {
                         "Safaricom",
                         "Test Merchant 2",
                         "00000002",
                         "10000002",
                         "Test Estate 1"});
-            table22.AddRow(new string[] {
+            table13.AddRow(new string[] {
                         "Voucher",
                         "Test Merchant 2",
                         "00000002",
                         "10000002",
                         "Test Estate 1"});
 #line 61
- await testRunner.GivenAsync("I have assigned the following  operator to the merchants", ((string)(null)), table22, "Given ");
+ await testRunner.GivenAsync("I have assigned the following  operator to the merchants", ((string)(null)), table13, "Given ");
 #line hidden
-            global::Reqnroll.Table table23 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table14 = new global::Reqnroll.Table(new string[] {
                         "DeviceIdentifier",
                         "MerchantName",
                         "EstateName"});
-            table23.AddRow(new string[] {
+            table14.AddRow(new string[] {
                         "123456780",
                         "Test Merchant 1",
                         "Test Estate 1"});
-            table23.AddRow(new string[] {
+            table14.AddRow(new string[] {
                         "123456781",
                         "Test Merchant 2",
                         "Test Estate 1"});
 #line 68
- await testRunner.GivenAsync("I have assigned the following devices to the merchants", ((string)(null)), table23, "Given ");
+ await testRunner.GivenAsync("I have assigned the following devices to the merchants", ((string)(null)), table14, "Given ");
 #line hidden
-            global::Reqnroll.Table table24 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table15 = new global::Reqnroll.Table(new string[] {
                         "EstateName",
                         "MerchantName",
                         "ContractDescription"});
-            table24.AddRow(new string[] {
+            table15.AddRow(new string[] {
                         "Test Estate 1",
                         "Test Merchant 1",
                         "Safaricom Contract"});
-            table24.AddRow(new string[] {
+            table15.AddRow(new string[] {
                         "Test Estate 1",
                         "Test Merchant 1",
                         "Hospital 1 Contract"});
-            table24.AddRow(new string[] {
+            table15.AddRow(new string[] {
                         "Test Estate 1",
                         "Test Merchant 2",
                         "Safaricom Contract"});
-            table24.AddRow(new string[] {
+            table15.AddRow(new string[] {
                         "Test Estate 1",
                         "Test Merchant 2",
                         "Hospital 1 Contract"});
 #line 73
- await testRunner.WhenAsync("I add the following contracts to the following merchants", ((string)(null)), table24, "When ");
+ await testRunner.WhenAsync("I add the following contracts to the following merchants", ((string)(null)), table15, "When ");
 #line hidden
-            global::Reqnroll.Table table25 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table16 = new global::Reqnroll.Table(new string[] {
                         "Reference",
                         "Amount",
                         "DateTime",
                         "MerchantName",
                         "EstateName"});
-            table25.AddRow(new string[] {
+            table16.AddRow(new string[] {
                         "Deposit1",
                         "300.00",
                         "Today",
                         "Test Merchant 1",
                         "Test Estate 1"});
-            table25.AddRow(new string[] {
+            table16.AddRow(new string[] {
                         "Deposit1",
                         "300.00",
                         "Today",
                         "Test Merchant 2",
                         "Test Estate 1"});
 #line 80
- await testRunner.GivenAsync("I make the following manual merchant deposits", ((string)(null)), table25, "Given ");
+ await testRunner.GivenAsync("I make the following manual merchant deposits", ((string)(null)), table16, "Given ");
 #line hidden
         }
         
@@ -435,18 +435,16 @@ await testRunner.GivenAsync("I have a token to access the estate management and
         [global::NUnit.Framework.TestAttribute()]
         [global::NUnit.Framework.DescriptionAttribute("Get File Import Log Details")]
         [global::NUnit.Framework.CategoryAttribute("PRTest")]
-        [global::NUnit.Framework.CategoryAttribute("Nightly1")]
         public async global::System.Threading.Tasks.Task GetFileImportLogDetails()
         {
             string[] tagsOfScenario = new string[] {
-                    "PRTest",
-                    "Nightly1"};
+                    "PRTest"};
             global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary();
             string pickleIndex = "0";
             global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Get File Import Log Details", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex);
             string[] tagsOfRule = ((string[])(null));
             global::Reqnroll.RuleInfo ruleInfo = null;
-#line 87
+#line 86
 this.ScenarioInitialize(scenarioInfo, ruleInfo);
 #line hidden
             if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags)))
@@ -459,144 +457,144 @@ await testRunner.GivenAsync("I have a token to access the estate management and
 #line 4
 await this.FeatureBackgroundAsync();
 #line hidden
-                global::Reqnroll.Table table26 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table17 = new global::Reqnroll.Table(new string[] {
                             "Column1",
                             "Column2",
                             "Column3"});
-                table26.AddRow(new string[] {
+                table17.AddRow(new string[] {
                             "H",
                             "20210508",
                             ""});
-                table26.AddRow(new string[] {
+                table17.AddRow(new string[] {
                             "D",
                             "07777777775",
                             "100"});
-                table26.AddRow(new string[] {
+                table17.AddRow(new string[] {
                             "T",
                             "1",
                             ""});
-#line 88
- await testRunner.GivenAsync("I have a file named \'SafarcomTopup1.txt\' with the following contents", ((string)(null)), table26, "Given ");
+#line 87
+ await testRunner.GivenAsync("I have a file named \'SafarcomTopup1.txt\' with the following contents", ((string)(null)), table17, "Given ");
 #line hidden
-                global::Reqnroll.Table table27 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table18 = new global::Reqnroll.Table(new string[] {
                             "EstateName",
                             "MerchantName",
                             "FileProfileId",
                             "UserId",
                             "UploadDateTime"});
-                table27.AddRow(new string[] {
+                table18.AddRow(new string[] {
                             "Test Estate 1",
                             "Test Merchant 1",
                             "B2A59ABF-293D-4A6B-B81B-7007503C3476",
                             "ABA59ABF-293D-4A6B-B81B-7007503C3476",
                             "Today"});
-#line 93
- await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table27, "And ");
+#line 92
+ await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table18, "And ");
 #line hidden
-                global::Reqnroll.Table table28 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table19 = new global::Reqnroll.Table(new string[] {
                             "Column1",
                             "Column2",
                             "Column3"});
-                table28.AddRow(new string[] {
+                table19.AddRow(new string[] {
                             "H",
                             "20210508",
                             ""});
-                table28.AddRow(new string[] {
+                table19.AddRow(new string[] {
                             "D",
                             "07777777776",
                             "150"});
-                table28.AddRow(new string[] {
+                table19.AddRow(new string[] {
                             "T",
                             "1",
                             ""});
-#line 97
- await testRunner.GivenAsync("I have a file named \'SafarcomTopup2.txt\' with the following contents", ((string)(null)), table28, "Given ");
+#line 96
+ await testRunner.GivenAsync("I have a file named \'SafarcomTopup2.txt\' with the following contents", ((string)(null)), table19, "Given ");
 #line hidden
-                global::Reqnroll.Table table29 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table20 = new global::Reqnroll.Table(new string[] {
                             "EstateName",
                             "MerchantName",
                             "FileProfileId",
                             "UserId",
                             "UploadDateTime"});
-                table29.AddRow(new string[] {
+                table20.AddRow(new string[] {
                             "Test Estate 1",
                             "Test Merchant 2",
                             "B2A59ABF-293D-4A6B-B81B-7007503C3476",
                             "ABA59ABF-293D-4A6B-B81B-7007503C3476",
                             "Today"});
-#line 102
- await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table29, "And ");
+#line 101
+ await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table20, "And ");
 #line hidden
-                global::Reqnroll.Table table30 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table21 = new global::Reqnroll.Table(new string[] {
                             "Column1",
                             "Column2",
                             "Column3",
                             "Column4"});
-                table30.AddRow(new string[] {
+                table21.AddRow(new string[] {
                             "H",
                             "20210508",
                             "",
                             ""});
-                table30.AddRow(new string[] {
+                table21.AddRow(new string[] {
                             "D",
                             "Hospital 1",
                             "07777777775",
                             "10"});
-                table30.AddRow(new string[] {
+                table21.AddRow(new string[] {
                             "D",
                             "Hospital 1",
                             "testrecipient1@recipient.com",
                             "10"});
-                table30.AddRow(new string[] {
+                table21.AddRow(new string[] {
                             "T",
                             "1",
                             "",
                             ""});
-#line 106
- await testRunner.GivenAsync("I have a file named \'VoucherIssue1.txt\' with the following contents", ((string)(null)), table30, "Given ");
+#line 105
+ await testRunner.GivenAsync("I have a file named \'VoucherIssue1.txt\' with the following contents", ((string)(null)), table21, "Given ");
 #line hidden
-                global::Reqnroll.Table table31 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table22 = new global::Reqnroll.Table(new string[] {
                             "EstateName",
                             "MerchantName",
                             "FileProfileId",
                             "UserId",
                             "UploadDateTime"});
-                table31.AddRow(new string[] {
+                table22.AddRow(new string[] {
                             "Test Estate 1",
                             "Test Merchant 1",
                             "8806EDBC-3ED6-406B-9E5F-A9078356BE99",
                             "ABA59ABF-293D-4A6B-B81B-7007503C3476",
                             "Today"});
-#line 112
- await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table31, "And ");
+#line 111
+ await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table22, "And ");
 #line hidden
-                global::Reqnroll.Table table32 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table23 = new global::Reqnroll.Table(new string[] {
                             "ImportLogDate",
                             "FileCount"});
-                table32.AddRow(new string[] {
+                table23.AddRow(new string[] {
                             "Today",
                             "3"});
-#line 116
+#line 115
  await testRunner.WhenAsync("I get the \'Test Estate 1\' import logs between \'Yesterday\' and \'Today\' the followi" +
-                        "ng data is returned", ((string)(null)), table32, "When ");
+                        "ng data is returned", ((string)(null)), table23, "When ");
 #line hidden
-                global::Reqnroll.Table table33 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table24 = new global::Reqnroll.Table(new string[] {
                             "MerchantName",
                             "OriginalFileName"});
-                table33.AddRow(new string[] {
+                table24.AddRow(new string[] {
                             "Test Merchant 1",
                             "SafarcomTopup1.txt"});
-                table33.AddRow(new string[] {
+                table24.AddRow(new string[] {
                             "Test Merchant 2",
                             "SafarcomTopup2.txt"});
-                table33.AddRow(new string[] {
+                table24.AddRow(new string[] {
                             "Test Merchant 1",
                             "VoucherIssue1.txt"});
-#line 120
+#line 119
  await testRunner.WhenAsync("I get the \'Test Estate 1\' import log for \'Today\' the following file information i" +
-                        "s returned", ((string)(null)), table33, "When ");
+                        "s returned", ((string)(null)), table24, "When ");
 #line hidden
-                global::Reqnroll.Table table34 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table25 = new global::Reqnroll.Table(new string[] {
                             "ProcessingCompleted",
                             "NumberOfLines",
                             "TotaLines",
@@ -604,7 +602,7 @@ await testRunner.WhenAsync("I get the \'Test Estate 1\' import logs between \'Ye
                             "IgnoredLines",
                             "FailedLines",
                             "NotProcessedLines"});
-                table34.AddRow(new string[] {
+                table25.AddRow(new string[] {
                             "True",
                             "3",
                             "3",
@@ -612,31 +610,31 @@ await testRunner.WhenAsync("I get the \'Test Estate 1\' import logs between \'Ye
                             "2",
                             "0",
                             "0"});
-#line 126
+#line 125
  await testRunner.WhenAsync("I get the file \'SafarcomTopup1.txt\' for Estate \'Test Estate 1\' the following file" +
-                        " information is returned", ((string)(null)), table34, "When ");
+                        " information is returned", ((string)(null)), table25, "When ");
 #line hidden
-                global::Reqnroll.Table table35 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table26 = new global::Reqnroll.Table(new string[] {
                             "LineNumber",
                             "Data",
                             "Result"});
-                table35.AddRow(new string[] {
+                table26.AddRow(new string[] {
                             "1",
                             "H,20210508,",
                             "Ignored"});
-                table35.AddRow(new string[] {
+                table26.AddRow(new string[] {
                             "2",
                             "D,07777777775,100",
                             "Successful"});
-                table35.AddRow(new string[] {
+                table26.AddRow(new string[] {
                             "3",
                             "T,1,",
                             "Ignored"});
-#line 130
+#line 129
  await testRunner.WhenAsync("I get the file \'SafarcomTopup1.txt\' for Estate \'Test Estate 1\' the following file" +
-                        " lines are returned", ((string)(null)), table35, "When ");
+                        " lines are returned", ((string)(null)), table26, "When ");
 #line hidden
-                global::Reqnroll.Table table36 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table27 = new global::Reqnroll.Table(new string[] {
                             "ProcessingCompleted",
                             "NumberOfLines",
                             "TotaLines",
@@ -644,7 +642,7 @@ await testRunner.WhenAsync("I get the \'Test Estate 1\' import logs between \'Ye
                             "IgnoredLines",
                             "FailedLines",
                             "NotProcessedLines"});
-                table36.AddRow(new string[] {
+                table27.AddRow(new string[] {
                             "True",
                             "3",
                             "3",
@@ -652,31 +650,31 @@ await testRunner.WhenAsync("I get the \'Test Estate 1\' import logs between \'Ye
                             "2",
                             "0",
                             "0"});
-#line 136
+#line 135
  await testRunner.WhenAsync("I get the file \'SafarcomTopup2.txt\' for Estate \'Test Estate 1\' the following file" +
-                        " information is returned", ((string)(null)), table36, "When ");
+                        " information is returned", ((string)(null)), table27, "When ");
 #line hidden
-                global::Reqnroll.Table table37 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table28 = new global::Reqnroll.Table(new string[] {
                             "LineNumber",
                             "Data",
                             "Result"});
-                table37.AddRow(new string[] {
+                table28.AddRow(new string[] {
                             "1",
                             "H,20210508,",
                             "Ignored"});
-                table37.AddRow(new string[] {
+                table28.AddRow(new string[] {
                             "2",
                             "D,07777777776,150",
                             "Successful"});
-                table37.AddRow(new string[] {
+                table28.AddRow(new string[] {
                             "3",
                             "T,1,",
                             "Ignored"});
-#line 140
+#line 139
  await testRunner.WhenAsync("I get the file \'SafarcomTopup2.txt\' for Estate \'Test Estate 1\' the following file" +
-                        " lines are returned", ((string)(null)), table37, "When ");
+                        " lines are returned", ((string)(null)), table28, "When ");
 #line hidden
-                global::Reqnroll.Table table38 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table29 = new global::Reqnroll.Table(new string[] {
                             "ProcessingCompleted",
                             "NumberOfLines",
                             "TotaLines",
@@ -684,7 +682,7 @@ await testRunner.WhenAsync("I get the \'Test Estate 1\' import logs between \'Ye
                             "IgnoredLines",
                             "FailedLines",
                             "NotProcessedLines"});
-                table38.AddRow(new string[] {
+                table29.AddRow(new string[] {
                             "True",
                             "4",
                             "4",
@@ -692,33 +690,33 @@ await testRunner.WhenAsync("I get the \'Test Estate 1\' import logs between \'Ye
                             "2",
                             "0",
                             "0"});
-#line 146
+#line 145
  await testRunner.WhenAsync("I get the file \'VoucherIssue1.txt\' for Estate \'Test Estate 1\' the following file " +
-                        "information is returned", ((string)(null)), table38, "When ");
+                        "information is returned", ((string)(null)), table29, "When ");
 #line hidden
-                global::Reqnroll.Table table39 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table30 = new global::Reqnroll.Table(new string[] {
                             "LineNumber",
                             "Data",
                             "Result"});
-                table39.AddRow(new string[] {
+                table30.AddRow(new string[] {
                             "1",
                             "H,20210508,,",
                             "Ignored"});
-                table39.AddRow(new string[] {
+                table30.AddRow(new string[] {
                             "2",
                             "D,Hospital 1,07777777775,10",
                             "Successful"});
-                table39.AddRow(new string[] {
+                table30.AddRow(new string[] {
                             "3",
                             "D,Hospital 1,testrecipient1@recipient.com,10",
                             "Successful"});
-                table39.AddRow(new string[] {
+                table30.AddRow(new string[] {
                             "4",
                             "T,1,,",
                             "Ignored"});
-#line 150
+#line 149
  await testRunner.WhenAsync("I get the file \'VoucherIssue1.txt\' for Estate \'Test Estate 1\' the following file " +
-                        "lines are returned", ((string)(null)), table39, "When ");
+                        "lines are returned", ((string)(null)), table30, "When ");
 #line hidden
             }
             await this.ScenarioCleanupAsync();
diff --git a/FileProcessor.IntegrationTests/Features/ProcessTopupCSV.feature b/FileProcessor.IntegrationTests/Features/ProcessTopupCSV.feature
index d7beca4..9d9ab75 100644
--- a/FileProcessor.IntegrationTests/Features/ProcessTopupCSV.feature
+++ b/FileProcessor.IntegrationTests/Features/ProcessTopupCSV.feature
@@ -75,7 +75,7 @@ Background:
 	| Reference | Amount  | DateTime | MerchantName    | EstateName    |
 	| Deposit1  | 300.00 | Today    | Test Merchant 1 | Test Estate 1 |
 
-@Nightly	
+
 Scenario: Process Safaricom Topup File with 1 detail row
 	Given I have a file named 'SafarcomTopup.txt' with the following contents
 	| Column1 | Column2     | Column3 |
@@ -88,7 +88,6 @@ Scenario: Process Safaricom Topup File with 1 detail row
 
 	#When As merchant "Test Merchant 1" on Estate "Test Estate 1" I get my transactions 1 transaction should be returned
 
-@Nightly
 Scenario: Process Safaricom Topup File with 2 detail rows
 	Given I have a file named 'SafarcomTopup.txt' with the following contents
 	| Column1 | Column2     | Column3 |
@@ -102,7 +101,6 @@ Scenario: Process Safaricom Topup File with 2 detail rows
 
 	#When As merchant "Test Merchant 1" on Estate "Test Estate 1" I get my transactions 2 transaction should be returned
 
-@Nightly
 Scenario: Process 2 Safaricom Topup Files
 	Given I have a file named 'SafarcomTopup1.txt' with the following contents
 	| Column1 | Column2     | Column3 |
@@ -126,7 +124,6 @@ Scenario: Process 2 Safaricom Topup Files
 	#When As merchant "Test Merchant 1" on Estate "Test Estate 1" I get my transactions 3 transaction should be returned
 
 @PRTest
-@Nightly
 Scenario: Process Duplicate Safaricom Topup File with 1 detail row
 	Given I have a file named 'SafarcomTopup1.txt' with the following contents
 	| Column1 | Column2     | Column3 |
@@ -151,7 +148,6 @@ Scenario: Process Duplicate Safaricom Topup File with 1 detail row
 	| Test Estate 1 | Test Merchant 1 | B2A59ABF-293D-4A6B-B81B-7007503C3476 | ABA59ABF-293D-4A6B-B81B-7007503C3476 |
 	
 # Wrong Format??
-@Nightly
 Scenario: Process Safaricom Topup File with Upload Date Time
 	Given I have a file named 'SafarcomTopup.txt' with the following contents
 	| Column1 | Column2     | Column3 |
diff --git a/FileProcessor.IntegrationTests/Features/ProcessTopupCSV.feature.cs b/FileProcessor.IntegrationTests/Features/ProcessTopupCSV.feature.cs
index 42082ea..a92e25d 100644
--- a/FileProcessor.IntegrationTests/Features/ProcessTopupCSV.feature.cs
+++ b/FileProcessor.IntegrationTests/Features/ProcessTopupCSV.feature.cs
@@ -111,66 +111,66 @@ public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo, globa
         {
 #line 4
 #line hidden
-            global::Reqnroll.Table table40 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table31 = new global::Reqnroll.Table(new string[] {
                         "Name",
                         "DisplayName",
                         "Description"});
-            table40.AddRow(new string[] {
+            table31.AddRow(new string[] {
                         "transactionProcessor",
                         "Transaction Processor REST  Scope",
                         "A scope for Transaction Processor REST"});
-            table40.AddRow(new string[] {
+            table31.AddRow(new string[] {
                         "fileProcessor",
                         "File Processor REST Scope",
                         "A scope for File Processor REST"});
 #line 5
- await testRunner.GivenAsync("I create the following api scopes", ((string)(null)), table40, "Given ");
+ await testRunner.GivenAsync("I create the following api scopes", ((string)(null)), table31, "Given ");
 #line hidden
-            global::Reqnroll.Table table41 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table32 = new global::Reqnroll.Table(new string[] {
                         "Name",
                         "DisplayName",
                         "Secret",
                         "Scopes",
                         "UserClaims"});
-            table41.AddRow(new string[] {
+            table32.AddRow(new string[] {
                         "transactionProcessor",
                         "Transaction Processor REST",
                         "Secret1",
                         "transactionProcessor",
                         "MerchantId, EstateId, role"});
-            table41.AddRow(new string[] {
+            table32.AddRow(new string[] {
                         "fileProcessor",
                         "File Processor REST",
                         "Secret1",
                         "fileProcessor",
                         ""});
 #line 10
- await testRunner.GivenAsync("the following api resources exist", ((string)(null)), table41, "Given ");
+ await testRunner.GivenAsync("the following api resources exist", ((string)(null)), table32, "Given ");
 #line hidden
-            global::Reqnroll.Table table42 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table33 = new global::Reqnroll.Table(new string[] {
                         "ClientId",
                         "ClientName",
                         "Secret",
                         "Scopes",
                         "GrantTypes"});
-            table42.AddRow(new string[] {
+            table33.AddRow(new string[] {
                         "serviceClient",
                         "Service Client",
                         "Secret1",
                         "transactionProcessor,fileProcessor",
                         "client_credentials"});
 #line 15
- await testRunner.GivenAsync("the following clients exist", ((string)(null)), table42, "Given ");
+ await testRunner.GivenAsync("the following clients exist", ((string)(null)), table33, "Given ");
 #line hidden
-            global::Reqnroll.Table table43 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table34 = new global::Reqnroll.Table(new string[] {
                         "ClientId"});
-            table43.AddRow(new string[] {
+            table34.AddRow(new string[] {
                         "serviceClient"});
 #line 19
  await testRunner.GivenAsync("I have a token to access the estate management and transaction processor resource" +
-                    "s", ((string)(null)), table43, "Given ");
+                    "s", ((string)(null)), table34, "Given ");
 #line hidden
-            global::Reqnroll.Table table44 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table35 = new global::Reqnroll.Table(new string[] {
                         "Alias",
                         "FileProfileId",
                         "Name",
@@ -179,7 +179,7 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "OperatorName",
                         "LineTerminator",
                         "FileFormatHandler"});
-            table44.AddRow(new string[] {
+            table35.AddRow(new string[] {
                         "Safaricom Topup",
                         "B2A59ABF-293D-4A6B-B81B-7007503C3476",
                         "Safaricom Topup",
@@ -188,7 +188,7 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "Safaricom",
                         "\n",
                         "SafaricomFileFormatHandler"});
-            table44.AddRow(new string[] {
+            table35.AddRow(new string[] {
                         "Voucher Issue",
                         "8806EDBC-3ED6-406B-9E5F-A9078356BE99",
                         "Voucher Issue",
@@ -198,61 +198,61 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "\n",
                         "VoucherFileFormatHandler"});
 #line 23
- await testRunner.WhenAsync("I create the following file profiles", ((string)(null)), table44, "When ");
+ await testRunner.WhenAsync("I create the following file profiles", ((string)(null)), table35, "When ");
 #line hidden
-            global::Reqnroll.Table table45 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table36 = new global::Reqnroll.Table(new string[] {
                         "EstateName"});
-            table45.AddRow(new string[] {
+            table36.AddRow(new string[] {
                         "Test Estate 1"});
 #line 28
- await testRunner.GivenAsync("I have created the following estates", ((string)(null)), table45, "Given ");
+ await testRunner.GivenAsync("I have created the following estates", ((string)(null)), table36, "Given ");
 #line hidden
-            global::Reqnroll.Table table46 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table37 = new global::Reqnroll.Table(new string[] {
                         "EstateName",
                         "OperatorName",
                         "RequireCustomMerchantNumber",
                         "RequireCustomTerminalNumber"});
-            table46.AddRow(new string[] {
+            table37.AddRow(new string[] {
                         "Test Estate 1",
                         "Safaricom",
                         "True",
                         "True"});
-            table46.AddRow(new string[] {
+            table37.AddRow(new string[] {
                         "Test Estate 1",
                         "Voucher",
                         "True",
                         "True"});
 #line 32
- await testRunner.GivenAsync("I have created the following operators", ((string)(null)), table46, "Given ");
+ await testRunner.GivenAsync("I have created the following operators", ((string)(null)), table37, "Given ");
 #line hidden
-            global::Reqnroll.Table table47 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table38 = new global::Reqnroll.Table(new string[] {
                         "EstateName",
                         "OperatorName"});
-            table47.AddRow(new string[] {
+            table38.AddRow(new string[] {
                         "Test Estate 1",
                         "Safaricom"});
-            table47.AddRow(new string[] {
+            table38.AddRow(new string[] {
                         "Test Estate 1",
                         "Voucher"});
 #line 37
- await testRunner.AndAsync("I have assigned the following operators to the estates", ((string)(null)), table47, "And ");
+ await testRunner.AndAsync("I have assigned the following operators to the estates", ((string)(null)), table38, "And ");
 #line hidden
-            global::Reqnroll.Table table48 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table39 = new global::Reqnroll.Table(new string[] {
                         "EstateName",
                         "OperatorName",
                         "ContractDescription"});
-            table48.AddRow(new string[] {
+            table39.AddRow(new string[] {
                         "Test Estate 1",
                         "Safaricom",
                         "Safaricom Contract"});
-            table48.AddRow(new string[] {
+            table39.AddRow(new string[] {
                         "Test Estate 1",
                         "Voucher",
                         "Hospital 1 Contract"});
 #line 42
- await testRunner.GivenAsync("I create a contract with the following values", ((string)(null)), table48, "Given ");
+ await testRunner.GivenAsync("I create a contract with the following values", ((string)(null)), table39, "Given ");
 #line hidden
-            global::Reqnroll.Table table49 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table40 = new global::Reqnroll.Table(new string[] {
                         "EstateName",
                         "OperatorName",
                         "ContractDescription",
@@ -260,7 +260,7 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "DisplayText",
                         "Value",
                         "ProductType"});
-            table49.AddRow(new string[] {
+            table40.AddRow(new string[] {
                         "Test Estate 1",
                         "Safaricom",
                         "Safaricom Contract",
@@ -268,7 +268,7 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "Custom",
                         "",
                         "MobileTopup"});
-            table49.AddRow(new string[] {
+            table40.AddRow(new string[] {
                         "Test Estate 1",
                         "Voucher",
                         "Hospital 1 Contract",
@@ -277,9 +277,9 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "",
                         "Voucher"});
 #line 47
- await testRunner.WhenAsync("I create the following Products", ((string)(null)), table49, "When ");
+ await testRunner.WhenAsync("I create the following Products", ((string)(null)), table40, "When ");
 #line hidden
-            global::Reqnroll.Table table50 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table41 = new global::Reqnroll.Table(new string[] {
                         "EstateName",
                         "OperatorName",
                         "ContractDescription",
@@ -287,7 +287,7 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "CalculationType",
                         "FeeDescription",
                         "Value"});
-            table50.AddRow(new string[] {
+            table41.AddRow(new string[] {
                         "Test Estate 1",
                         "Safaricom",
                         "Safaricom Contract",
@@ -296,9 +296,9 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "Merchant Commission",
                         "2.50"});
 #line 52
- await testRunner.WhenAsync("I add the following Transaction Fees", ((string)(null)), table50, "When ");
+ await testRunner.WhenAsync("I add the following Transaction Fees", ((string)(null)), table41, "When ");
 #line hidden
-            global::Reqnroll.Table table51 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table42 = new global::Reqnroll.Table(new string[] {
                         "MerchantName",
                         "AddressLine1",
                         "Town",
@@ -308,7 +308,7 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "ContactName",
                         "EmailAddress",
                         "EstateName"});
-            table51.AddRow(new string[] {
+            table42.AddRow(new string[] {
                         "Test Merchant 1",
                         "Address Line 1",
                         "TestTown",
@@ -319,69 +319,69 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "testcontact1@merchant1.co.uk",
                         "Test Estate 1"});
 #line 56
- await testRunner.GivenAsync("I create the following merchants", ((string)(null)), table51, "Given ");
+ await testRunner.GivenAsync("I create the following merchants", ((string)(null)), table42, "Given ");
 #line hidden
-            global::Reqnroll.Table table52 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table43 = new global::Reqnroll.Table(new string[] {
                         "OperatorName",
                         "MerchantName",
                         "MerchantNumber",
                         "TerminalNumber",
                         "EstateName"});
-            table52.AddRow(new string[] {
+            table43.AddRow(new string[] {
                         "Safaricom",
                         "Test Merchant 1",
                         "00000001",
                         "10000001",
                         "Test Estate 1"});
-            table52.AddRow(new string[] {
+            table43.AddRow(new string[] {
                         "Voucher",
                         "Test Merchant 1",
                         "00000001",
                         "10000001",
                         "Test Estate 1"});
 #line 60
- await testRunner.GivenAsync("I have assigned the following  operator to the merchants", ((string)(null)), table52, "Given ");
+ await testRunner.GivenAsync("I have assigned the following  operator to the merchants", ((string)(null)), table43, "Given ");
 #line hidden
-            global::Reqnroll.Table table53 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table44 = new global::Reqnroll.Table(new string[] {
                         "DeviceIdentifier",
                         "MerchantName",
                         "EstateName"});
-            table53.AddRow(new string[] {
+            table44.AddRow(new string[] {
                         "123456780",
                         "Test Merchant 1",
                         "Test Estate 1"});
 #line 65
- await testRunner.GivenAsync("I have assigned the following devices to the merchants", ((string)(null)), table53, "Given ");
+ await testRunner.GivenAsync("I have assigned the following devices to the merchants", ((string)(null)), table44, "Given ");
 #line hidden
-            global::Reqnroll.Table table54 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table45 = new global::Reqnroll.Table(new string[] {
                         "EstateName",
                         "MerchantName",
                         "ContractDescription"});
-            table54.AddRow(new string[] {
+            table45.AddRow(new string[] {
                         "Test Estate 1",
                         "Test Merchant 1",
                         "Safaricom Contract"});
-            table54.AddRow(new string[] {
+            table45.AddRow(new string[] {
                         "Test Estate 1",
                         "Test Merchant 1",
                         "Hospital 1 Contract"});
 #line 69
- await testRunner.WhenAsync("I add the following contracts to the following merchants", ((string)(null)), table54, "When ");
+ await testRunner.WhenAsync("I add the following contracts to the following merchants", ((string)(null)), table45, "When ");
 #line hidden
-            global::Reqnroll.Table table55 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table46 = new global::Reqnroll.Table(new string[] {
                         "Reference",
                         "Amount",
                         "DateTime",
                         "MerchantName",
                         "EstateName"});
-            table55.AddRow(new string[] {
+            table46.AddRow(new string[] {
                         "Deposit1",
                         "300.00",
                         "Today",
                         "Test Merchant 1",
                         "Test Estate 1"});
 #line 74
- await testRunner.GivenAsync("I make the following manual merchant deposits", ((string)(null)), table55, "Given ");
+ await testRunner.GivenAsync("I make the following manual merchant deposits", ((string)(null)), table46, "Given ");
 #line hidden
         }
         
@@ -392,11 +392,9 @@ await testRunner.GivenAsync("I have a token to access the estate management and
         
         [global::NUnit.Framework.TestAttribute()]
         [global::NUnit.Framework.DescriptionAttribute("Process Safaricom Topup File with 1 detail row")]
-        [global::NUnit.Framework.CategoryAttribute("Nightly")]
         public async global::System.Threading.Tasks.Task ProcessSafaricomTopupFileWith1DetailRow()
         {
-            string[] tagsOfScenario = new string[] {
-                    "Nightly"};
+            string[] tagsOfScenario = ((string[])(null));
             global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary();
             string pickleIndex = "0";
             global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Process Safaricom Topup File with 1 detail row", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex);
@@ -415,37 +413,37 @@ await testRunner.GivenAsync("I have a token to access the estate management and
 #line 4
 await this.FeatureBackgroundAsync();
 #line hidden
-                global::Reqnroll.Table table56 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table47 = new global::Reqnroll.Table(new string[] {
                             "Column1",
                             "Column2",
                             "Column3"});
-                table56.AddRow(new string[] {
+                table47.AddRow(new string[] {
                             "H",
                             "20210508",
                             ""});
-                table56.AddRow(new string[] {
+                table47.AddRow(new string[] {
                             "D",
                             "07777777775",
                             "100"});
-                table56.AddRow(new string[] {
+                table47.AddRow(new string[] {
                             "T",
                             "1",
                             ""});
 #line 80
- await testRunner.GivenAsync("I have a file named \'SafarcomTopup.txt\' with the following contents", ((string)(null)), table56, "Given ");
+ await testRunner.GivenAsync("I have a file named \'SafarcomTopup.txt\' with the following contents", ((string)(null)), table47, "Given ");
 #line hidden
-                global::Reqnroll.Table table57 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table48 = new global::Reqnroll.Table(new string[] {
                             "EstateName",
                             "MerchantName",
                             "FileProfileId",
                             "UserId"});
-                table57.AddRow(new string[] {
+                table48.AddRow(new string[] {
                             "Test Estate 1",
                             "Test Merchant 1",
                             "B2A59ABF-293D-4A6B-B81B-7007503C3476",
                             "ABA59ABF-293D-4A6B-B81B-7007503C3476"});
 #line 85
- await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table57, "And ");
+ await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table48, "And ");
 #line hidden
             }
             await this.ScenarioCleanupAsync();
@@ -453,17 +451,15 @@ await testRunner.GivenAsync("I have a token to access the estate management and
         
         [global::NUnit.Framework.TestAttribute()]
         [global::NUnit.Framework.DescriptionAttribute("Process Safaricom Topup File with 2 detail rows")]
-        [global::NUnit.Framework.CategoryAttribute("Nightly")]
         public async global::System.Threading.Tasks.Task ProcessSafaricomTopupFileWith2DetailRows()
         {
-            string[] tagsOfScenario = new string[] {
-                    "Nightly"};
+            string[] tagsOfScenario = ((string[])(null));
             global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary();
             string pickleIndex = "1";
             global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Process Safaricom Topup File with 2 detail rows", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex);
             string[] tagsOfRule = ((string[])(null));
             global::Reqnroll.RuleInfo ruleInfo = null;
-#line 92
+#line 91
 this.ScenarioInitialize(scenarioInfo, ruleInfo);
 #line hidden
             if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags)))
@@ -476,41 +472,41 @@ await testRunner.GivenAsync("I have a token to access the estate management and
 #line 4
 await this.FeatureBackgroundAsync();
 #line hidden
-                global::Reqnroll.Table table58 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table49 = new global::Reqnroll.Table(new string[] {
                             "Column1",
                             "Column2",
                             "Column3"});
-                table58.AddRow(new string[] {
+                table49.AddRow(new string[] {
                             "H",
                             "20210508",
                             ""});
-                table58.AddRow(new string[] {
+                table49.AddRow(new string[] {
                             "D",
                             "07777777775",
                             "100"});
-                table58.AddRow(new string[] {
+                table49.AddRow(new string[] {
                             "D",
                             "07777777776",
                             "200"});
-                table58.AddRow(new string[] {
+                table49.AddRow(new string[] {
                             "T",
                             "2",
                             ""});
-#line 93
- await testRunner.GivenAsync("I have a file named \'SafarcomTopup.txt\' with the following contents", ((string)(null)), table58, "Given ");
+#line 92
+ await testRunner.GivenAsync("I have a file named \'SafarcomTopup.txt\' with the following contents", ((string)(null)), table49, "Given ");
 #line hidden
-                global::Reqnroll.Table table59 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table50 = new global::Reqnroll.Table(new string[] {
                             "EstateName",
                             "MerchantName",
                             "FileProfileId",
                             "UserId"});
-                table59.AddRow(new string[] {
+                table50.AddRow(new string[] {
                             "Test Estate 1",
                             "Test Merchant 1",
                             "B2A59ABF-293D-4A6B-B81B-7007503C3476",
                             "ABA59ABF-293D-4A6B-B81B-7007503C3476"});
-#line 99
- await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table59, "And ");
+#line 98
+ await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table50, "And ");
 #line hidden
             }
             await this.ScenarioCleanupAsync();
@@ -518,17 +514,15 @@ await testRunner.GivenAsync("I have a token to access the estate management and
         
         [global::NUnit.Framework.TestAttribute()]
         [global::NUnit.Framework.DescriptionAttribute("Process 2 Safaricom Topup Files")]
-        [global::NUnit.Framework.CategoryAttribute("Nightly")]
         public async global::System.Threading.Tasks.Task Process2SafaricomTopupFiles()
         {
-            string[] tagsOfScenario = new string[] {
-                    "Nightly"};
+            string[] tagsOfScenario = ((string[])(null));
             global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary();
             string pickleIndex = "2";
             global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Process 2 Safaricom Topup Files", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex);
             string[] tagsOfRule = ((string[])(null));
             global::Reqnroll.RuleInfo ruleInfo = null;
-#line 106
+#line 104
 this.ScenarioInitialize(scenarioInfo, ruleInfo);
 #line hidden
             if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags)))
@@ -541,73 +535,73 @@ await testRunner.GivenAsync("I have a token to access the estate management and
 #line 4
 await this.FeatureBackgroundAsync();
 #line hidden
-                global::Reqnroll.Table table60 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table51 = new global::Reqnroll.Table(new string[] {
                             "Column1",
                             "Column2",
                             "Column3"});
-                table60.AddRow(new string[] {
+                table51.AddRow(new string[] {
                             "H",
                             "20210508",
                             ""});
-                table60.AddRow(new string[] {
+                table51.AddRow(new string[] {
                             "D",
                             "07777777775",
                             "100"});
-                table60.AddRow(new string[] {
+                table51.AddRow(new string[] {
                             "T",
                             "1",
                             ""});
-#line 107
- await testRunner.GivenAsync("I have a file named \'SafarcomTopup1.txt\' with the following contents", ((string)(null)), table60, "Given ");
+#line 105
+ await testRunner.GivenAsync("I have a file named \'SafarcomTopup1.txt\' with the following contents", ((string)(null)), table51, "Given ");
 #line hidden
-                global::Reqnroll.Table table61 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table52 = new global::Reqnroll.Table(new string[] {
                             "EstateName",
                             "MerchantName",
                             "FileProfileId",
                             "UserId"});
-                table61.AddRow(new string[] {
+                table52.AddRow(new string[] {
                             "Test Estate 1",
                             "Test Merchant 1",
                             "B2A59ABF-293D-4A6B-B81B-7007503C3476",
                             "ABA59ABF-293D-4A6B-B81B-7007503C3476"});
-#line 112
- await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table61, "And ");
+#line 110
+ await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table52, "And ");
 #line hidden
-                global::Reqnroll.Table table62 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table53 = new global::Reqnroll.Table(new string[] {
                             "Column1",
                             "Column2",
                             "Column3"});
-                table62.AddRow(new string[] {
+                table53.AddRow(new string[] {
                             "H",
                             "20210508",
                             ""});
-                table62.AddRow(new string[] {
+                table53.AddRow(new string[] {
                             "D",
                             "07777777776",
                             "150"});
-                table62.AddRow(new string[] {
+                table53.AddRow(new string[] {
                             "D",
                             "07777777777",
                             "50"});
-                table62.AddRow(new string[] {
+                table53.AddRow(new string[] {
                             "T",
                             "2",
                             ""});
-#line 116
- await testRunner.GivenAsync("I have a file named \'SafarcomTopup2.txt\' with the following contents", ((string)(null)), table62, "Given ");
+#line 114
+ await testRunner.GivenAsync("I have a file named \'SafarcomTopup2.txt\' with the following contents", ((string)(null)), table53, "Given ");
 #line hidden
-                global::Reqnroll.Table table63 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table54 = new global::Reqnroll.Table(new string[] {
                             "EstateName",
                             "MerchantName",
                             "FileProfileId",
                             "UserId"});
-                table63.AddRow(new string[] {
+                table54.AddRow(new string[] {
                             "Test Estate 1",
                             "Test Merchant 1",
                             "B2A59ABF-293D-4A6B-B81B-7007503C3476",
                             "ABA59ABF-293D-4A6B-B81B-7007503C3476"});
-#line 122
- await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table63, "And ");
+#line 120
+ await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table54, "And ");
 #line hidden
             }
             await this.ScenarioCleanupAsync();
@@ -616,18 +610,16 @@ await testRunner.GivenAsync("I have a token to access the estate management and
         [global::NUnit.Framework.TestAttribute()]
         [global::NUnit.Framework.DescriptionAttribute("Process Duplicate Safaricom Topup File with 1 detail row")]
         [global::NUnit.Framework.CategoryAttribute("PRTest")]
-        [global::NUnit.Framework.CategoryAttribute("Nightly")]
         public async global::System.Threading.Tasks.Task ProcessDuplicateSafaricomTopupFileWith1DetailRow()
         {
             string[] tagsOfScenario = new string[] {
-                    "PRTest",
-                    "Nightly"};
+                    "PRTest"};
             global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary();
             string pickleIndex = "3";
             global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Process Duplicate Safaricom Topup File with 1 detail row", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex);
             string[] tagsOfRule = ((string[])(null));
             global::Reqnroll.RuleInfo ruleInfo = null;
-#line 130
+#line 127
 this.ScenarioInitialize(scenarioInfo, ruleInfo);
 #line hidden
             if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags)))
@@ -640,78 +632,78 @@ await testRunner.GivenAsync("I have a token to access the estate management and
 #line 4
 await this.FeatureBackgroundAsync();
 #line hidden
-                global::Reqnroll.Table table64 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table55 = new global::Reqnroll.Table(new string[] {
                             "Column1",
                             "Column2",
                             "Column3"});
-                table64.AddRow(new string[] {
+                table55.AddRow(new string[] {
                             "H",
                             "20210508",
                             ""});
-                table64.AddRow(new string[] {
+                table55.AddRow(new string[] {
                             "D",
                             "07777777775",
                             "100"});
-                table64.AddRow(new string[] {
+                table55.AddRow(new string[] {
                             "D",
                             "07777777776",
                             "200"});
-                table64.AddRow(new string[] {
+                table55.AddRow(new string[] {
                             "T",
                             "1",
                             ""});
-#line 131
- await testRunner.GivenAsync("I have a file named \'SafarcomTopup1.txt\' with the following contents", ((string)(null)), table64, "Given ");
+#line 128
+ await testRunner.GivenAsync("I have a file named \'SafarcomTopup1.txt\' with the following contents", ((string)(null)), table55, "Given ");
 #line hidden
-                global::Reqnroll.Table table65 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table56 = new global::Reqnroll.Table(new string[] {
                             "EstateName",
                             "MerchantName",
                             "FileProfileId",
                             "UserId"});
-                table65.AddRow(new string[] {
+                table56.AddRow(new string[] {
                             "Test Estate 1",
                             "Test Merchant 1",
                             "B2A59ABF-293D-4A6B-B81B-7007503C3476",
                             "ABA59ABF-293D-4A6B-B81B-7007503C3476"});
-#line 137
- await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table65, "And ");
+#line 134
+ await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table56, "And ");
 #line hidden
-                global::Reqnroll.Table table66 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table57 = new global::Reqnroll.Table(new string[] {
                             "Column1",
                             "Column2",
                             "Column3"});
-                table66.AddRow(new string[] {
+                table57.AddRow(new string[] {
                             "H",
                             "20210508",
                             ""});
-                table66.AddRow(new string[] {
+                table57.AddRow(new string[] {
                             "D",
                             "07777777775",
                             "100"});
-                table66.AddRow(new string[] {
+                table57.AddRow(new string[] {
                             "D",
                             "07777777776",
                             "200"});
-                table66.AddRow(new string[] {
+                table57.AddRow(new string[] {
                             "T",
                             "1",
                             ""});
-#line 143
- await testRunner.GivenAsync("I have a file named \'SafarcomTopup2.txt\' with the following contents", ((string)(null)), table66, "Given ");
+#line 140
+ await testRunner.GivenAsync("I have a file named \'SafarcomTopup2.txt\' with the following contents", ((string)(null)), table57, "Given ");
 #line hidden
-                global::Reqnroll.Table table67 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table58 = new global::Reqnroll.Table(new string[] {
                             "EstateName",
                             "MerchantName",
                             "FileProfileId",
                             "UserId"});
-                table67.AddRow(new string[] {
+                table58.AddRow(new string[] {
                             "Test Estate 1",
                             "Test Merchant 1",
                             "B2A59ABF-293D-4A6B-B81B-7007503C3476",
                             "ABA59ABF-293D-4A6B-B81B-7007503C3476"});
-#line 149
+#line 146
  await testRunner.AndAsync("I upload this file for processing an error should be returned indicating the file" +
-                        " is a duplicate", ((string)(null)), table67, "And ");
+                        " is a duplicate", ((string)(null)), table58, "And ");
 #line hidden
             }
             await this.ScenarioCleanupAsync();
@@ -719,17 +711,15 @@ await testRunner.GivenAsync("I have a token to access the estate management and
         
         [global::NUnit.Framework.TestAttribute()]
         [global::NUnit.Framework.DescriptionAttribute("Process Safaricom Topup File with Upload Date Time")]
-        [global::NUnit.Framework.CategoryAttribute("Nightly")]
         public async global::System.Threading.Tasks.Task ProcessSafaricomTopupFileWithUploadDateTime()
         {
-            string[] tagsOfScenario = new string[] {
-                    "Nightly"};
+            string[] tagsOfScenario = ((string[])(null));
             global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary();
             string pickleIndex = "4";
             global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Process Safaricom Topup File with Upload Date Time", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex);
             string[] tagsOfRule = ((string[])(null));
             global::Reqnroll.RuleInfo ruleInfo = null;
-#line 155
+#line 151
 this.ScenarioInitialize(scenarioInfo, ruleInfo);
 #line hidden
             if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags)))
@@ -742,79 +732,79 @@ await testRunner.GivenAsync("I have a token to access the estate management and
 #line 4
 await this.FeatureBackgroundAsync();
 #line hidden
-                global::Reqnroll.Table table68 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table59 = new global::Reqnroll.Table(new string[] {
                             "Column1",
                             "Column2",
                             "Column3"});
-                table68.AddRow(new string[] {
+                table59.AddRow(new string[] {
                             "H",
                             "20210508",
                             ""});
-                table68.AddRow(new string[] {
+                table59.AddRow(new string[] {
                             "D",
                             "07777777775",
                             "100"});
-                table68.AddRow(new string[] {
+                table59.AddRow(new string[] {
                             "T",
                             "1",
                             ""});
-#line 156
- await testRunner.GivenAsync("I have a file named \'SafarcomTopup.txt\' with the following contents", ((string)(null)), table68, "Given ");
+#line 152
+ await testRunner.GivenAsync("I have a file named \'SafarcomTopup.txt\' with the following contents", ((string)(null)), table59, "Given ");
 #line hidden
-                global::Reqnroll.Table table69 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table60 = new global::Reqnroll.Table(new string[] {
                             "EstateName",
                             "MerchantName",
                             "FileProfileId",
                             "UserId",
                             "UploadDateTime"});
-                table69.AddRow(new string[] {
+                table60.AddRow(new string[] {
                             "Test Estate 1",
                             "Test Merchant 1",
                             "B2A59ABF-293D-4A6B-B81B-7007503C3476",
                             "ABA59ABF-293D-4A6B-B81B-7007503C3476",
                             "Today"});
-#line 161
- await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table69, "And ");
+#line 157
+ await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table60, "And ");
 #line hidden
-#line 165
+#line 161
  await testRunner.WhenAsync("I get the import log for estate \'Test Estate 1\' the date on the import log is \'To" +
                         "day\'", ((string)(null)), ((global::Reqnroll.Table)(null)), "When ");
 #line hidden
-                global::Reqnroll.Table table70 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table61 = new global::Reqnroll.Table(new string[] {
                             "Column1",
                             "Column2",
                             "Column3"});
-                table70.AddRow(new string[] {
+                table61.AddRow(new string[] {
                             "H",
                             "20210508",
                             ""});
-                table70.AddRow(new string[] {
+                table61.AddRow(new string[] {
                             "D",
                             "07777777775",
                             "200"});
-                table70.AddRow(new string[] {
+                table61.AddRow(new string[] {
                             "T",
                             "1",
                             ""});
-#line 167
- await testRunner.GivenAsync("I have a file named \'SafarcomTopup1.txt\' with the following contents", ((string)(null)), table70, "Given ");
+#line 163
+ await testRunner.GivenAsync("I have a file named \'SafarcomTopup1.txt\' with the following contents", ((string)(null)), table61, "Given ");
 #line hidden
-                global::Reqnroll.Table table71 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table62 = new global::Reqnroll.Table(new string[] {
                             "EstateName",
                             "MerchantName",
                             "FileProfileId",
                             "UserId",
                             "UploadDateTime"});
-                table71.AddRow(new string[] {
+                table62.AddRow(new string[] {
                             "Test Estate 1",
                             "Test Merchant 1",
                             "B2A59ABF-293D-4A6B-B81B-7007503C3476",
                             "ABA59ABF-293D-4A6B-B81B-7007503C3476",
                             "01/09/2021"});
-#line 172
- await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table71, "And ");
+#line 168
+ await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table62, "And ");
 #line hidden
-#line 176
+#line 172
  await testRunner.WhenAsync("I get the import log for estate \'Test Estate 1\' the date on the import log is \'01" +
                         "/09/2021\'", ((string)(null)), ((global::Reqnroll.Table)(null)), "When ");
 #line hidden
diff --git a/FileProcessor.IntegrationTests/Features/ProcessVoucherCSV.feature b/FileProcessor.IntegrationTests/Features/ProcessVoucherCSV.feature
index 67152bc..fb4dfb4 100644
--- a/FileProcessor.IntegrationTests/Features/ProcessVoucherCSV.feature
+++ b/FileProcessor.IntegrationTests/Features/ProcessVoucherCSV.feature
@@ -76,7 +76,6 @@ Background:
 	| Reference | Amount  | DateTime | MerchantName    | EstateName    |
 	| Deposit1  | 300.00 | Today    | Test Merchant 1 | Test Estate 1 |
 
-@Nightly2	
 Scenario: Process Voucher File with 1 detail row for recipient email
 	Given I have a file named 'VoucherIssue.txt' with the following contents
 	| Column1 | Column2    | Column3                      | Column4 |
@@ -89,7 +88,6 @@ Scenario: Process Voucher File with 1 detail row for recipient email
 
 	#When As merchant "Test Merchant 1" on Estate "Test Estate 1" I get my transactions 1 transaction should be returned
 
-@Nightly2
 Scenario: Process Voucher File with 1 detail row for recipient mobile
 	Given I have a file named 'VoucherIssue.txt' with the following contents
 	| Column1 | Column2    | Column3                      | Column4 |
@@ -102,7 +100,6 @@ Scenario: Process Voucher File with 1 detail row for recipient mobile
 
 	#When As merchant "Test Merchant 1" on Estate "Test Estate 1" I get my transactions 1 transaction should be returned
 
-@Nightly2
 Scenario: Process Voucher File with 2 detail rows
 	Given I have a file named 'VoucherIssue.txt' with the following contents
 	| Column1 | Column2    | Column3                      | Column4 |
@@ -116,7 +113,6 @@ Scenario: Process Voucher File with 2 detail rows
 
 	#When As merchant "Test Merchant 1" on Estate "Test Estate 1" I get my transactions 2 transaction should be returned
 
-@Nightly2
 Scenario: Process 2 Voucher Files
 	Given I have a file named 'VoucherIssue1.txt' with the following contents
 	| Column1 | Column2    | Column3                      | Column4 |
@@ -141,7 +137,6 @@ Scenario: Process 2 Voucher Files
 	#When As merchant "Test Merchant 1" on Estate "Test Estate 1" I get my transactions 4 transaction should be returned
 
 @PRTest
-@Nightly2
 Scenario: Process Duplicate Voucher Topup File with 1 detail row
 	Given I have a file named 'VoucherIssue1.txt' with the following contents
 	| Column1 | Column2    | Column3                      | Column4 |
diff --git a/FileProcessor.IntegrationTests/Features/ProcessVoucherCSV.feature.cs b/FileProcessor.IntegrationTests/Features/ProcessVoucherCSV.feature.cs
index 1ceb2e2..0fe5287 100644
--- a/FileProcessor.IntegrationTests/Features/ProcessVoucherCSV.feature.cs
+++ b/FileProcessor.IntegrationTests/Features/ProcessVoucherCSV.feature.cs
@@ -113,66 +113,66 @@ public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo, globa
         {
 #line 4
 #line hidden
-            global::Reqnroll.Table table72 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table63 = new global::Reqnroll.Table(new string[] {
                         "Name",
                         "DisplayName",
                         "Description"});
-            table72.AddRow(new string[] {
+            table63.AddRow(new string[] {
                         "transactionProcessor",
                         "Transaction Processor REST  Scope",
                         "A scope for Transaction Processor REST"});
-            table72.AddRow(new string[] {
+            table63.AddRow(new string[] {
                         "fileProcessor",
                         "File Processor REST Scope",
                         "A scope for File Processor REST"});
 #line 5
- await testRunner.GivenAsync("I create the following api scopes", ((string)(null)), table72, "Given ");
+ await testRunner.GivenAsync("I create the following api scopes", ((string)(null)), table63, "Given ");
 #line hidden
-            global::Reqnroll.Table table73 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table64 = new global::Reqnroll.Table(new string[] {
                         "Name",
                         "DisplayName",
                         "Secret",
                         "Scopes",
                         "UserClaims"});
-            table73.AddRow(new string[] {
+            table64.AddRow(new string[] {
                         "transactionProcessor",
                         "Transaction Processor REST",
                         "Secret1",
                         "transactionProcessor",
                         "MerchantId, EstateId, role"});
-            table73.AddRow(new string[] {
+            table64.AddRow(new string[] {
                         "fileProcessor",
                         "File Processor REST",
                         "Secret1",
                         "fileProcessor",
                         ""});
 #line 10
- await testRunner.GivenAsync("the following api resources exist", ((string)(null)), table73, "Given ");
+ await testRunner.GivenAsync("the following api resources exist", ((string)(null)), table64, "Given ");
 #line hidden
-            global::Reqnroll.Table table74 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table65 = new global::Reqnroll.Table(new string[] {
                         "ClientId",
                         "ClientName",
                         "Secret",
                         "Scopes",
                         "GrantTypes"});
-            table74.AddRow(new string[] {
+            table65.AddRow(new string[] {
                         "serviceClient",
                         "Service Client",
                         "Secret1",
                         "transactionProcessor,fileProcessor",
                         "client_credentials"});
 #line 15
- await testRunner.GivenAsync("the following clients exist", ((string)(null)), table74, "Given ");
+ await testRunner.GivenAsync("the following clients exist", ((string)(null)), table65, "Given ");
 #line hidden
-            global::Reqnroll.Table table75 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table66 = new global::Reqnroll.Table(new string[] {
                         "ClientId"});
-            table75.AddRow(new string[] {
+            table66.AddRow(new string[] {
                         "serviceClient"});
 #line 19
  await testRunner.GivenAsync("I have a token to access the estate management and transaction processor resource" +
-                    "s", ((string)(null)), table75, "Given ");
+                    "s", ((string)(null)), table66, "Given ");
 #line hidden
-            global::Reqnroll.Table table76 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table67 = new global::Reqnroll.Table(new string[] {
                         "Alias",
                         "FileProfileId",
                         "Name",
@@ -181,7 +181,7 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "OperatorName",
                         "LineTerminator",
                         "FileFormatHandler"});
-            table76.AddRow(new string[] {
+            table67.AddRow(new string[] {
                         "Safaricom Topup",
                         "B2A59ABF-293D-4A6B-B81B-7007503C3476",
                         "Safaricom Topup",
@@ -190,7 +190,7 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "Safaricom",
                         "\n",
                         "SafaricomFileFormatHandler"});
-            table76.AddRow(new string[] {
+            table67.AddRow(new string[] {
                         "Voucher Issue",
                         "8806EDBC-3ED6-406B-9E5F-A9078356BE99",
                         "Voucher Issue",
@@ -200,61 +200,61 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "\n",
                         "VoucherFileFormatHandler"});
 #line 23
- await testRunner.WhenAsync("I create the following file profiles", ((string)(null)), table76, "When ");
+ await testRunner.WhenAsync("I create the following file profiles", ((string)(null)), table67, "When ");
 #line hidden
-            global::Reqnroll.Table table77 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table68 = new global::Reqnroll.Table(new string[] {
                         "EstateName"});
-            table77.AddRow(new string[] {
+            table68.AddRow(new string[] {
                         "Test Estate 1"});
 #line 28
- await testRunner.GivenAsync("I have created the following estates", ((string)(null)), table77, "Given ");
+ await testRunner.GivenAsync("I have created the following estates", ((string)(null)), table68, "Given ");
 #line hidden
-            global::Reqnroll.Table table78 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table69 = new global::Reqnroll.Table(new string[] {
                         "EstateName",
                         "OperatorName",
                         "RequireCustomMerchantNumber",
                         "RequireCustomTerminalNumber"});
-            table78.AddRow(new string[] {
+            table69.AddRow(new string[] {
                         "Test Estate 1",
                         "Safaricom",
                         "True",
                         "True"});
-            table78.AddRow(new string[] {
+            table69.AddRow(new string[] {
                         "Test Estate 1",
                         "Voucher",
                         "True",
                         "True"});
 #line 32
- await testRunner.GivenAsync("I have created the following operators", ((string)(null)), table78, "Given ");
+ await testRunner.GivenAsync("I have created the following operators", ((string)(null)), table69, "Given ");
 #line hidden
-            global::Reqnroll.Table table79 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table70 = new global::Reqnroll.Table(new string[] {
                         "EstateName",
                         "OperatorName"});
-            table79.AddRow(new string[] {
+            table70.AddRow(new string[] {
                         "Test Estate 1",
                         "Safaricom"});
-            table79.AddRow(new string[] {
+            table70.AddRow(new string[] {
                         "Test Estate 1",
                         "Voucher"});
 #line 37
- await testRunner.AndAsync("I have assigned the following operators to the estates", ((string)(null)), table79, "And ");
+ await testRunner.AndAsync("I have assigned the following operators to the estates", ((string)(null)), table70, "And ");
 #line hidden
-            global::Reqnroll.Table table80 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table71 = new global::Reqnroll.Table(new string[] {
                         "EstateName",
                         "OperatorName",
                         "ContractDescription"});
-            table80.AddRow(new string[] {
+            table71.AddRow(new string[] {
                         "Test Estate 1",
                         "Safaricom",
                         "Safaricom Contract"});
-            table80.AddRow(new string[] {
+            table71.AddRow(new string[] {
                         "Test Estate 1",
                         "Voucher",
                         "Hospital 1 Contract"});
 #line 42
- await testRunner.GivenAsync("I create a contract with the following values", ((string)(null)), table80, "Given ");
+ await testRunner.GivenAsync("I create a contract with the following values", ((string)(null)), table71, "Given ");
 #line hidden
-            global::Reqnroll.Table table81 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table72 = new global::Reqnroll.Table(new string[] {
                         "EstateName",
                         "OperatorName",
                         "ContractDescription",
@@ -262,7 +262,7 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "DisplayText",
                         "Value",
                         "ProductType"});
-            table81.AddRow(new string[] {
+            table72.AddRow(new string[] {
                         "Test Estate 1",
                         "Safaricom",
                         "Safaricom Contract",
@@ -270,7 +270,7 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "Custom",
                         "",
                         "MobileTopup"});
-            table81.AddRow(new string[] {
+            table72.AddRow(new string[] {
                         "Test Estate 1",
                         "Voucher",
                         "Hospital 1 Contract",
@@ -279,9 +279,9 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "",
                         "Voucher"});
 #line 47
- await testRunner.WhenAsync("I create the following Products", ((string)(null)), table81, "When ");
+ await testRunner.WhenAsync("I create the following Products", ((string)(null)), table72, "When ");
 #line hidden
-            global::Reqnroll.Table table82 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table73 = new global::Reqnroll.Table(new string[] {
                         "EstateName",
                         "OperatorName",
                         "ContractDescription",
@@ -289,7 +289,7 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "CalculationType",
                         "FeeDescription",
                         "Value"});
-            table82.AddRow(new string[] {
+            table73.AddRow(new string[] {
                         "Test Estate 1",
                         "Safaricom",
                         "Safaricom Contract",
@@ -297,7 +297,7 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "Fixed",
                         "Merchant Commission",
                         "2.50"});
-            table82.AddRow(new string[] {
+            table73.AddRow(new string[] {
                         "Test Estate 1",
                         "Voucher",
                         "Hospital 1 Contract",
@@ -306,9 +306,9 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "Merchant Commission",
                         "2.50"});
 #line 52
- await testRunner.WhenAsync("I add the following Transaction Fees", ((string)(null)), table82, "When ");
+ await testRunner.WhenAsync("I add the following Transaction Fees", ((string)(null)), table73, "When ");
 #line hidden
-            global::Reqnroll.Table table83 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table74 = new global::Reqnroll.Table(new string[] {
                         "MerchantName",
                         "AddressLine1",
                         "Town",
@@ -318,7 +318,7 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "ContactName",
                         "EmailAddress",
                         "EstateName"});
-            table83.AddRow(new string[] {
+            table74.AddRow(new string[] {
                         "Test Merchant 1",
                         "Address Line 1",
                         "TestTown",
@@ -329,69 +329,69 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "testcontact1@merchant1.co.uk",
                         "Test Estate 1"});
 #line 57
- await testRunner.GivenAsync("I create the following merchants", ((string)(null)), table83, "Given ");
+ await testRunner.GivenAsync("I create the following merchants", ((string)(null)), table74, "Given ");
 #line hidden
-            global::Reqnroll.Table table84 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table75 = new global::Reqnroll.Table(new string[] {
                         "OperatorName",
                         "MerchantName",
                         "MerchantNumber",
                         "TerminalNumber",
                         "EstateName"});
-            table84.AddRow(new string[] {
+            table75.AddRow(new string[] {
                         "Safaricom",
                         "Test Merchant 1",
                         "00000001",
                         "10000001",
                         "Test Estate 1"});
-            table84.AddRow(new string[] {
+            table75.AddRow(new string[] {
                         "Voucher",
                         "Test Merchant 1",
                         "00000001",
                         "10000001",
                         "Test Estate 1"});
 #line 61
- await testRunner.GivenAsync("I have assigned the following  operator to the merchants", ((string)(null)), table84, "Given ");
+ await testRunner.GivenAsync("I have assigned the following  operator to the merchants", ((string)(null)), table75, "Given ");
 #line hidden
-            global::Reqnroll.Table table85 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table76 = new global::Reqnroll.Table(new string[] {
                         "DeviceIdentifier",
                         "MerchantName",
                         "EstateName"});
-            table85.AddRow(new string[] {
+            table76.AddRow(new string[] {
                         "123456780",
                         "Test Merchant 1",
                         "Test Estate 1"});
 #line 66
- await testRunner.GivenAsync("I have assigned the following devices to the merchants", ((string)(null)), table85, "Given ");
+ await testRunner.GivenAsync("I have assigned the following devices to the merchants", ((string)(null)), table76, "Given ");
 #line hidden
-            global::Reqnroll.Table table86 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table77 = new global::Reqnroll.Table(new string[] {
                         "EstateName",
                         "MerchantName",
                         "ContractDescription"});
-            table86.AddRow(new string[] {
+            table77.AddRow(new string[] {
                         "Test Estate 1",
                         "Test Merchant 1",
                         "Safaricom Contract"});
-            table86.AddRow(new string[] {
+            table77.AddRow(new string[] {
                         "Test Estate 1",
                         "Test Merchant 1",
                         "Hospital 1 Contract"});
 #line 70
- await testRunner.WhenAsync("I add the following contracts to the following merchants", ((string)(null)), table86, "When ");
+ await testRunner.WhenAsync("I add the following contracts to the following merchants", ((string)(null)), table77, "When ");
 #line hidden
-            global::Reqnroll.Table table87 = new global::Reqnroll.Table(new string[] {
+            global::Reqnroll.Table table78 = new global::Reqnroll.Table(new string[] {
                         "Reference",
                         "Amount",
                         "DateTime",
                         "MerchantName",
                         "EstateName"});
-            table87.AddRow(new string[] {
+            table78.AddRow(new string[] {
                         "Deposit1",
                         "300.00",
                         "Today",
                         "Test Merchant 1",
                         "Test Estate 1"});
 #line 75
- await testRunner.GivenAsync("I make the following manual merchant deposits", ((string)(null)), table87, "Given ");
+ await testRunner.GivenAsync("I make the following manual merchant deposits", ((string)(null)), table78, "Given ");
 #line hidden
         }
         
@@ -402,17 +402,15 @@ await testRunner.GivenAsync("I have a token to access the estate management and
         
         [global::NUnit.Framework.TestAttribute()]
         [global::NUnit.Framework.DescriptionAttribute("Process Voucher File with 1 detail row for recipient email")]
-        [global::NUnit.Framework.CategoryAttribute("Nightly2")]
         public async global::System.Threading.Tasks.Task ProcessVoucherFileWith1DetailRowForRecipientEmail()
         {
-            string[] tagsOfScenario = new string[] {
-                    "Nightly2"};
+            string[] tagsOfScenario = ((string[])(null));
             global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary();
             string pickleIndex = "0";
             global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Process Voucher File with 1 detail row for recipient email", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex);
             string[] tagsOfRule = ((string[])(null));
             global::Reqnroll.RuleInfo ruleInfo = null;
-#line 80
+#line 79
 this.ScenarioInitialize(scenarioInfo, ruleInfo);
 #line hidden
             if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags)))
@@ -425,41 +423,41 @@ await testRunner.GivenAsync("I have a token to access the estate management and
 #line 4
 await this.FeatureBackgroundAsync();
 #line hidden
-                global::Reqnroll.Table table88 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table79 = new global::Reqnroll.Table(new string[] {
                             "Column1",
                             "Column2",
                             "Column3",
                             "Column4"});
-                table88.AddRow(new string[] {
+                table79.AddRow(new string[] {
                             "H",
                             "20210508",
                             "",
                             ""});
-                table88.AddRow(new string[] {
+                table79.AddRow(new string[] {
                             "D",
                             "Hospital 1",
                             "testrecipient1@recipient.com",
                             "10"});
-                table88.AddRow(new string[] {
+                table79.AddRow(new string[] {
                             "T",
                             "1",
                             "",
                             ""});
-#line 81
- await testRunner.GivenAsync("I have a file named \'VoucherIssue.txt\' with the following contents", ((string)(null)), table88, "Given ");
+#line 80
+ await testRunner.GivenAsync("I have a file named \'VoucherIssue.txt\' with the following contents", ((string)(null)), table79, "Given ");
 #line hidden
-                global::Reqnroll.Table table89 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table80 = new global::Reqnroll.Table(new string[] {
                             "EstateName",
                             "MerchantName",
                             "FileProfileId",
                             "UserId"});
-                table89.AddRow(new string[] {
+                table80.AddRow(new string[] {
                             "Test Estate 1",
                             "Test Merchant 1",
                             "8806EDBC-3ED6-406B-9E5F-A9078356BE99",
                             "ABA59ABF-293D-4A6B-B81B-7007503C3476"});
-#line 86
- await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table89, "And ");
+#line 85
+ await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table80, "And ");
 #line hidden
             }
             await this.ScenarioCleanupAsync();
@@ -467,17 +465,15 @@ await testRunner.GivenAsync("I have a token to access the estate management and
         
         [global::NUnit.Framework.TestAttribute()]
         [global::NUnit.Framework.DescriptionAttribute("Process Voucher File with 1 detail row for recipient mobile")]
-        [global::NUnit.Framework.CategoryAttribute("Nightly2")]
         public async global::System.Threading.Tasks.Task ProcessVoucherFileWith1DetailRowForRecipientMobile()
         {
-            string[] tagsOfScenario = new string[] {
-                    "Nightly2"};
+            string[] tagsOfScenario = ((string[])(null));
             global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary();
             string pickleIndex = "1";
             global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Process Voucher File with 1 detail row for recipient mobile", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex);
             string[] tagsOfRule = ((string[])(null));
             global::Reqnroll.RuleInfo ruleInfo = null;
-#line 93
+#line 91
 this.ScenarioInitialize(scenarioInfo, ruleInfo);
 #line hidden
             if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags)))
@@ -490,41 +486,41 @@ await testRunner.GivenAsync("I have a token to access the estate management and
 #line 4
 await this.FeatureBackgroundAsync();
 #line hidden
-                global::Reqnroll.Table table90 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table81 = new global::Reqnroll.Table(new string[] {
                             "Column1",
                             "Column2",
                             "Column3",
                             "Column4"});
-                table90.AddRow(new string[] {
+                table81.AddRow(new string[] {
                             "H",
                             "20210508",
                             "",
                             ""});
-                table90.AddRow(new string[] {
+                table81.AddRow(new string[] {
                             "D",
                             "Hospital 1",
                             "07777777775",
                             "10"});
-                table90.AddRow(new string[] {
+                table81.AddRow(new string[] {
                             "T",
                             "1",
                             "",
                             ""});
-#line 94
- await testRunner.GivenAsync("I have a file named \'VoucherIssue.txt\' with the following contents", ((string)(null)), table90, "Given ");
+#line 92
+ await testRunner.GivenAsync("I have a file named \'VoucherIssue.txt\' with the following contents", ((string)(null)), table81, "Given ");
 #line hidden
-                global::Reqnroll.Table table91 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table82 = new global::Reqnroll.Table(new string[] {
                             "EstateName",
                             "MerchantName",
                             "FileProfileId",
                             "UserId"});
-                table91.AddRow(new string[] {
+                table82.AddRow(new string[] {
                             "Test Estate 1",
                             "Test Merchant 1",
                             "8806EDBC-3ED6-406B-9E5F-A9078356BE99",
                             "ABA59ABF-293D-4A6B-B81B-7007503C3476"});
-#line 99
- await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table91, "And ");
+#line 97
+ await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table82, "And ");
 #line hidden
             }
             await this.ScenarioCleanupAsync();
@@ -532,17 +528,15 @@ await testRunner.GivenAsync("I have a token to access the estate management and
         
         [global::NUnit.Framework.TestAttribute()]
         [global::NUnit.Framework.DescriptionAttribute("Process Voucher File with 2 detail rows")]
-        [global::NUnit.Framework.CategoryAttribute("Nightly2")]
         public async global::System.Threading.Tasks.Task ProcessVoucherFileWith2DetailRows()
         {
-            string[] tagsOfScenario = new string[] {
-                    "Nightly2"};
+            string[] tagsOfScenario = ((string[])(null));
             global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary();
             string pickleIndex = "2";
             global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Process Voucher File with 2 detail rows", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex);
             string[] tagsOfRule = ((string[])(null));
             global::Reqnroll.RuleInfo ruleInfo = null;
-#line 106
+#line 103
 this.ScenarioInitialize(scenarioInfo, ruleInfo);
 #line hidden
             if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags)))
@@ -555,46 +549,46 @@ await testRunner.GivenAsync("I have a token to access the estate management and
 #line 4
 await this.FeatureBackgroundAsync();
 #line hidden
-                global::Reqnroll.Table table92 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table83 = new global::Reqnroll.Table(new string[] {
                             "Column1",
                             "Column2",
                             "Column3",
                             "Column4"});
-                table92.AddRow(new string[] {
+                table83.AddRow(new string[] {
                             "H",
                             "20210508",
                             "",
                             ""});
-                table92.AddRow(new string[] {
+                table83.AddRow(new string[] {
                             "D",
                             "Hospital 1",
                             "07777777775",
                             "10"});
-                table92.AddRow(new string[] {
+                table83.AddRow(new string[] {
                             "D",
                             "Hospital 1",
                             "testrecipient1@recipient.com",
                             "10"});
-                table92.AddRow(new string[] {
+                table83.AddRow(new string[] {
                             "T",
                             "1",
                             "",
                             ""});
-#line 107
- await testRunner.GivenAsync("I have a file named \'VoucherIssue.txt\' with the following contents", ((string)(null)), table92, "Given ");
+#line 104
+ await testRunner.GivenAsync("I have a file named \'VoucherIssue.txt\' with the following contents", ((string)(null)), table83, "Given ");
 #line hidden
-                global::Reqnroll.Table table93 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table84 = new global::Reqnroll.Table(new string[] {
                             "EstateName",
                             "MerchantName",
                             "FileProfileId",
                             "UserId"});
-                table93.AddRow(new string[] {
+                table84.AddRow(new string[] {
                             "Test Estate 1",
                             "Test Merchant 1",
                             "8806EDBC-3ED6-406B-9E5F-A9078356BE99",
                             "ABA59ABF-293D-4A6B-B81B-7007503C3476"});
-#line 113
- await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table93, "And ");
+#line 110
+ await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table84, "And ");
 #line hidden
             }
             await this.ScenarioCleanupAsync();
@@ -602,17 +596,15 @@ await testRunner.GivenAsync("I have a token to access the estate management and
         
         [global::NUnit.Framework.TestAttribute()]
         [global::NUnit.Framework.DescriptionAttribute("Process 2 Voucher Files")]
-        [global::NUnit.Framework.CategoryAttribute("Nightly2")]
         public async global::System.Threading.Tasks.Task Process2VoucherFiles()
         {
-            string[] tagsOfScenario = new string[] {
-                    "Nightly2"};
+            string[] tagsOfScenario = ((string[])(null));
             global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary();
             string pickleIndex = "3";
             global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Process 2 Voucher Files", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex);
             string[] tagsOfRule = ((string[])(null));
             global::Reqnroll.RuleInfo ruleInfo = null;
-#line 120
+#line 116
 this.ScenarioInitialize(scenarioInfo, ruleInfo);
 #line hidden
             if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags)))
@@ -625,87 +617,87 @@ await testRunner.GivenAsync("I have a token to access the estate management and
 #line 4
 await this.FeatureBackgroundAsync();
 #line hidden
-                global::Reqnroll.Table table94 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table85 = new global::Reqnroll.Table(new string[] {
                             "Column1",
                             "Column2",
                             "Column3",
                             "Column4"});
-                table94.AddRow(new string[] {
+                table85.AddRow(new string[] {
                             "H",
                             "20210508",
                             "",
                             ""});
-                table94.AddRow(new string[] {
+                table85.AddRow(new string[] {
                             "D",
                             "Hospital 1",
                             "07777777775",
                             "10"});
-                table94.AddRow(new string[] {
+                table85.AddRow(new string[] {
                             "D",
                             "Hospital 1",
                             "testrecipient1@recipient.com",
                             "10"});
-                table94.AddRow(new string[] {
+                table85.AddRow(new string[] {
                             "T",
                             "1",
                             "",
                             ""});
-#line 121
- await testRunner.GivenAsync("I have a file named \'VoucherIssue1.txt\' with the following contents", ((string)(null)), table94, "Given ");
+#line 117
+ await testRunner.GivenAsync("I have a file named \'VoucherIssue1.txt\' with the following contents", ((string)(null)), table85, "Given ");
 #line hidden
-                global::Reqnroll.Table table95 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table86 = new global::Reqnroll.Table(new string[] {
                             "EstateName",
                             "MerchantName",
                             "FileProfileId",
                             "UserId"});
-                table95.AddRow(new string[] {
+                table86.AddRow(new string[] {
                             "Test Estate 1",
                             "Test Merchant 1",
                             "8806EDBC-3ED6-406B-9E5F-A9078356BE99",
                             "ABA59ABF-293D-4A6B-B81B-7007503C3476"});
-#line 127
- await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table95, "And ");
+#line 123
+ await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table86, "And ");
 #line hidden
-                global::Reqnroll.Table table96 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table87 = new global::Reqnroll.Table(new string[] {
                             "Column1",
                             "Column2",
                             "Column3",
                             "Column4"});
-                table96.AddRow(new string[] {
+                table87.AddRow(new string[] {
                             "H",
                             "20210508",
                             "",
                             ""});
-                table96.AddRow(new string[] {
+                table87.AddRow(new string[] {
                             "D",
                             "Hospital 1",
                             "07777777775",
                             "20"});
-                table96.AddRow(new string[] {
+                table87.AddRow(new string[] {
                             "D",
                             "Hospital 1",
                             "testrecipient1@recipient.com",
                             "20"});
-                table96.AddRow(new string[] {
+                table87.AddRow(new string[] {
                             "T",
                             "1",
                             "",
                             ""});
-#line 131
- await testRunner.GivenAsync("I have a file named \'VoucherIssue2.txt\' with the following contents", ((string)(null)), table96, "Given ");
+#line 127
+ await testRunner.GivenAsync("I have a file named \'VoucherIssue2.txt\' with the following contents", ((string)(null)), table87, "Given ");
 #line hidden
-                global::Reqnroll.Table table97 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table88 = new global::Reqnroll.Table(new string[] {
                             "EstateName",
                             "MerchantName",
                             "FileProfileId",
                             "UserId"});
-                table97.AddRow(new string[] {
+                table88.AddRow(new string[] {
                             "Test Estate 1",
                             "Test Merchant 1",
                             "8806EDBC-3ED6-406B-9E5F-A9078356BE99",
                             "ABA59ABF-293D-4A6B-B81B-7007503C3476"});
-#line 137
- await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table97, "And ");
+#line 133
+ await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table88, "And ");
 #line hidden
             }
             await this.ScenarioCleanupAsync();
@@ -714,18 +706,16 @@ await testRunner.GivenAsync("I have a token to access the estate management and
         [global::NUnit.Framework.TestAttribute()]
         [global::NUnit.Framework.DescriptionAttribute("Process Duplicate Voucher Topup File with 1 detail row")]
         [global::NUnit.Framework.CategoryAttribute("PRTest")]
-        [global::NUnit.Framework.CategoryAttribute("Nightly2")]
         public async global::System.Threading.Tasks.Task ProcessDuplicateVoucherTopupFileWith1DetailRow()
         {
             string[] tagsOfScenario = new string[] {
-                    "PRTest",
-                    "Nightly2"};
+                    "PRTest"};
             global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary();
             string pickleIndex = "4";
             global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Process Duplicate Voucher Topup File with 1 detail row", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex);
             string[] tagsOfRule = ((string[])(null));
             global::Reqnroll.RuleInfo ruleInfo = null;
-#line 145
+#line 140
 this.ScenarioInitialize(scenarioInfo, ruleInfo);
 #line hidden
             if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags)))
@@ -738,88 +728,88 @@ await testRunner.GivenAsync("I have a token to access the estate management and
 #line 4
 await this.FeatureBackgroundAsync();
 #line hidden
-                global::Reqnroll.Table table98 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table89 = new global::Reqnroll.Table(new string[] {
                             "Column1",
                             "Column2",
                             "Column3",
                             "Column4"});
-                table98.AddRow(new string[] {
+                table89.AddRow(new string[] {
                             "H",
                             "20210508",
                             "",
                             ""});
-                table98.AddRow(new string[] {
+                table89.AddRow(new string[] {
                             "D",
                             "Hospital 1",
                             "07777777775",
                             "10"});
-                table98.AddRow(new string[] {
+                table89.AddRow(new string[] {
                             "D",
                             "Hospital 1",
                             "testrecipient1@recipient.com",
                             "20"});
-                table98.AddRow(new string[] {
+                table89.AddRow(new string[] {
                             "T",
                             "1",
                             "",
                             ""});
-#line 146
- await testRunner.GivenAsync("I have a file named \'VoucherIssue1.txt\' with the following contents", ((string)(null)), table98, "Given ");
+#line 141
+ await testRunner.GivenAsync("I have a file named \'VoucherIssue1.txt\' with the following contents", ((string)(null)), table89, "Given ");
 #line hidden
-                global::Reqnroll.Table table99 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table90 = new global::Reqnroll.Table(new string[] {
                             "EstateName",
                             "MerchantName",
                             "FileProfileId",
                             "UserId"});
-                table99.AddRow(new string[] {
+                table90.AddRow(new string[] {
                             "Test Estate 1",
                             "Test Merchant 1",
                             "8806EDBC-3ED6-406B-9E5F-A9078356BE99",
                             "ABA59ABF-293D-4A6B-B81B-7007503C3476"});
-#line 152
- await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table99, "And ");
+#line 147
+ await testRunner.AndAsync("I upload this file for processing", ((string)(null)), table90, "And ");
 #line hidden
-                global::Reqnroll.Table table100 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table91 = new global::Reqnroll.Table(new string[] {
                             "Column1",
                             "Column2",
                             "Column3",
                             "Column4"});
-                table100.AddRow(new string[] {
+                table91.AddRow(new string[] {
                             "H",
                             "20210508",
                             "",
                             ""});
-                table100.AddRow(new string[] {
+                table91.AddRow(new string[] {
                             "D",
                             "Hospital 1",
                             "07777777775",
                             "10"});
-                table100.AddRow(new string[] {
+                table91.AddRow(new string[] {
                             "D",
                             "Hospital 1",
                             "testrecipient1@recipient.com",
                             "20"});
-                table100.AddRow(new string[] {
+                table91.AddRow(new string[] {
                             "T",
                             "1",
                             "",
                             ""});
-#line 158
- await testRunner.GivenAsync("I have a file named \'VoucherIssue2.txt\' with the following contents", ((string)(null)), table100, "Given ");
+#line 153
+ await testRunner.GivenAsync("I have a file named \'VoucherIssue2.txt\' with the following contents", ((string)(null)), table91, "Given ");
 #line hidden
-                global::Reqnroll.Table table101 = new global::Reqnroll.Table(new string[] {
+                global::Reqnroll.Table table92 = new global::Reqnroll.Table(new string[] {
                             "EstateName",
                             "MerchantName",
                             "FileProfileId",
                             "UserId"});
-                table101.AddRow(new string[] {
+                table92.AddRow(new string[] {
                             "Test Estate 1",
                             "Test Merchant 1",
                             "8806EDBC-3ED6-406B-9E5F-A9078356BE99",
                             "ABA59ABF-293D-4A6B-B81B-7007503C3476"});
-#line 165
+#line 160
  await testRunner.AndAsync("I upload this file for processing an error should be returned indicating the file" +
-                        " is a duplicate", ((string)(null)), table101, "And ");
+                        " is a duplicate", ((string)(null)), table92, "And ");
 #line hidden
             }
             await this.ScenarioCleanupAsync();