diff --git a/test_cases/battery/IEEE123_secondary.glm b/test_cases/battery/IEEE123_secondary.glm
index 1af91147..f7d83647 100644
--- a/test_cases/battery/IEEE123_secondary.glm
+++ b/test_cases/battery/IEEE123_secondary.glm
@@ -51,7 +51,7 @@ object load {
 object transformer {
 	name dcfc_trans_0;
 	phases "ABCN";
-	from "meter_87";
+	from "meter_77";
 	to dcfc_load_0;
 	configuration dcfc_transformer;
 }
@@ -69,7 +69,7 @@ object load {
 object transformer {
 	name dcfc_trans_1;
 	phases "ABCN";
-	from "meter_48";
+	from "meter_98";
 	to dcfc_load_1;
 	configuration dcfc_transformer;
 }
@@ -86,8 +86,8 @@ object load {
 
 object transformer {
 	name dcfc_trans_2;
-	phases "ABC";
-	from "meter_64";
+	phases "ABCN";
+	from "meter_82";
 	to dcfc_load_2;
 	configuration dcfc_transformer;
 }
@@ -105,7 +105,7 @@ object load {
 object transformer {
 	name dcfc_trans_3;
 	phases "ABCN";
-	from "meter_95";
+	from "meter_79";
 	to dcfc_load_3;
 	configuration dcfc_transformer;
 }
diff --git a/test_cases/battery/feeder_population/feeder_population_collocated.py b/test_cases/battery/feeder_population/feeder_population_collocated.py
index 01f205df..c3c34508 100644
--- a/test_cases/battery/feeder_population/feeder_population_collocated.py
+++ b/test_cases/battery/feeder_population/feeder_population_collocated.py
@@ -48,8 +48,7 @@ def run():
     """
     path_prefix = os.getcwd()
     os.chdir(path_prefix)  # change directory
-    path_prefix = path_prefix[0:path_prefix.index('EV50_cosimulation')] + 'EV50_cosimulation'
-    path_prefix.replace('\\', '/')
+    path_prefix = "\\".join(path_prefix.split('\\')[:-3])   # Gets absolute path to the root of the project to get the desired files.
 
     f = open('config.txt', 'r')
     param_dict = f.read()
@@ -262,9 +261,13 @@ def run():
 
     # % load residential load data
     os.chdir(load_data_dir)
-    data_use = pandas.read_csv('data_2015_use.csv')
-
-    year = 2018
+    # Check if current directory is empty
+    if len(os.listdir(os.getcwd())) == 0:
+        raise FileNotFoundError('No data files in directory: ', os.getcwd(), 'Please check the directory to '
+                                                                             'ensure data file exists.')
+        return
+    data_use = pandas.read_csv('data_use.csv')
+    year = 2018     # NOTE: Make sure the year matches your data year or else the timestamps will be wrong and may throw erros.
 
     timestamp_list = [[] for k in range(len(data_use.month))]
     for i in range(len(timestamp_list)):