diff --git a/rs-e2e/src/main/java/gov/hhs/cdc/trustedintermediary/rse2e/external/azure/AzureBlobFileFetcher.java b/rs-e2e/src/main/java/gov/hhs/cdc/trustedintermediary/rse2e/external/azure/AzureBlobFileFetcher.java
index 5fcc744db..7f386ee4b 100644
--- a/rs-e2e/src/main/java/gov/hhs/cdc/trustedintermediary/rse2e/external/azure/AzureBlobFileFetcher.java
+++ b/rs-e2e/src/main/java/gov/hhs/cdc/trustedintermediary/rse2e/external/azure/AzureBlobFileFetcher.java
@@ -55,7 +55,7 @@ public List<HL7FileStream> fetchFiles() {
         String rse2ELocalInputFilePath = System.getenv("RSE2E_LOCAL_INPUT_FILE_PATH");
         if (rse2ELocalInputFilePath == null || rse2ELocalInputFilePath.isEmpty()) {
             throw new IllegalArgumentException(
-                    "Environment variable RSE2E_LOCAL_INPUT_FILE_PATH is not set");
+                    "Environment variable RSE2E_LOCAL_INPUT_FILE_PATH is not set in azure file fetcher.");
         }
 
         List<HL7FileStream> relevantFiles = new ArrayList<>();
@@ -64,9 +64,9 @@ public List<HL7FileStream> fetchFiles() {
         String datePrefix = AzureBlobHelper.buildDatePathPrefix(today);
 
         // TODO - update base on AzureBlobOrganizer
-        String pathPrefix = datePrefix + "Automated/";
+        String pathPrefix = datePrefix + "/Automated/";
         if (rse2ELocalInputFilePath.contains("GoldenCopy")) {
-            pathPrefix += datePrefix + "GoldenCopy/";
+            pathPrefix += datePrefix + "/GoldenCopy/";
         }
 
         ListBlobsOptions options = new ListBlobsOptions().setPrefix(pathPrefix);
diff --git a/rs-e2e/src/main/java/gov/hhs/cdc/trustedintermediary/rse2e/external/localfile/LocalFileFetcher.java b/rs-e2e/src/main/java/gov/hhs/cdc/trustedintermediary/rse2e/external/localfile/LocalFileFetcher.java
index ef9c9767d..aa36f4301 100644
--- a/rs-e2e/src/main/java/gov/hhs/cdc/trustedintermediary/rse2e/external/localfile/LocalFileFetcher.java
+++ b/rs-e2e/src/main/java/gov/hhs/cdc/trustedintermediary/rse2e/external/localfile/LocalFileFetcher.java
@@ -30,7 +30,7 @@ public List<HL7FileStream> fetchFiles() {
         String rse2ELocalInputFilePath = System.getenv("RSE2E_LOCAL_INPUT_FILE_PATH");
         if (rse2ELocalInputFilePath == null || rse2ELocalInputFilePath.isEmpty()) {
             throw new IllegalArgumentException(
-                    "Environment variable RSE2E_LOCAL_INPUT_FILE_PATH is not set");
+                    "Environment variable RSE2E_LOCAL_INPUT_FILE_PATH is not set in local file fetcher.");
         }
         try (Stream<Path> stream = Files.walk(Paths.get(rse2ELocalInputFilePath))) {
             return stream.filter(Files::isRegularFile)