diff --git a/src/test/java/org/opencds/cqf/tooling/RefreshTest.java b/src/test/java/org/opencds/cqf/tooling/RefreshTest.java
index 3aedb10ff..68961808e 100644
--- a/src/test/java/org/opencds/cqf/tooling/RefreshTest.java
+++ b/src/test/java/org/opencds/cqf/tooling/RefreshTest.java
@@ -16,6 +16,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
+import java.util.ArrayList;
 
 import com.google.common.base.Strings;
 
diff --git a/src/test/java/org/opencds/cqf/tooling/library/LibraryProcessorTest.java b/src/test/java/org/opencds/cqf/tooling/library/LibraryProcessorTest.java
index a553f46f8..adc585718 100644
--- a/src/test/java/org/opencds/cqf/tooling/library/LibraryProcessorTest.java
+++ b/src/test/java/org/opencds/cqf/tooling/library/LibraryProcessorTest.java
@@ -1,10 +1,7 @@
 package org.opencds.cqf.tooling.library;
 
-import java.util.ArrayList;
-
 import org.opencds.cqf.tooling.RefreshTest;
 import org.opencds.cqf.tooling.parameter.RefreshLibraryParameters;
-import org.opencds.cqf.tooling.utilities.IOUtils;
 import org.opencds.cqf.tooling.utilities.IOUtils.Encoding;
 import org.testng.annotations.BeforeMethod;
 
