diff --git a/data/data-pipeline/data_pipeline/etl/sources/child_opportunity_index/etl.py b/data/data-pipeline/data_pipeline/etl/sources/child_opportunity_index/etl.py
index a0df1a5f..d2b7143c 100644
--- a/data/data-pipeline/data_pipeline/etl/sources/child_opportunity_index/etl.py
+++ b/data/data-pipeline/data_pipeline/etl/sources/child_opportunity_index/etl.py
@@ -23,6 +23,7 @@ class ChildOpportunityIndex(ExtractTransformLoad):
     """
 
     # Metadata for the baseclass
+    NAME = "child_opportunity_index"
     GEO_LEVEL = ValidGeoLevel.CENSUS_TRACT
 
     # Define these for easy code completion
diff --git a/data/data-pipeline/data_pipeline/tests/sources/child_opportunity_index/test_etl.py b/data/data-pipeline/data_pipeline/tests/sources/child_opportunity_index/test_etl.py
index 7183f911..6fe2ffd3 100644
--- a/data/data-pipeline/data_pipeline/tests/sources/child_opportunity_index/test_etl.py
+++ b/data/data-pipeline/data_pipeline/tests/sources/child_opportunity_index/test_etl.py
@@ -59,7 +59,7 @@ class TestChildOpportunityIndexETL(TestETL):
 
     def test_get_output_file_path(self, mock_etl, mock_paths):
         """Tests the right file name is returned."""
-        etl = self._ETL_CLASS()
+        etl = self._get_instance_of_etl_class()
         data_path, tmp_path = mock_paths
 
         output_file_path = etl._get_output_file_path()
diff --git a/data/data-pipeline/data_pipeline/tests/sources/doe_energy_burden/test_etl.py b/data/data-pipeline/data_pipeline/tests/sources/doe_energy_burden/test_etl.py
index efa70d57..bb24ba3e 100644
--- a/data/data-pipeline/data_pipeline/tests/sources/doe_energy_burden/test_etl.py
+++ b/data/data-pipeline/data_pipeline/tests/sources/doe_energy_burden/test_etl.py
@@ -51,7 +51,7 @@ class TestDOEEnergyBurdenETL(TestETL):
 
     def test_get_output_file_path(self, mock_etl, mock_paths):
         """Tests the right file name is returned."""
-        etl = self._ETL_CLASS()
+        etl = self._get_instance_of_etl_class()
         data_path, tmp_path = mock_paths
 
         output_file_path = etl._get_output_file_path()
diff --git a/data/data-pipeline/data_pipeline/tests/sources/eamlis/test_etl.py b/data/data-pipeline/data_pipeline/tests/sources/eamlis/test_etl.py
index 2f85b55e..b2a5f44b 100644
--- a/data/data-pipeline/data_pipeline/tests/sources/eamlis/test_etl.py
+++ b/data/data-pipeline/data_pipeline/tests/sources/eamlis/test_etl.py
@@ -65,7 +65,7 @@ class TestAbandondedLandMineETL(TestETL):
         initiliazed correctly.
         """
         # setup
-        etl = self._ETL_CLASS()
+        etl = self._get_instance_of_etl_class()
         # validation
         assert etl.GEOID_FIELD_NAME == "GEOID10"
         assert etl.GEOID_TRACT_FIELD_NAME == "GEOID10_TRACT"
@@ -78,7 +78,7 @@ class TestAbandondedLandMineETL(TestETL):
 
     def test_get_output_file_path(self, mock_etl, mock_paths):
         """Tests the right file name is returned."""
-        etl = self._ETL_CLASS()
+        etl = self._get_instance_of_etl_class()
         data_path, tmp_path = mock_paths
 
         output_file_path = etl._get_output_file_path()
diff --git a/data/data-pipeline/data_pipeline/tests/sources/example/test_etl.py b/data/data-pipeline/data_pipeline/tests/sources/example/test_etl.py
index 33f58d7a..72b1c4c0 100644
--- a/data/data-pipeline/data_pipeline/tests/sources/example/test_etl.py
+++ b/data/data-pipeline/data_pipeline/tests/sources/example/test_etl.py
@@ -101,6 +101,7 @@ class TestETL:
             if x not in states_expected_from_fixtures
         ]
         etl_class.PUERTO_RICO_EXPECTED_IN_DATA = False
+        etl_class.ISLAND_AREAS_EXPECTED_IN_DATA = False
 
         return etl_class
 
diff --git a/data/data-pipeline/data_pipeline/tests/sources/us_army_fuds/test_etl.py b/data/data-pipeline/data_pipeline/tests/sources/us_army_fuds/test_etl.py
index 5d390943..ce2b63c4 100644
--- a/data/data-pipeline/data_pipeline/tests/sources/us_army_fuds/test_etl.py
+++ b/data/data-pipeline/data_pipeline/tests/sources/us_army_fuds/test_etl.py
@@ -98,7 +98,7 @@ class TestUSArmyFUDSETL(TestETL):
         - self.OUTPUT_PATH points to the correct path in the temp directory
         """
         # setup
-        etl = self._ETL_CLASS()
+        etl = self._get_instance_of_etl_class()
         # validation
         assert etl.GEOID_FIELD_NAME == "GEOID10"
         assert etl.GEOID_TRACT_FIELD_NAME == "GEOID10_TRACT"
@@ -113,7 +113,7 @@ class TestUSArmyFUDSETL(TestETL):
 
     def test_get_output_file_path(self, mock_etl, mock_paths):
         """Tests the right file name is returned."""
-        etl = self._ETL_CLASS()
+        etl = self._get_instance_of_etl_class()
         data_path, tmp_path = mock_paths
 
         output_file_path = etl._get_output_file_path()