Index: tests/parseconfig.cfa
===================================================================
--- tests/parseconfig.cfa	(revision 480389d2be8f558762a52a4dc8f34d7c7bfa9d2b)
+++ tests/parseconfig.cfa	(revision ca83227ffb009f34216fed8e1d1fd267cc1e3ae2)
@@ -50,5 +50,5 @@
 	sout | "Different types of destination addresses";
 
-	parse_config( xstr(IN_DIR) "parseconfig-all.txt", entries, NUM_ENTRIES, TABULAR_CONFIG );
+	parse_config( xstr(IN_DIR) "parseconfig-all.txt", entries, NUM_ENTRIES, parse_tabular_config_format );
 
     sout | "Stop cost: " | config_params.stop_cost;
@@ -68,5 +68,5 @@
 	sout | "Open_Failure thrown when config file does not exist";
 	try {
-		parse_config( xstr(IN_DIR) "doesnt-exist.txt", entries, NUM_ENTRIES, TABULAR_CONFIG );
+		parse_config( xstr(IN_DIR) "doesnt-exist.txt", entries, NUM_ENTRIES, parse_tabular_config_format );
 	} catch( Open_Failure * ex ) {
 		sout | "Failed to open the config file";
@@ -77,5 +77,5 @@
 	sout | "Missing_Config_Entries thrown when config file is missing entries we want";
 	try {
-		parse_config( xstr(IN_DIR) "parseconfig-missing.txt", entries, NUM_ENTRIES, TABULAR_CONFIG );
+		parse_config( xstr(IN_DIR) "parseconfig-missing.txt", entries, NUM_ENTRIES, parse_tabular_config_format );
 	} catch( Missing_Config_Entries * ex ) {
 		msg( ex );
@@ -92,5 +92,5 @@
 
 	try {
-		parse_config( xstr(IN_DIR) "parseconfig-errors.txt", entry, 1, TABULAR_CONFIG );
+		parse_config( xstr(IN_DIR) "parseconfig-errors.txt", entry, 1, parse_tabular_config_format );
 	} catch( Parse_Failure * ex ) {
 		msg( ex );
@@ -106,5 +106,5 @@
 
 	try {
-		parse_config( xstr(IN_DIR) "parseconfig-errors.txt", entries, NUM_ENTRIES, TABULAR_CONFIG );
+		parse_config( xstr(IN_DIR) "parseconfig-errors.txt", entries, NUM_ENTRIES, parse_tabular_config_format );
 	} catch( Validation_Failure * ex ) {
 		msg( ex );
@@ -115,5 +115,5 @@
 	sout | "No error is thrown when validation succeeds";
 	config_params.stop_cost = -1; // Reset value
-	parse_config( xstr(IN_DIR) "parseconfig-all.txt", entries, NUM_ENTRIES, TABULAR_CONFIG );
+	parse_config( xstr(IN_DIR) "parseconfig-all.txt", entries, NUM_ENTRIES, parse_tabular_config_format );
 	sout | "Stop cost: " | config_params.stop_cost;
 	sout | nl;
@@ -126,5 +126,5 @@
 
 	config_params.stop_cost = -1; // Reset value
-	parse_config( xstr(IN_DIR) "parseconfig-all.txt", entries, NUM_ENTRIES, TABULAR_CONFIG );
+	parse_config( xstr(IN_DIR) "parseconfig-all.txt", entries, NUM_ENTRIES, parse_tabular_config_format );
 
 	sout | "Stop cost: " | config_params.stop_cost;
@@ -139,5 +139,5 @@
 
 	config_params.stop_cost = -1; // Reset value
-	parse_config( xstr(IN_DIR) "parseconfig-all.txt", entries, NUM_ENTRIES, TABULAR_CONFIG );
+	parse_config( xstr(IN_DIR) "parseconfig-all.txt", entries, NUM_ENTRIES, parse_tabular_config_format );
 
 	sout | "Stop cost: " | config_params.stop_cost;