diff --git a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureEvaluatedResourcesTest.java b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureEvaluatedResourcesTest.java
index c67d17532..f338b4c8b 100644
--- a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureEvaluatedResourcesTest.java
+++ b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureEvaluatedResourcesTest.java
@@ -26,7 +26,7 @@ public class MeasureEvaluatedResourcesTest {
     private static final Repository repository = new IgRepository(
             FhirContext.forR4Cached(),
             Paths.get(getResourcePath(MeasureEvaluatedResourcesTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
-    protected Given given = Measure.given().repository(repository);
+    private final Given given = Measure.given().repository(repository);
     private static final TestDataGenerator testDataGenerator = new TestDataGenerator(repository);
 
     @BeforeAll
diff --git a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureImprovementNotationTest.java b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureImprovementNotationTest.java
index a947b2f54..bb66def46 100644
--- a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureImprovementNotationTest.java
+++ b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureImprovementNotationTest.java
@@ -27,7 +27,7 @@ public class MeasureImprovementNotationTest {
     private static final Repository repository = new IgRepository(
             FhirContext.forR4Cached(),
             Paths.get(getResourcePath(MeasureImprovementNotationTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
-    protected Given given = Measure.given().repository(repository);
+    private final Given given = Measure.given().repository(repository);
     private static final TestDataGenerator testDataGenerator = new TestDataGenerator(repository);
 
     @BeforeAll
diff --git a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureReportTypeIndividualTest.java b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureReportTypeIndividualTest.java
index d8b7ba2f4..09c83d00d 100644
--- a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureReportTypeIndividualTest.java
+++ b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureReportTypeIndividualTest.java
@@ -28,7 +28,7 @@ public class MeasureReportTypeIndividualTest {
     private static final Repository repository = new IgRepository(
             FhirContext.forR4Cached(),
             Paths.get(getResourcePath(MeasureReportTypeIndividualTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
-    protected Given given = Measure.given().repository(repository);
+    private final Given given = Measure.given().repository(repository);
     private static final TestDataGenerator testDataGenerator = new TestDataGenerator(repository);
 
     @BeforeAll
diff --git a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureReportTypeInvalidTest.java b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureReportTypeInvalidTest.java
index ce238e19b..a7f115c22 100644
--- a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureReportTypeInvalidTest.java
+++ b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureReportTypeInvalidTest.java
@@ -24,7 +24,7 @@ class MeasureReportTypeInvalidTest {
     private static final Repository repository = new IgRepository(
             FhirContext.forR4Cached(),
             Paths.get(getResourcePath(MeasureReportTypeInvalidTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
-    protected Given given = Measure.given().repository(repository);
+    private final Given given = Measure.given().repository(repository);
     private static final TestDataGenerator testDataGenerator = new TestDataGenerator(repository);
 
     @BeforeAll
diff --git a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureReportTypeSubjectListTest.java b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureReportTypeSubjectListTest.java
index 860ef59ad..32dcf3a27 100644
--- a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureReportTypeSubjectListTest.java
+++ b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureReportTypeSubjectListTest.java
@@ -34,7 +34,7 @@ public class MeasureReportTypeSubjectListTest {
             FhirContext.forR4Cached(),
             Paths.get(
                     getResourcePath(MeasureReportTypeSubjectListTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
-    protected Given given = Measure.given().repository(repository);
+    private final Given given = Measure.given().repository(repository);
     private static final TestDataGenerator testDataGenerator = new TestDataGenerator(repository);
 
     @BeforeAll
diff --git a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureReportTypeSummaryTest.java b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureReportTypeSummaryTest.java
index 3114a2f0a..9f2069db7 100644
--- a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureReportTypeSummaryTest.java
+++ b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureReportTypeSummaryTest.java
@@ -28,7 +28,7 @@ public class MeasureReportTypeSummaryTest {
     private static final Repository repository = new IgRepository(
             FhirContext.forR4Cached(),
             Paths.get(getResourcePath(MeasureReportTypeSummaryTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
-    protected Given given = Measure.given().repository(repository);
+    private final Given given = Measure.given().repository(repository);
     private static final TestDataGenerator testDataGenerator = new TestDataGenerator(repository);
 
     @BeforeAll
diff --git a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureSDETest.java b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureSDETest.java
index 652dca953..326f3ef38 100644
--- a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureSDETest.java
+++ b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureSDETest.java
@@ -21,7 +21,7 @@ public class MeasureSDETest {
     private static final Repository repository = new IgRepository(
             FhirContext.forR4Cached(),
             Paths.get(getResourcePath(MeasureSDETest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
-    protected Given given = Measure.given().repository(repository);
+    private final Given given = Measure.given().repository(repository);
     private static final TestDataGenerator testDataGenerator = new TestDataGenerator(repository);
 
     @BeforeAll
diff --git a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureScoringTypeCohortTest.java b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureScoringTypeCohortTest.java
index e77e7a0ef..5d2290dc5 100644
--- a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureScoringTypeCohortTest.java
+++ b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureScoringTypeCohortTest.java
@@ -30,7 +30,7 @@ public class MeasureScoringTypeCohortTest {
     private static final Repository repository = new IgRepository(
             FhirContext.forR4Cached(),
             Paths.get(getResourcePath(MeasureScoringTypeCohortTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
-    protected Given given = Measure.given().repository(repository);
+    private final Given given = Measure.given().repository(repository);
     private static final TestDataGenerator testDataGenerator = new TestDataGenerator(repository);
 
     @BeforeAll
diff --git a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureScoringTypeCompositeTest.java b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureScoringTypeCompositeTest.java
index 7b08d72dc..cfe097605 100644
--- a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureScoringTypeCompositeTest.java
+++ b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureScoringTypeCompositeTest.java
@@ -30,7 +30,7 @@ public class MeasureScoringTypeCompositeTest {
     private static final Repository repository = new IgRepository(
             FhirContext.forR4Cached(),
             Paths.get(getResourcePath(MeasureScoringTypeCompositeTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
-    protected Given given = Measure.given().repository(repository);
+    private final Given given = Measure.given().repository(repository);
     private static final TestDataGenerator testDataGenerator = new TestDataGenerator(repository);
 
     @BeforeAll
diff --git a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureScoringTypeContinuousVariableTest.java b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureScoringTypeContinuousVariableTest.java
index 5d11a8a6f..e639cfe5d 100644
--- a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureScoringTypeContinuousVariableTest.java
+++ b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureScoringTypeContinuousVariableTest.java
@@ -31,7 +31,7 @@ public class MeasureScoringTypeContinuousVariableTest {
             FhirContext.forR4Cached(),
             Paths.get(getResourcePath(MeasureScoringTypeContinuousVariableTest.class) + "/" + CLASS_PATH + "/"
                     + "MeasureTest"));
-    protected Given given = Measure.given().repository(repository);
+    private final Given given = Measure.given().repository(repository);
     private static final TestDataGenerator testDataGenerator = new TestDataGenerator(repository);
 
     @BeforeAll
diff --git a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureScoringTypeProportionTest.java b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureScoringTypeProportionTest.java
index 9d9f4587f..421d7e877 100644
--- a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureScoringTypeProportionTest.java
+++ b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureScoringTypeProportionTest.java
@@ -32,7 +32,7 @@ public class MeasureScoringTypeProportionTest {
             FhirContext.forR4Cached(),
             Paths.get(
                     getResourcePath(MeasureScoringTypeProportionTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
-    protected Given given = Measure.given().repository(repository);
+    private final Given given = Measure.given().repository(repository);
     private static final TestDataGenerator testDataGenerator = new TestDataGenerator(repository);
 
     @BeforeAll
diff --git a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureScoringTypeRatioTest.java b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureScoringTypeRatioTest.java
index a40fc37c1..18b688da0 100644
--- a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureScoringTypeRatioTest.java
+++ b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureScoringTypeRatioTest.java
@@ -30,7 +30,7 @@ public class MeasureScoringTypeRatioTest {
     private static final Repository repository = new IgRepository(
             FhirContext.forR4Cached(),
             Paths.get(getResourcePath(MeasureScoringTypeRatioTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
-    protected Given given = Measure.given().repository(repository);
+    private final Given given = Measure.given().repository(repository);
     private static final TestDataGenerator testDataGenerator = new TestDataGenerator(repository);
 
     @BeforeAll
diff --git a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureStratifierTest.java b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureStratifierTest.java
index 4f10b433b..cf3e76629 100644
--- a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureStratifierTest.java
+++ b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureStratifierTest.java
@@ -26,7 +26,7 @@ class MeasureStratifierTest {
     private static final Repository repository = new IgRepository(
             FhirContext.forR4Cached(),
             Paths.get(getResourcePath(MeasureStratifierTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
-    protected Given given = Measure.given().repository(repository);
+    private final Given given = Measure.given().repository(repository);
     private static final TestDataGenerator testDataGenerator = new TestDataGenerator(repository);
 
     @BeforeAll