@@ -16,8 +13,6 @@ public abstract class LibraryProcessorTest extends RefreshTest {
     // When running mvn package there is some collisions between tests running while trying to delete this directory
     @BeforeMethod
     public void setUp() throws Exception {
-        IOUtils.resourceDirectories = new ArrayList<String>();
-        IOUtils.clearDevicePaths();
         // File dir  = new File("target/refreshLibraries");
         // if (dir.exists()) {
         //     FileUtils.deleteDirectory(dir);
diff --git a/src/test/java/org/opencds/cqf/tooling/library/r4/R4LibraryProcessorTest.java b/src/test/java/org/opencds/cqf/tooling/library/r4/R4LibraryProcessorTest.java
index 1b9f94831..a466f63a4 100644
--- a/src/test/java/org/opencds/cqf/tooling/library/r4/R4LibraryProcessorTest.java
+++ b/src/test/java/org/opencds/cqf/tooling/library/r4/R4LibraryProcessorTest.java
@@ -1,9 +1,11 @@
 package org.opencds.cqf.tooling.library.r4;
 
 import java.io.File;
+import java.util.ArrayList;
 
 import org.apache.commons.io.FileUtils;
 import org.opencds.cqf.tooling.library.LibraryProcessorTest;
+import org.opencds.cqf.tooling.utilities.IOUtils;
 import org.opencds.cqf.tooling.RefreshTest;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
@@ -21,6 +23,8 @@ public R4LibraryProcessorTest() {
 
     @BeforeMethod
     public void setUp() throws Exception {
+        IOUtils.resourceDirectories = new ArrayList<String>();
+        IOUtils.clearDevicePaths();
         File dir  = new File("target" + separator + "refreshLibraries" + separator + "r4");
         if (dir.exists()) {
             FileUtils.deleteDirectory(dir);
diff --git a/src/test/java/org/opencds/cqf/tooling/library/stu3/STU3LibraryProcessorTest.java b/src/test/java/org/opencds/cqf/tooling/library/stu3/STU3LibraryProcessorTest.java
index 23ab55d56..fd9991b43 100644
--- a/src/test/java/org/opencds/cqf/tooling/library/stu3/STU3LibraryProcessorTest.java
+++ b/src/test/java/org/opencds/cqf/tooling/library/stu3/STU3LibraryProcessorTest.java
@@ -1,9 +1,11 @@
 package org.opencds.cqf.tooling.library.stu3;
 
 import java.io.File;
+import java.util.ArrayList;
 
 import org.apache.commons.io.FileUtils;
 import org.opencds.cqf.tooling.library.LibraryProcessorTest;
+import org.opencds.cqf.tooling.utilities.IOUtils;
 import org.opencds.cqf.tooling.RefreshTest;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
@@ -22,6 +24,8 @@ public STU3LibraryProcessorTest() {
 
     @BeforeMethod
     public void setUp() throws Exception {
+        IOUtils.resourceDirectories = new ArrayList<String>();
+        IOUtils.clearDevicePaths();
         File dir  = new File("target" + separator + "refreshLibraries" + separator + "stu3");
         if (dir.exists()) {
             FileUtils.deleteDirectory(dir);
diff --git a/src/test/java/org/opencds/cqf/tooling/measure/r4/R4MeasureProcessorTest.java b/src/test/java/org/opencds/cqf/tooling/measure/r4/R4MeasureProcessorTest.java
index 6c2906f91..e0e1eb4cf 100644
--- a/src/test/java/org/opencds/cqf/tooling/measure/r4/R4MeasureProcessorTest.java
+++ b/src/test/java/org/opencds/cqf/tooling/measure/r4/R4MeasureProcessorTest.java
@@ -1,9 +1,11 @@
 package org.opencds.cqf.tooling.measure.r4;
 
 import java.io.File;
+import java.util.ArrayList;
 
 import org.apache.commons.io.FileUtils;
 import org.opencds.cqf.tooling.measure.MeasureProcessorTest;
+import org.opencds.cqf.tooling.utilities.IOUtils;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
@@ -18,6 +20,8 @@ public R4MeasureProcessorTest() {
 
     @BeforeMethod
     public void setUp() throws Exception {
+        IOUtils.resourceDirectories = new ArrayList<String>();
+        IOUtils.clearDevicePaths();
         File dir  = new File("target" + separator + "refreshMeasures" + separator + "r4");
         if (dir.exists()) {
             FileUtils.deleteDirectory(dir);
diff --git a/src/test/java/org/opencds/cqf/tooling/measure/r4/RefreshR4MeasureOperationTest.java b/src/test/java/org/opencds/cqf/tooling/measure/r4/RefreshR4MeasureOperationTest.java
index 9bab34b06..20444679e 100644
--- a/src/test/java/org/opencds/cqf/tooling/measure/r4/RefreshR4MeasureOperationTest.java
+++ b/src/test/java/org/opencds/cqf/tooling/measure/r4/RefreshR4MeasureOperationTest.java
@@ -1,9 +1,11 @@
 package org.opencds.cqf.tooling.measure.r4;
 
 import java.io.File;
+import java.util.ArrayList;
 
 import org.apache.commons.io.FileUtils;
 import org.opencds.cqf.tooling.RefreshTest;
+import org.opencds.cqf.tooling.utilities.IOUtils;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
@@ -21,6 +23,8 @@ public RefreshR4MeasureOperationTest() {
 
     @BeforeMethod
     public void setUp() throws Exception {
+        IOUtils.resourceDirectories = new ArrayList<String>();
+        IOUtils.clearDevicePaths();
         File dir  = new File("target" + separator + "refreshMeasures" + separator + "r4");
         if (dir.exists()) {
             FileUtils.deleteDirectory(dir);
diff --git a/src/test/java/org/opencds/cqf/tooling/measure/stu3/RefreshStu3MeasureOperationTest.java b/src/test/java/org/opencds/cqf/tooling/measure/stu3/RefreshStu3MeasureOperationTest.java
index b74c89e4f..44d8e49c0 100644
--- a/src/test/java/org/opencds/cqf/tooling/measure/stu3/RefreshStu3MeasureOperationTest.java
+++ b/src/test/java/org/opencds/cqf/tooling/measure/stu3/RefreshStu3MeasureOperationTest.java
@@ -1,9 +1,11 @@
 package org.opencds.cqf.tooling.measure.stu3;
 
 import java.io.File;
+import java.util.ArrayList;
 
 import org.apache.commons.io.FileUtils;
 import org.opencds.cqf.tooling.RefreshTest;
+import org.opencds.cqf.tooling.utilities.IOUtils;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
@@ -21,6 +23,8 @@ public RefreshStu3MeasureOperationTest() {
 
     @BeforeMethod
     public void setUp() throws Exception {
+        IOUtils.resourceDirectories = new ArrayList<String>();
+        IOUtils.clearDevicePaths();
         File dir  = new File("target" + separator + "refreshMeasures" + separator + "stu3");
         if (dir.exists()) {
             FileUtils.deleteDirectory(dir);