diff --git a/recommendations/tests/test_solar_pv_recommendations.py b/recommendations/tests/test_solar_pv_recommendations.py
index f2436cb1..5481cb17 100644
--- a/recommendations/tests/test_solar_pv_recommendations.py
+++ b/recommendations/tests/test_solar_pv_recommendations.py
@@ -1,45 +1,50 @@
 import pytest
 from recommendations.SolarPvRecommendations import SolarPvRecommendations
 from backend.Property import Property
+from etl.epc.Record import EPCRecord
 
 
 class TestSolarPvRecommendations:
     @pytest.fixture
     def property_instance_invalid_type(self):
         # Setup the property_instance with an invalid property type
-        property_instance_invalid_type = Property(id=1, address="", postcode="")
-        property_instance_invalid_type.data = {
+        epc_record = EPCRecord()
+        epc_record.prepared_epc = {
             "property-type": "InvalidType", "county": "Broxbourne", "photo-supply": None
         }
+        property_instance_invalid_type = Property(id=1, address="", postcode="", epc_record=epc_record)
         property_instance_invalid_type.roof = {"is_flat": False, "is_pitched": False, "is_roof_room": False}
         return property_instance_invalid_type
 
     @pytest.fixture
     def property_instance_invalid_roof(self):
         # Setup the property_instance with invalid roof type
-        property_instance_invalid_roof = Property(id=1, address="", postcode="")
-        property_instance_invalid_roof.data = {
+        epc_record = EPCRecord()
+        epc_record.prepared_epc = {
             "county": "Huntingdonshire", "property-type": "House", "photo-supply": None
         }
+        property_instance_invalid_roof = Property(id=1, address="", postcode="", epc_record=epc_record)
         property_instance_invalid_roof.roof = {"is_flat": False, "is_pitched": False, "is_roof_room": False}
         return property_instance_invalid_roof
 
     @pytest.fixture
     def property_instance_has_solar_pv(self):
         # Setup the property_instance without existing solar pv
-        property_instance_has_solar_pv = Property(id=1, address="", postcode="")
-        property_instance_has_solar_pv.data = {"photo-supply": "40", "county": "Huntingdonshire",
-                                               "property-type": "House"}
+        epc_record = EPCRecord()
+        epc_record.prepared_epc = {"photo-supply": "40", "county": "Huntingdonshire",
+                                   "property-type": "House"}
+        property_instance_has_solar_pv = Property(id=1, address="", postcode="", epc_record=epc_record)
         property_instance_has_solar_pv.roof = {"is_flat": True}
         return property_instance_has_solar_pv
 
     @pytest.fixture
     def property_instance_valid_all(self):
         # Setup a valid property_instance that passes all conditions
-        property_instance_valid_all = Property(id=1, address="", postcode="")
+        epc_record = EPCRecord()
+        epc_record.prepared_epc = {"property-type": "House", "photo-supply": None, "county": "Huntingdonshire"}
+        property_instance_valid_all = Property(id=1, address="", postcode="", epc_record=epc_record)
         property_instance_valid_all.solar_pv_roof_area = 20
         property_instance_valid_all.solar_pv_percentage = 40
-        property_instance_valid_all.data = {"property-type": "House", "photo-supply": None, "county": "Huntingdonshire"}
         property_instance_valid_all.roof = {"is_flat": True}
         return property_instance_valid_all