diff --git a/data/test/macros/pathfind_answers.cfg b/data/test/macros/pathfind_answers.cfg
new file mode 100644
index 000000000000..cf7e565397bb
--- /dev/null
+++ b/data/test/macros/pathfind_answers.cfg
@@ -0,0 +1,31 @@
+#define GENERATED_FIND_PATH_ANSWERS
+3,16,22,30,48,40,45,28,7,36,12,40,38,6,47,29,27,10,12,43,21,3,0,0,0,11,30,10,35,55,45,32,53,47,48,39,45,49,59,39,32,11,25,32,16,20,44,52,51,41,55,36,24,62,53,38,42,35,16,45,37,42,60,61,21,14,25,18,16,45,32,22,32,41,52,0,48,36,47,16,40,32,32,16,7,48,36,39,21,14,9,35,49,0,0,0,44,32,40,55,34,47,47,9,46,31,24,50,44,35,33,36,39,51,49,50,31,5,30,21,25,23,47,21,47,14,18,10,11,21,35,64,65,35,8,18,25,12,28,6,44,51,41,32,22,30,23,42,40,33,44,33,3,16,22,30,48,40,45,28,7,36,12,40,38,6,47,29,27,10,12,43,21,3,0,0,0,11,30,10,35,55,45,32,53,47,48,39,45,49,59,39,32,11,25,32,16,20,44,52,51,41,55,36,24,62,53,38,42,35,16,45,37,42,60,61,21,14,25,18,16,45,32,22,32,41,52,0,48,36,47,16,40,32,32,16,7,48,36,39,21,14,9,35,49,0,0,0,44,32,40,55,34,47,47,9,46,31,24,50,44,35,33,36,39,51,49,50,31,5,30,21,25,23,47,21,47,14,18,10,11,21,35,64,65,35,8,18,25,12,28,6,44,51,41,32,22,30,23,42,40,33,44,33
+#enddef
+
+#define GENERATED_REACHABILITY_ANSWERS_1
+179,2,3,2,4,2,5,2,6,2,7,2,8,2,9,2,11,3,3,3,4,3,5,3,6,3,7,3,8,3,9,3,10,3,11,3,12,4,2,4,3,4,4,4,5,4,6,4,7,4,8,4,9,4,10,4,11,4,12,5,2,5,3,5,4,5,5,5,6,5,7,5,8,5,9,5,10,5,11,5,12,5,13,6,1,6,2,6,3,6,4,6,5,6,6,6,7,6,8,6,9,6,10,6,11,6,12,6,13,7,1,7,2,7,3,7,4,7,5,7,6,7,7,7,8,7,9,7,10,7,11,7,12,7,13,7,14,8,1,8,2,8,3,8,4,8,5,8,6,8,7,8,8,8,9,8,10,8,11,8,12,8,13,9,1,9,2,9,3,9,4,9,5,9,6,9,7,9,8,9,9,9,10,9,12,9,13,10,1,10,2,10,3,10,4,10,5,10,6,10,7,10,8,10,9,10,11,10,12,10,13,11,1,11,2,11,3,11,4,11,5,11,7,11,8,11,9,11,11,11,12,11,13,11,14,12,1,12,2,12,3,12,4,12,5,12,6,12,7,12,8,12,9,12,10,12,11,13,2,13,3,13,4,13,5,13,7,13,8,13,9,13,10,13,11,13,12,14,2,14,3,14,4,14,5,14,6,14,7,14,8,14,9,14,10,14,11,14,12,15,4,15,5,15,6,15,7,15,8,15,9,15,10,16,3,16,4,16,5,16,6,16,7,16,8,16,9,17,4,17,5,17,6,17,7,17,8,17,9,18,4,18,5,18,6,18,7,18,8,19,5,19,6,19,7,19,8,19,9,144,10,1,10,2,10,3,10,4,11,1,11,2,11,3,11,4,11,5,12,1,12,2,12,3,12,4,12,5,12,7,12,8,12,9,13,1,13,2,13,3,13,4,13,5,13,7,13,8,13,9,13,10,14,1,14,2,14,3,14,4,14,5,14,6,14,7,14,8,14,9,14,10,15,1,15,2,15,3,15,4,15,5,15,6,15,7,15,8,15,9,15,10,16,1,16,2,16,3,16,4,16,5,16,6,16,7,16,8,16,9,17,1,17,2,17,3,17,4,17,5,17,6,17,7,17,8,17,9,17,11,18,1,18,2,18,3,18,4,18,5,18,6,18,7,18,8,18,10,18,11,19,1,19,2,19,3,19,4,19,5,19,6,19,7,19,8,19,9,19,10,19,11,19,12,20,1,20,2,20,3,20,4,20,5,20,6,20,7,20,8,20,9,20,11,21,1,21,2,21,3,21,4,21,5,21,6,21,7,21,8,21,10,22,1,22,2,22,3,22,4,22,5,22,6,22,7,22,8,23,1,23,2,23,3,23,4,23,5,23,6,23,8,23,9,23,10,24,1,24,2,24,3,24,4,24,5,24,6,24,8,24,9,25,1,25,2,25,3,25,4,25,5,25,6,25,7,26,1,26,2,26,3,26,4,26,5,26,6,89,27,21,27,22,27,23,27,24,28,21,28,22,28,23,28,24,29,20,29,21,29,22,29,23,29,24,29,25,30,18,30,19,30,20,30,21,30,22,30,23,30,24,30,30,31,19,31,21,31,22,31,23,31,30,32,22,32,23,32,24,32,26,32,27,32,29,32,31,33,18,33,19,33,21,33,22,33,23,33,24,33,25,33,27,33,29,33,30,33,31,33,32,34,19,34,20,34,21,34,22,34,23,34,24,34,25,34,26,34,27,34,28,34,30,35,20,35,21,35,22,35,23,35,24,35,25,35,26,35,27,35,28,35,29,35,30,36,19,36,23,36,25,36,27,36,29,37,19,37,20,37,23,37,24,37,25,37,27,37,29,38,23,38,25,38,26,38,28,39,25,39,27,39,28,39,29,40,28,113,37,20,37,21,38,15,38,21,39,15,39,16,39,19,39,21,39,22,39,25,40,15,40,16,40,17,40,18,40,19,40,20,40,21,40,22,40,24,40,25,41,16,41,17,41,18,41,19,41,20,41,21,41,22,41,25,41,26,41,27,41,28,42,16,42,17,42,18,42,19,42,20,42,21,42,22,42,23,42,24,42,25,42,26,42,27,42,28,43,15,43,16,43,17,43,18,43,19,43,20,43,21,43,22,43,23,43,24,43,25,43,26,43,27,43,28,43,29,44,14,44,15,44,16,44,17,44,18,44,19,44,20,44,21,44,22,44,23,44,24,44,25,44,26,44,27,44,28,45,15,45,16,45,17,45,18,45,19,45,20,45,21,45,22,45,23,45,24,45,25,45,26,45,27,45,28,46,15,46,16,46,17,46,18,46,19,46,20,46,21,46,22,46,23,46,24,46,25,46,26,46,27,47,16,47,17,47,18,47,19,47,20,47,21,47,22,47,23,47,24,47,25,47,26,47,27,100,10,37,10,38,10,39,10,40,11,37,11,38,11,39,11,40,11,41,12,38,12,39,12,40,12,41,12,42,12,43,13,38,13,39,13,40,13,41,13,42,13,43,13,44,14,38,14,39,14,40,14,41,14,42,14,43,14,44,15,38,15,39,15,41,15,42,15,43,15,44,15,45,16,38,16,39,16,40,16,41,16,42,16,43,16,44,16,45,17,38,17,39,17,40,17,41,17,42,17,43,17,44,17,45,17,46,18,38,18,39,18,40,18,41,18,42,18,43,18,44,18,45,19,38,19,39,19,40,19,42,19,43,19,44,19,45,20,37,20,38,20,39,20,40,20,41,20,42,20,43,20,44,21,38,21,39,21,40,21,41,21,42,21,43,21,44,22,38,22,39,22,40,22,41,22,42,22,43,23,38,23,39,23,41,23,42,23,43,24,38,24,39,25,38,25,39,25,40,26,39,179,2,3,2,4,2,5,2,6,2,7,2,8,2,9,2,11,3,3,3,4,3,5,3,6,3,7,3,8,3,9,3,10,3,11,3,12,4,2,4,3,4,4,4,5,4,6,4,7,4,8,4,9,4,10,4,11,4,12,5,2,5,3,5,4,5,5,5,6,5,7,5,8,5,9,5,10,5,11,5,12,5,13,6,1,6,2,6,3,6,4,6,5,6,6,6,7,6,8,6,9,6,10,6,11,6,12,6,13,7,1,7,2,7,3,7,4,7,5,7,6,7,7,7,8,7,9,7,10,7,11,7,12,7,13,7,14,8,1,8,2,8,3,8,4,8,5,8,6,8,7,8,8,8,9,8,10,8,11,8,12,8,13,9,1,9,2,9,3,9,4,9,5,9,6,9,7,9,8,9,9,9,10,9,12,9,13,10,1,10,2,10,3,10,4,10,5,10,6,10,7,10,8,10,9,10,11,10,12,10,13,11,1,11,2,11,3,11,4,11,5,11,7,11,8,11,9,11,11,11,12,11,13,11,14,12,1,12,2,12,3,12,4,12,5,12,6,12,7,12,8,12,9,12,10,12,11,13,2,13,3,13,4,13,5,13,7,13,8,13,9,13,10,13,11,13,12,14,2,14,3,14,4,14,5,14,6,14,7,14,8,14,9,14,10,14,11,14,12,15,4,15,5,15,6,15,7,15,8,15,9,15,10,16,3,16,4,16,5,16,6,16,7,16,8,16,9,17,4,17,5,17,6,17,7,17,8,17,9,18,4,18,5,18,6,18,7,18,8,19,5,19,6,19,7,19,8,19,9,144,10,1,10,2,10,3,10,4,11,1,11,2,11,3,11,4,11,5,12,1,12,2,12,3,12,4,12,5,12,7,12,8,12,9,13,1,13,2,13,3,13,4,13,5,13,7,13,8,13,9,13,10,14,1,14,2,14,3,14,4,14,5,14,6,14,7,14,8,14,9,14,10,15,1,15,2,15,3,15,4,15,5,15,6,15,7,15,8,15,9,15,10,16,1,16,2,16,3,16,4,16,5,16,6,16,7,16,8,16,9,17,1,17,2,17,3,17,4,17,5,17,6,17,7,17,8,17,9,17,11,18,1,18,2,18,3,18,4,18,5,18,6,18,7,18,8,18,10,18,11,19,1,19,2,19,3,19,4,19,5,19,6,19,7,19,8,19,9,19,10,19,11,19,12,20,1,20,2,20,3,20,4,20,5,20,6,20,7,20,8,20,9,20,11,21,1,21,2,21,3,21,4,21,5,21,6,21,7,21,8,21,10,22,1,22,2,22,3,22,4,22,5,22,6,22,7,22,8,23,1,23,2,23,3,23,4,23,5,23,6,23,8,23,9,23,10,24,1,24,2,24,3,24,4,24,5,24,6,24,8,24,9,25,1,25,2,25,3,25,4,25,5,25,6,25,7,26,1,26,2,26,3,26,4,26,5,26,6,89,27,21,27,22,27,23,27,24,28,21,28,22,28,23,28,24,29,20,29,21,29,22,29,23,29,24,29,25,30,18,30,19,30,20,30,21,30,22,30,23,30,24,30,30,31,19,31,21,31,22,31,23,31,30,32,22,32,23,32,24,32,26,32,27,32,29,32,31,33,18,33,19,33,21,33,22,33,23,33,24,33,25,33,27,33,29,33,30,33,31,33,32,34,19,34,20,34,21,34,22,34,23,34,24,34,25,34,26,34,27,34,28,34,30,35,20,35,21,35,22,35,23,35,24,35,25,35,26,35,27,35,28,35,29,35,30,36,19,36,23,36,25,36,27,36,29,37,19,37,20,37,23,37,24,37,25,37,27,37,29,38,23,38,25,38,26,38,28,39,25,39,27,39,28,39,29,40,28,113,37,20,37,21,38,15,38,21,39,15,39,16,39,19,39,21,39,22,39,25,40,15,40,16,40,17,40,18,40,19,40,20,40,21,40,22,40,24,40,25,41,16,41,17,41,18,41,19,41,20,41,21,41,22,41,25,41,26,41,27,41,28,42,16,42,17,42,18,42,19,42,20,42,21,42,22,42,23,42,24,42,25,42,26,42,27,42,28,43,15,43,16,43,17,43,18,43,19,43,20,43,21,43,22,43,23,43,24,43,25,43,26,43,27,43,28,43,29,44,14,44,15,44,16,44,17,44,18,44,19,44,20,44,21,44,22,44,23,44,24,44,25,44,26,44,27,44,28,45,15,45,16,45,17,45,18,45,19,45,20,45,21,45,22,45,23,45,24,45,25,45,26,45,27,45,28,46,15,46,16,46,17,46,18,46,19,46,20,46,21,46,22,46,23,46,24,46,25,46,26,46,27,47,16,47,17,47,18,47,19,47,20,47,21,47,22,47,23,47,24,47,25,47,26,47,27,100,10,37,10,38,10,39,10,40,11,37,11,38,11,39,11,40,11,41,12,38,12,39,12,40,12,41,12,42,12,43,13,38,13,39,13,40,13,41,13,42,13,43,13,44,14,38,14,39,14,40,14,41,14,42,14,43,14,44,15,38,15,39,15,41,15,42,15,43,15,44,15,45,16,38,16,39,16,40,16,41,16,42,16,43,16,44,16,45,17,38,17,39,17,40,17,41,17,42,17,43,17,44,17,45,17,46,18,38,18,39,18,40,18,41,18,42,18,43,18,44,18,45,19,38,19,39,19,40,19,42,19,43,19,44,19,45,20,37,20,38,20,39,20,40,20,41,20,42,20,43,20,44,21,38,21,39,21,40,21,41,21,42,21,43,21,44,22,38,22,39,22,40,22,41,22,42,22,43,23,38,23,39,23,41,23,42,23,43,24,38,24,39,25,38,25,39,25,40,26,39
+#enddef
+
+#define GENERATED_REACHABILITY_ANSWERS_2
+56,11,31,11,33,11,34,12,31,12,32,12,33,13,31,13,32,13,33,13,35,14,30,14,32,14,33,14,34,14,35,14,36,15,30,15,31,15,32,15,35,15,36,16,30,16,31,16,32,16,35,16,36,17,33,17,35,17,36,18,35,18,36,19,34,19,35,19,36,19,37,20,34,20,35,20,36,21,34,21,35,21,36,22,35,22,36,23,35,23,36,24,34,24,35,24,36,25,34,25,36,26,35,26,36,27,35,27,36,28,35,28,36,100,6,29,6,30,7,29,7,30,7,31,8,28,8,29,8,30,8,31,9,29,10,26,10,28,10,29,10,30,11,27,11,28,11,29,11,30,11,31,11,33,11,34,12,28,12,31,12,32,12,33,13,30,13,31,13,32,13,33,13,35,14,28,14,30,14,32,14,33,14,34,14,35,14,36,15,29,15,30,15,31,15,32,15,35,15,36,16,30,16,31,16,32,16,33,16,35,16,36,17,27,17,29,17,30,17,33,17,35,17,36,18,24,18,25,18,26,18,27,18,28,18,29,18,30,18,31,18,32,18,33,18,35,18,36,19,24,19,25,19,26,19,27,19,28,19,30,19,33,19,34,19,35,19,36,19,37,20,24,20,25,20,26,20,29,20,30,20,31,20,32,20,34,20,35,20,36,21,26,21,27,21,29,21,35,21,36,22,26,22,29,23,29,23,30,23,31,24,28,24,30,40,8,45,8,46,9,45,9,46,10,43,10,44,10,45,10,46,11,43,11,44,11,45,11,46,12,42,12,43,12,44,12,45,12,46,13,43,13,44,13,45,13,46,14,42,14,43,14,44,14,45,14,46,15,42,15,43,15,44,15,45,15,46,16,42,16,43,16,44,16,45,17,42,17,43,17,44,17,45,18,42,39,30,5,30,6,31,3,31,4,31,5,31,6,32,2,32,3,32,4,32,5,33,2,33,3,33,4,33,5,33,6,34,1,34,2,34,3,34,4,34,5,35,1,35,2,35,3,35,4,35,5,36,1,36,2,36,3,36,4,36,5,37,1,37,2,37,3,37,4,37,5,38,2,38,3,38,4,39,3,5,25,21,25,22,26,20,26,21,26,22
+#enddef
+
+#define GENERATED_REACHABILITY_ANSWERS_3
+36,29,21,29,22,29,23,30,20,30,21,30,22,30,23,31,21,31,22,31,23,32,22,32,23,33,21,33,22,33,23,33,24,33,25,34,19,34,20,34,21,34,22,34,23,34,24,34,25,34,26,35,20,35,21,35,22,35,23,35,24,35,25,35,26,36,23,36,25,37,23,37,24,56,19,3,19,4,19,5,19,6,19,7,20,2,20,3,20,4,20,5,20,6,20,7,21,2,21,3,21,4,21,5,21,6,21,7,21,8,22,1,22,2,22,3,22,4,22,5,22,6,22,7,23,1,23,2,23,3,23,4,23,5,23,6,24,1,24,2,24,3,24,4,24,5,24,6,24,7,25,2,25,3,25,4,25,5,25,6,25,7,25,8,26,2,26,3,26,4,26,5,26,6,26,7,27,3,27,4,27,5,27,6,27,7,44,13,7,13,8,13,9,13,10,13,11,14,6,14,7,14,8,14,9,14,10,14,11,15,6,15,7,15,8,15,9,15,10,16,5,16,6,16,7,16,8,16,9,17,5,17,6,17,7,17,8,17,9,18,5,18,6,18,7,18,8,18,10,19,6,19,7,19,8,19,9,19,10,19,11,20,6,20,7,20,8,20,9,21,7,21,8,21,10,39,16,7,16,8,16,9,16,11,17,7,17,8,17,9,17,11,17,12,18,6,18,7,18,8,18,10,18,11,19,6,19,7,19,8,19,9,19,10,19,11,19,12,19,13,20,5,20,6,20,7,20,8,20,9,20,11,20,12,21,6,21,7,21,8,21,10,21,12,22,6,22,7,22,8,23,8,23,9,31,18,10,18,11,18,13,19,10,19,11,19,12,19,13,20,11,20,12,20,13,20,14,20,15,21,12,21,13,21,14,21,16,22,11,22,12,22,13,22,14,22,15,22,16,23,12,23,14,23,15,24,11,24,12,24,13,24,15,25,12,25,13
+#enddef
+
+#define GENERATED_REACHABILITY_ANSWERS_4
+170,1,10,1,11,1,12,1,13,1,14,1,15,1,16,1,17,1,18,1,19,1,20,1,21,2,9,2,11,2,12,2,13,2,14,2,15,2,16,2,17,2,18,2,19,2,20,2,21,3,9,3,10,3,11,3,12,3,13,3,14,3,15,3,16,3,17,3,18,3,19,3,20,3,21,4,8,4,9,4,10,4,11,4,12,4,13,4,14,4,15,4,16,4,17,4,18,4,19,4,20,4,21,4,22,5,8,5,9,5,10,5,11,5,12,5,13,5,14,5,15,5,16,5,17,5,18,5,19,5,20,5,21,5,22,6,7,6,8,6,9,6,10,6,11,6,12,6,13,6,14,6,15,6,16,6,17,6,18,6,19,6,20,6,21,6,22,6,23,7,7,7,8,7,9,7,10,7,11,7,12,7,13,7,14,7,15,7,16,7,17,7,18,7,19,7,20,7,21,7,22,7,23,7,24,8,7,8,8,8,9,8,10,8,11,8,12,8,13,8,14,8,15,8,16,8,17,8,18,8,19,8,22,8,23,9,8,9,9,9,10,9,12,9,13,9,14,9,15,9,16,9,17,9,18,9,19,9,20,9,21,9,23,10,8,10,9,10,11,10,12,10,13,10,14,10,15,10,16,10,17,10,19,10,21,10,22,11,11,11,12,11,13,11,14,11,15,11,16,11,17,11,19,11,21,11,23,12,9,12,10,12,11,12,15,12,16,12,18,12,20,13,9,13,10,13,11,13,12,13,16,14,9,14,10,14,11,14,12,15,10,138,1,1,1,2,1,3,1,4,1,5,1,6,1,7,1,8,1,9,1,10,1,11,2,1,2,2,2,3,2,4,2,5,2,6,2,7,2,8,2,9,2,11,3,1,3,2,3,3,3,4,3,5,3,6,3,7,3,8,3,9,3,10,3,11,3,12,4,1,4,2,4,3,4,4,4,5,4,6,4,7,4,8,4,9,4,10,4,11,4,12,5,1,5,2,5,3,5,4,5,5,5,6,5,7,5,8,5,9,5,10,5,11,6,1,6,2,6,3,6,4,6,5,6,6,6,7,6,8,6,9,6,10,6,11,6,12,7,1,7,2,7,3,7,4,7,5,7,6,7,7,7,8,7,9,7,10,7,11,7,12,8,1,8,2,8,3,8,4,8,5,8,6,8,7,8,8,8,9,8,10,8,11,9,1,9,2,9,3,9,4,9,5,9,6,9,7,9,8,9,9,9,10,10,1,10,2,10,3,10,4,10,5,10,6,10,7,10,8,10,9,11,1,11,2,11,3,11,4,11,5,11,7,11,8,11,9,12,1,12,2,12,3,12,4,12,5,12,6,12,7,12,8,12,9,13,1,13,2,13,3,13,4,13,5,13,7,13,9,14,1,14,2,14,3,14,4,141,27,40,27,41,27,44,27,46,28,40,28,41,28,43,28,44,28,45,28,46,29,40,29,41,29,42,29,43,29,44,29,45,29,46,30,40,30,41,30,42,30,43,30,44,30,45,30,46,31,39,31,40,31,41,31,42,31,43,31,44,31,45,31,46,32,38,32,39,32,40,32,41,32,42,32,43,32,44,32,45,32,46,33,38,33,39,33,40,33,41,33,42,33,43,33,44,33,45,33,46,34,36,34,37,34,38,34,39,34,40,34,41,34,42,34,43,34,44,34,45,34,46,35,37,35,38,35,39,35,40,35,41,35,42,35,43,35,44,35,45,35,46,36,37,36,38,36,40,36,41,36,42,36,43,36,44,36,45,36,46,37,41,37,42,37,43,37,44,37,45,37,46,38,41,38,42,38,43,38,44,38,45,38,46,39,39,39,40,39,41,39,42,39,43,39,44,39,45,39,46,40,38,40,39,40,40,40,41,40,42,40,43,40,44,40,45,40,46,41,38,41,39,41,40,41,41,41,42,41,44,41,45,41,46,42,38,42,39,42,40,42,41,42,42,42,44,42,45,42,46,43,39,43,40,43,41,43,42,43,43,43,45,43,46,44,39,44,40,44,41,44,42,44,44,44,45,44,46,45,45,45,46,144,1,38,1,39,1,40,1,41,1,42,1,43,1,44,1,45,1,46,2,37,2,38,2,39,2,40,2,41,2,42,2,43,2,44,2,45,2,46,3,37,3,39,3,40,3,41,3,42,3,43,3,44,3,45,3,46,4,36,4,37,4,38,4,39,4,40,4,41,4,42,4,43,4,44,4,45,4,46,5,36,5,37,5,38,5,39,5,40,5,41,5,42,5,43,5,44,5,45,5,46,6,35,6,36,6,37,6,38,6,39,6,40,6,41,6,42,6,43,6,44,6,45,6,46,7,36,7,37,7,38,7,39,7,40,7,41,7,42,7,43,7,44,7,45,7,46,8,36,8,37,8,38,8,39,8,40,8,41,8,42,8,43,8,44,8,45,8,46,9,37,9,38,9,39,9,40,9,41,9,42,9,43,9,44,9,45,9,46,10,37,10,38,10,39,10,40,10,41,10,42,10,43,10,44,10,45,10,46,11,38,11,39,11,40,11,41,11,42,11,43,11,44,11,45,11,46,12,38,12,39,12,40,12,41,12,42,12,43,12,44,12,45,12,46,13,39,13,40,13,41,13,42,13,43,13,44,13,45,13,46,14,39,14,40,14,41,14,42,14,43,14,44,14,45,14,46,15,41,15,42,15,43,15,44,15,45,15,46,47,16,30,17,21,17,27,17,29,17,30,18,21,18,22,18,23,18,24,18,25,18,26,18,27,18,28,18,29,18,30,19,22,19,23,19,24,19,25,19,26,19,27,19,28,19,30,20,20,20,21,20,23,20,24,20,25,20,26,21,21,21,22,21,23,21,24,21,26,21,27,22,21,22,22,22,23,22,25,22,26,22,27,23,22,23,25,23,26,23,27,24,24,24,26
+#enddef
+
+#define GENERATED_REACHABILITY_ANSWERS_5
+111,1,24,1,25,1,26,1,27,1,29,1,30,1,31,1,32,1,33,1,34,1,35,2,23,2,24,2,25,2,26,2,27,2,28,2,29,2,30,2,31,2,32,2,34,2,36,3,23,3,24,3,25,3,26,3,27,3,28,3,29,3,30,3,31,3,32,3,33,3,34,3,35,3,36,3,37,4,23,4,24,4,25,4,26,4,27,4,28,4,29,4,30,4,31,4,32,4,33,4,34,4,35,4,36,4,37,5,24,5,25,5,26,5,27,5,28,5,30,5,31,5,32,5,33,5,34,5,35,5,36,5,37,6,24,6,25,6,26,6,27,6,29,6,30,6,31,6,32,6,33,6,34,6,35,6,36,7,25,7,26,7,29,7,30,7,31,7,32,7,33,7,35,7,36,8,25,8,26,8,29,8,30,8,31,8,32,8,34,8,35,9,32,9,33,9,34,9,35,9,36,10,32,10,33,10,34,10,35,11,33,11,34,11,35,12,31,12,32,12,33,13,33,5,10,9,11,9,11,10,11,11,12,10,132,5,3,5,6,5,7,5,8,6,2,6,3,6,6,6,7,6,8,7,3,7,4,7,6,7,7,7,8,7,9,8,2,8,3,8,4,8,5,8,6,8,7,8,8,8,9,9,1,9,2,9,3,9,4,9,5,9,6,9,7,9,8,9,9,9,10,10,1,10,2,10,3,10,4,10,5,10,6,10,7,10,9,11,1,11,2,11,3,11,4,11,5,11,6,11,11,11,12,12,1,12,2,12,3,12,4,12,5,12,6,12,7,12,8,12,10,12,11,13,1,13,2,13,3,13,4,13,5,13,6,13,7,13,8,13,9,13,10,13,11,13,12,14,1,14,2,14,3,14,4,14,5,14,6,14,7,14,8,14,9,14,10,14,11,14,12,14,13,15,2,15,3,15,4,15,5,15,6,15,7,15,8,15,9,15,10,15,12,15,13,16,1,16,3,16,4,16,5,16,6,16,7,16,8,16,9,16,12,17,2,17,3,17,5,17,6,17,7,17,8,18,1,18,2,18,5,18,6,18,7,18,8,19,4,19,5,19,6,19,7,19,8,19,9,20,3,20,4,20,5,20,6,20,7,21,4,21,5,21,6,21,7,21,8,119,15,5,15,6,15,7,15,8,16,5,16,6,16,7,16,8,17,5,17,6,17,7,17,8,18,1,18,2,18,3,18,5,18,6,18,7,18,8,19,1,19,2,19,3,19,4,19,5,19,6,19,7,19,8,19,9,20,2,20,3,20,4,20,5,20,6,20,7,20,8,21,2,21,3,21,4,21,5,21,6,21,7,21,8,22,1,22,2,22,3,22,4,22,5,22,6,22,7,22,8,23,3,23,4,23,6,23,7,23,8,23,9,23,10,24,1,24,2,24,3,24,4,24,5,24,6,24,7,24,8,24,9,25,2,25,3,25,4,25,5,25,6,25,7,25,8,25,9,25,10,26,1,26,2,26,3,26,4,26,5,26,6,26,7,26,8,26,9,27,1,27,2,27,4,27,5,27,6,27,7,27,8,27,9,28,1,28,3,28,4,28,5,28,6,28,7,28,8,28,9,29,3,29,4,29,5,29,6,29,7,29,8,29,9,29,10,30,4,30,5,30,6,30,7,30,8,30,9,31,4,31,5,31,6,31,8,31,9,127,32,27,33,21,33,22,33,24,33,25,33,27,33,29,34,19,34,21,34,22,34,23,34,25,34,26,34,27,34,28,35,20,35,21,35,22,35,23,35,24,35,25,35,26,35,27,35,28,35,29,35,30,36,19,36,23,36,25,36,27,36,29,37,17,37,18,37,19,37,20,37,21,37,23,37,24,37,25,37,27,37,29,38,17,38,18,38,19,38,21,38,23,38,25,38,26,38,28,39,19,39,21,39,22,39,23,39,24,39,25,39,27,39,28,39,29,40,16,40,17,40,18,40,19,40,20,40,21,40,22,40,23,40,24,40,25,40,28,41,17,41,18,41,19,41,20,41,21,41,22,41,23,41,24,41,25,41,26,41,27,41,28,41,29,42,17,42,18,42,19,42,20,42,22,42,23,42,24,42,25,42,26,42,27,42,28,43,18,43,20,43,21,43,22,43,23,43,24,43,25,43,26,43,27,43,28,44,19,44,20,44,21,44,22,44,23,44,24,44,25,45,19,45,20,45,21,45,22,45,23,45,24,45,25,45,26,46,21,46,22,46,23,46,24,46,25,46,26,47,23,47,24,47,25
+#enddef
+
+#define GENERATED_REACHABILITY_ANSWERS_6
+37,37,5,38,2,38,3,38,4,38,5,39,2,39,3,39,4,40,1,40,2,40,3,40,4,40,5,40,6,41,1,41,2,41,3,41,4,41,5,41,6,41,7,42,1,42,2,42,3,42,4,42,5,42,6,43,1,43,2,43,3,43,4,43,5,44,1,44,2,44,3,45,2,45,3,43,36,5,37,3,37,4,37,5,37,6,37,7,38,2,38,3,38,4,38,5,38,6,38,7,39,2,39,3,39,4,39,5,39,6,39,7,40,1,40,2,40,3,40,4,40,5,40,6,40,7,41,1,41,2,41,3,41,4,41,5,41,6,41,7,42,1,42,2,42,3,42,4,42,5,42,6,43,1,43,2,43,5,44,1,44,2,72,35,15,36,14,36,15,36,16,37,11,37,12,37,13,37,14,37,15,38,10,38,11,38,12,38,13,38,14,38,15,39,10,39,11,39,12,39,13,39,14,39,15,39,16,39,19,40,9,40,10,40,11,40,12,40,13,40,14,40,15,40,16,40,17,40,18,40,19,41,10,41,11,41,12,41,13,41,14,41,15,41,16,41,17,41,18,41,19,42,10,42,11,42,12,42,13,42,14,42,15,42,16,42,17,42,18,43,11,43,12,43,13,43,14,43,15,43,16,43,17,43,18,44,11,44,12,44,13,44,14,44,15,44,16,44,17,45,14,45,15,45,16,45,17,70,37,14,37,15,38,13,38,14,38,15,39,13,39,14,39,15,39,16,39,19,40,12,40,13,40,14,40,15,40,16,40,17,40,18,40,19,41,12,41,13,41,14,41,15,41,16,41,17,41,18,41,19,41,20,42,11,42,12,42,13,42,14,42,15,42,16,42,17,42,18,42,19,42,20,43,12,43,13,43,14,43,15,43,16,43,17,43,18,43,19,44,11,44,12,44,13,44,14,44,15,44,16,44,17,44,18,44,19,45,13,45,14,45,15,45,16,45,17,45,18,45,19,46,13,46,14,46,15,46,16,46,17,47,13,47,16,47,17,47,18,69,35,9,35,10,35,15,36,8,36,9,36,11,36,14,36,15,37,9,37,10,37,11,37,12,37,13,37,14,37,15,38,7,38,8,38,9,38,10,38,11,38,12,38,13,38,14,38,15,39,7,39,8,39,9,39,10,39,11,39,12,39,13,39,14,39,15,39,16,40,7,40,8,40,9,40,10,40,11,40,12,40,13,40,14,40,15,40,16,41,8,41,9,41,10,41,11,41,12,41,13,41,14,41,15,41,16,42,9,42,10,42,11,42,12,42,13,42,14,43,10,43,11,43,12,43,13,43,14,44,9,44,10,44,11,44,12,44,13
+#enddef
+
+#define GENERATED_REACHABILITY_ANSWERS_7
+100,34,35,34,36,34,37,34,38,34,39,35,36,35,37,35,38,35,39,35,40,36,36,36,37,36,38,36,39,36,40,36,41,37,33,37,34,37,35,37,36,37,37,37,38,37,39,37,41,37,42,38,32,38,33,38,34,38,35,38,36,38,37,38,38,38,39,38,40,38,41,38,42,39,32,39,33,39,34,39,35,39,36,39,37,39,38,39,39,39,40,39,41,39,42,39,43,40,32,40,33,40,36,40,37,40,38,40,39,40,40,40,41,40,42,41,33,41,37,41,38,41,39,41,40,41,41,41,42,42,33,42,36,42,37,42,39,42,40,42,41,42,42,43,33,43,34,43,35,43,36,43,37,43,38,43,39,43,40,43,41,43,42,44,33,44,34,44,35,44,36,44,37,44,38,44,39,44,40,44,41,45,35,45,36,45,37,45,38,45,39,45,40,45,41,46,35,46,36,46,37,92,37,35,37,36,37,37,37,38,38,34,38,35,38,36,38,37,38,38,38,39,38,40,38,41,39,34,39,35,39,36,39,37,39,38,39,39,39,40,39,41,39,42,40,36,40,37,40,38,40,39,40,40,40,41,41,33,41,37,41,38,41,39,41,40,41,41,41,42,42,33,42,36,42,37,42,39,42,40,42,41,42,42,43,32,43,33,43,34,43,35,43,36,43,37,43,38,43,39,43,40,43,41,43,42,43,43,43,44,44,32,44,33,44,34,44,35,44,36,44,37,44,38,44,39,44,40,44,41,44,42,44,43,45,33,45,34,45,35,45,36,45,37,45,38,45,39,45,40,45,41,45,42,45,43,46,34,46,35,46,36,46,37,46,38,46,39,46,40,46,41,47,35,47,36,47,37,47,38,47,39,47,40,47,41,68,39,32,39,33,39,34,40,31,40,32,40,33,40,36,40,37,41,31,41,32,41,33,41,37,41,38,42,32,42,33,42,36,42,37,43,29,43,32,43,33,43,34,43,35,43,36,43,37,43,38,43,39,44,29,44,30,44,31,44,32,44,33,44,34,44,35,44,36,44,37,44,38,44,39,45,28,45,29,45,30,45,31,45,32,45,33,45,34,45,35,45,36,45,37,45,38,46,29,46,30,46,31,46,32,46,33,46,34,46,35,46,36,46,37,46,38,47,29,47,30,47,31,47,32,47,33,47,34,47,35,47,36,47,37,47,38,94,18,39,18,40,18,41,18,42,18,43,18,44,19,39,19,40,19,41,19,42,19,44,19,45,20,38,20,39,20,40,20,41,20,42,20,43,20,44,20,45,20,46,21,38,21,39,21,40,21,41,21,42,21,43,21,44,21,45,21,46,22,38,22,39,22,40,22,41,22,42,22,43,22,44,22,45,22,46,23,38,23,39,23,40,23,41,23,42,23,43,23,44,23,45,23,46,24,38,24,39,24,40,24,41,24,42,24,43,24,44,24,45,24,46,25,38,25,39,25,40,25,41,25,42,25,44,25,45,25,46,26,39,26,40,26,41,26,42,26,43,26,44,26,45,26,46,27,40,27,41,27,42,27,43,27,44,27,45,27,46,28,38,28,39,28,40,28,41,28,42,28,43,28,44,28,45,29,39,29,40,29,41,29,42,29,43,29,44,89,20,42,20,43,20,45,20,46,21,42,21,43,21,44,21,45,21,46,22,40,22,41,22,42,22,43,22,44,22,45,22,46,23,39,23,40,23,41,23,42,23,43,23,44,23,45,23,46,24,38,24,39,24,40,24,41,24,42,24,43,24,44,24,45,24,46,25,38,25,39,25,40,25,41,25,42,25,44,25,45,25,46,26,39,26,40,26,41,26,42,26,43,26,44,26,45,26,46,27,40,27,41,27,42,27,43,27,44,27,45,27,46,28,38,28,39,28,40,28,41,28,42,28,43,28,44,28,45,28,46,29,39,29,40,29,41,29,42,29,43,29,44,29,45,29,46,30,39,30,40,30,41,30,42,30,43,30,44,30,45,31,40,31,41,31,42,31,43,31,45,31,46,32,40,32,41,32,42
+#enddef
diff --git a/data/test/maps/pathfind_1.cfg b/data/test/maps/pathfind_1.cfg
index 40b0152b4f69..1484eba593c5 100644
--- a/data/test/maps/pathfind_1.cfg
+++ b/data/test/maps/pathfind_1.cfg
@@ -143,6 +143,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=11
 		y=7
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -153,6 +154,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=18
 		y=4
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -163,6 +165,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=34
 		y=24
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -173,6 +176,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=42
 		y=21
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -183,6 +187,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=18
 		y=38
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -193,6 +198,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=10
 		y=36
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -203,6 +209,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=7
 		y=27
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -213,6 +220,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=15
 		y=21
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -223,6 +231,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=31
 		y=7
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -233,6 +242,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=36
 		y=12
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -243,6 +253,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=27
 		y=10
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -253,6 +264,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=37
 		y=8
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -263,6 +275,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=14
 		y=17
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -273,6 +286,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=30
 		y=23
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -283,6 +297,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=31
 		y=25
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -293,6 +308,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=25
 		y=25
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -303,6 +319,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=18
 		y=24
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -313,6 +330,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=18
 		y=23
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -323,6 +341,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=18
 		y=26
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -333,6 +352,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=15
 		y=35
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -343,6 +363,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=19
 		y=35
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -353,6 +374,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=15
 		y=32
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -363,6 +385,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=13
 		y=45
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -373,6 +396,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=34
 		y=3
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -383,6 +407,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=26
 		y=21
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -393,6 +418,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=27
 		y=23
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -403,6 +429,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=30
 		y=21
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -413,6 +440,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=23
 		y=23
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -423,6 +451,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=35
 		y=5
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -433,6 +462,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=19
 		y=43
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -443,6 +473,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=40
 		y=29
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -453,6 +484,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=42
 		y=31
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -463,6 +495,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=43
 		y=31
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -473,6 +506,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=43
 		y=30
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -483,6 +517,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=42
 		y=29
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -493,6 +528,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=44
 		y=28
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -503,6 +539,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=44
 		y=26
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -513,6 +550,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=31
 		y=44
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -523,6 +561,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=25
 		y=43
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -533,6 +572,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=6
 		y=39
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -543,6 +583,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=33
 		y=23
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -553,6 +594,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=23
 		y=5
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -563,6 +605,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=17
 		y=9
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -573,6 +616,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=20
 		y=9
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -583,6 +627,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=22
 		y=12
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -593,6 +638,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=23
 		y=19
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -603,6 +649,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=27
 		y=31
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -613,6 +660,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=37
 		y=40
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -623,6 +671,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=37
 		y=31
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -633,6 +682,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=42
 		y=38
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -643,6 +693,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=40
 		y=34
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -653,6 +704,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=41
 		y=34
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -663,6 +715,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=42
 		y=34
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -673,6 +726,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=42
 		y=35
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -683,6 +737,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=41
 		y=36
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -693,6 +748,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=40
 		y=35
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -703,6 +759,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=10
 		y=10
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -713,6 +770,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=12
 		y=9
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -723,6 +781,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=34
 		y=6
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -733,6 +792,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=17
 		y=14
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -743,6 +803,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=8
 		y=15
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -753,6 +814,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=5
 		y=4
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -763,6 +825,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=36
 		y=44
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -773,6 +836,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=6
 		y=44
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -783,6 +847,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=18
 		y=25
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -793,6 +858,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=6
 		y=28
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -803,6 +869,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=8
 		y=28
+			random_traits=no
 	[/unit]
 [/side]
 [side]
@@ -828,6 +895,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=13
 		y=15
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -838,6 +906,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=19
 		y=17
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -848,6 +917,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=35
 		y=10
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -858,6 +928,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=31
 		y=15
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -868,6 +939,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=26
 		y=23
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -878,6 +950,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=24
 		y=21
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -888,6 +961,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=38
 		y=19
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -898,6 +972,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=15
 		y=40
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -908,6 +983,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=41
 		y=35
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -918,6 +994,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=42
 		y=30
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -928,6 +1005,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=33
 		y=34
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -938,6 +1016,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=28
 		y=42
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -948,6 +1027,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=9
 		y=26
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -958,6 +1038,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=5
 		y=30
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -968,6 +1049,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=11
 		y=10
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -978,6 +1060,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=13
 		y=6
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -988,6 +1071,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=23
 		y=7
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -998,6 +1082,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=39
 		y=24
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1008,6 +1093,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=31
 		y=27
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1018,6 +1104,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=17
 		y=24
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1028,6 +1115,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=17
 		y=23
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1038,6 +1126,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=17
 		y=26
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1048,6 +1137,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=17
 		y=25
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1058,6 +1148,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=21
 		y=37
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1068,6 +1159,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=10
 		y=33
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1078,6 +1170,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=30
 		y=39
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1088,6 +1181,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=19
 		y=41
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1098,6 +1192,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=38
 		y=1
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1108,6 +1203,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=26
 		y=19
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1118,6 +1214,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=43
 		y=5
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1128,6 +1225,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=46
 		y=6
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1138,6 +1236,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=41
 		y=4
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1148,6 +1247,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=42
 		y=3
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1158,6 +1258,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=41
 		y=3
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1168,6 +1269,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=40
 		y=3
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1178,6 +1280,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=40
 		y=14
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1188,6 +1291,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=42
 		y=15
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1198,6 +1302,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=39
 		y=12
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1208,6 +1313,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=4
 		y=32
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1218,6 +1324,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=13
 		y=28
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1228,6 +1335,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=22
 		y=44
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1238,6 +1346,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=44
 		y=37
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1248,6 +1357,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=37
 		y=36
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1258,6 +1368,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=28
 		y=34
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1268,6 +1379,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=38
 		y=40
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1278,6 +1390,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=38
 		y=39
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1288,6 +1401,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=37
 		y=39
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1298,6 +1412,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=36
 		y=39
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1308,6 +1423,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=20
 		y=45
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1318,6 +1434,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=5
 		y=23
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1328,6 +1445,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=11
 		y=6
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1338,6 +1456,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=21
 		y=25
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1348,6 +1467,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=20
 		y=22
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1358,6 +1478,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=40
 		y=37
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1368,6 +1489,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=43
 		y=38
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1378,6 +1500,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=45
 		y=34
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1388,6 +1511,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=24
 		y=42
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1398,6 +1522,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=26
 		y=43
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1408,6 +1533,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=31
 		y=12
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1418,6 +1544,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=13
 		y=14
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1428,6 +1555,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=15
 		y=18
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1438,6 +1566,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=13
 		y=18
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1448,6 +1577,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=14
 		y=21
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1458,6 +1588,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=16
 		y=20
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1468,6 +1599,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=43
 		y=44
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1478,6 +1610,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=41
 		y=43
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1488,6 +1621,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=26
 		y=34
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1498,6 +1632,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=25
 		y=33
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1508,6 +1643,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=23
 		y=40
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1518,6 +1654,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=9
 		y=11
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1528,6 +1665,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=45
 		y=39
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1538,6 +1676,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=31
 		y=24
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1548,6 +1687,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=22
 		y=24
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1558,6 +1698,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=20
 		y=33
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1568,6 +1709,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=18
 		y=37
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1578,6 +1720,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=13
 		y=36
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1588,6 +1731,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=15
 		y=12
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1598,6 +1742,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=41
 		y=7
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1608,6 +1753,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=29
 		y=5
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1618,6 +1764,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=39
 		y=23
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1628,6 +1775,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=40
 		y=23
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1638,6 +1786,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=41
 		y=23
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1648,6 +1797,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=41
 		y=24
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1658,6 +1808,7 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=7
 		y=28
+			random_traits=no
 	[/unit]
 	[unit]
 		canrecruit=no
@@ -1668,5 +1819,6 @@ victory_when_enemies_defeated=yes
 		unrenamable=no
 		x=26
 		y=12
+			random_traits=no
 	[/unit]
 [/side]
diff --git a/data/test/scenarios/characterize_pathfinding.cfg b/data/test/scenarios/characterize_pathfinding.cfg
index fff6065124fa..6ded09d91372 100644
--- a/data/test/scenarios/characterize_pathfinding.cfg
+++ b/data/test/scenarios/characterize_pathfinding.cfg
@@ -4,14 +4,11 @@
 ###
 ### sed -n 's/^.*: \([ [:digit:]]*\) ,/\1/p' <foo | tr '\n' ','
 ###
-### so you get a nice comma separated list. Then paste it below to GENERATED_ANSWERS, and change GENERATE_ANSWERS to 0 again.
+### so you get a nice comma separated list. Then paste it in data/test/macros/pathfind_answers.cfg, 
+### and in this file change GENERATE_ANSWERS to 0 again.
 
 #define GENERATE_ANSWERS
-1
-#enddef
-
-#define GENERATED_ANSWERS
-3,3,1,11,16,2,16,22,3,23,30,4,34,48,6,25,40,5,26,47,6,18,28,4,7,7,1,31,36,4,7,12,2,34,40,6,23,38,5,1,6,1,30,47,7,23,29,5,13,26,4,9,10,2,4,14,2,28,44,7,13,21,3,3,3,1,0,0,0,9,11,2,23,30,5,5,12,2,24,35,7,39,59,10,38,45,8,28,32,7,37,53,11,40,48,8,41,49,9,32,39,8,35,48,8,38,46,8,39,59,12,32,39,7,23,32,8,11,11,3,16,26,6,22,32,8,12,16,4,13,20,5,34,44,11,41,52,11,45,51,11,33,41,9,37,54,8,29,38,6,17,21,3,46,62,11,42,53,8,34,38,6,26,47,6,20,32,4,16,16,2,29,50,5,26,37,4,35,41,5,51,62,7,54,61,7,17,21,3,12,14,2,18,25,5,15,18,3,13,16,3,41,45,7,28,32,4,20,22,4,31,32,4,37,41,6,49,51,7,0,30,48,6,34,36,4,43,47,6,15,16,2,36,40,5,18,36,4,29,32,4,13,18,2,6,7,1,32,45,8,22,36,6,27,40,6,14,21,4,14,14,3,9,9,2,21,32,8,44,50,13,0,0,0,38,44,7,32,32,5,29,40,8,45,54,9,28,34,6,39,47,8,39,47,10,7,9,2,37,43,8,24,31,6,12,28,4,39,50,9,42,44,7,23,32,4,27,33,5,35,36,6,37,40,6,39,49,7,44,51,8,39,50,8,29,31,6,4,5,1,19,28,4,21,21,3,24,25,4,22,23,4,40,47,8,20,21,4,46,47,7,10,16,2,16,18,3,8,10,2,10,11,2,19,21,3,15,35,5,55,64,11,49,66,11,26,34,6,7,8,2,16,18,2,15,27,3,11,12,2,11,28,5,6,6,1,32,44,7,41,52,8,29,42,6,25,32,6,20,22,4,21,30,5,22,23,4,38,43,8,27,40,8,25,33,6,32,45,8,32,33,7
+0
 #enddef
 
 #define IF_GEN_ANS T E
@@ -45,7 +42,8 @@
         message="$observed_answer ,"
         logger=debug
         to_chat=false
-    [/wml_message])
+    [/wml_message]
+   )
    ({VARIABLE current_answer $answers[$answer_counter|].val|}
     {VARIABLE observed_answer ${X}}
     [wml_message]
@@ -59,9 +57,9 @@
 {VARIABLE_OP answer_counter add 1} 
 #enddef
 
-#define INIT_ANSWERS
+#define INIT_ANSWERS LIST
 {VARIABLE answer_counter 0}
-{VARIABLE answers_list ("{GENERATED_ANSWERS}")}
+{VARIABLE answers_list ("{{LIST}}")}
 {SPLIT_COMMA_LIST $answers_list answers}
 
 [wml_message]
@@ -71,17 +69,6 @@
 [/wml_message]
 #enddef
 
-#define FORMAT ARRAY VARIABLE
-{VARIABLE_OP {VARIABLE} to_variable {ARRAY}.{VARIABLE}}
-#enddef
-
-#put {NEXT INDEX} after it
-#define FOREACH_FORMAT ARRAY INDEX
- {FOREACH {ARRAY} {INDEX}}
-  {FORMAT {ARRAY}[${INDEX}] x}
-  {FORMAT {ARRAY}[${INDEX}] y}
-#enddef
-
 #define TEST_PATHFIND SRC DST
 [find_path]
     [traveler]
@@ -94,7 +81,6 @@
     variable=path
 [/find_path]
 {VARIABLE nhexes $path.hexes}
-{CHECK_ANSWER nhexes}
 {IF_VAR nhexes equals 0 (
     [then]
         #[wml_message]
@@ -102,41 +88,19 @@
         #    logger=error
         #    to_chat=false
         #[/wml_message]
+        {CHECK_ANSWER nhexes}
     [/then]
     [else]
         {CHECK_ANSWER path.movement_cost}
-        {CHECK_ANSWER path.required_turns}
-        {FOREACH path.steps step}
-            {CHECK_ANSWER (path.steps[$step|].x)}
-            {CHECK_ANSWER (path.steps[$step|].y)}
-        {NEXT step}
+        #{CHECK_ANSWER path.required_turns} Comment this out -- there may be multiple shortest paths, so finding a different shortest path is okay.
+        #{FOREACH path.steps step}
+        #    {CHECK_ANSWER (path.steps[$step|].x)}
+        #    {CHECK_ANSWER (path.steps[$step|].y)}
+        #{NEXT step}
     [/else]
 )}
 #enddef
 
-
-#define TEST_PATHFIND_WITH_OPTS SRC DST ALLOW_MULTIPLE_TURNS CHECK_VISIBILITY CHECK_TELEPORT CHECK_ZOC
-[find_path]
-    [traveler]
-        {SRC}
-    [/traveler]
-    [destination]
-        {DST}
-    [/destination]
-    variable=path
-    allow_multiple_turns = {ALLOW_MULTIPLE_TURNS}
-    check_visibility = {CHECK_VISIBILITY}
-    check_teleport = {CHECK_TELEPORT}
-    check_zoc = {CHECK_ZOC}
-[/find_path]
-{CHECK_ANSWER path.movement_cost}
-{CHECK_ANSWER path.required_turns}
-{FOREACH path.steps step}
-    {CHECK_ANSWER "path.steps[$step|].x"}
-    {CHECK_ANSWER "path.steps[$step|].y"}
-{NEXT step}
-#enddef
-
 #define TEST_NEXT_UNIT TEST_MACRO DST
 [store_locations]
     {DST}
@@ -173,7 +137,7 @@
 [/if]
 #enddef
 
-#define MAKE_TEST ID MACRO
+#define MAKE_TEST ID MACRO INIT_MACRO
 [test]
     name="Unit Test {ID}"
     id={ID}
@@ -183,7 +147,7 @@
         name = side 1 turn 1
         first_time_only=yes
         {VARIABLE GEN_ANS {GENERATE_ANSWERS}}
-        {INIT_ANSWERS}
+        {INIT_ANSWERS ({INIT_MACRO})}
 
         [store_unit]
             [filter]
@@ -385,9 +349,9 @@
 [/test]
 #enddef
 
-{MAKE_TEST characterize_pathfinding_one TEST_PATHFIND}
+{MAKE_TEST characterize_pathfinding_one TEST_PATHFIND GENERATED_FIND_PATH_ANSWERS}
 
-#define MAKE_TEST_INIT_ONLY ID MACRO
+#define MAKE_TEST_INIT_ONLY ID MACRO INIT_MACRO
 [test]
     name="Unit Test {ID}"
     id={ID}
@@ -397,9 +361,97 @@
         name = side 1 turn 1
         first_time_only=yes
         {VARIABLE GEN_ANS {GENERATE_ANSWERS}}
-        {INIT_ANSWERS}
+        {INIT_ANSWERS ({INIT_MACRO})}
+    [/event]
+[/test]
+#enddef
+
+{MAKE_TEST_INIT_ONLY characterize_pathfinding_init TEST_PATHFIND GENERATED_FIND_PATH_ANSWERS}
+
+### Reach test goes below here ###
+
+#define TEST_PATHREACH SRC DST
+[store_reachable_locations]
+    [filter]
+        {SRC}
+    [/filter]
+    variable=r
+[/store_reachable_locations]
+{VARIABLE nlocs $r.length}
+{CHECK_ANSWER nlocs}
+{FOREACH r i}
+    {CHECK_ANSWER (r[$i|].x)}
+    {CHECK_ANSWER (r[$i|].y)}
+{NEXT i}
+#enddef
+
+#define MAKE_SHORT_TEST ID MACRO INIT_MACRO INIT_COUNTER
+[test]
+    name="Unit Test {ID}"
+    id={ID}
+    {test/maps/pathfind_1.cfg}
+
+    [event]
+        name = side 1 turn 1
+        first_time_only=yes
+        {VARIABLE GEN_ANS {GENERATE_ANSWERS}}
+        {INIT_ANSWERS ({INIT_MACRO})}
+
+        [store_unit]
+            [filter]
+            [/filter]
+            variable=units
+        [/store_unit]
+        {VARIABLE unit_counter {INIT_COUNTER}}
+
+        [wml_message]
+            message="$units.length| units"
+            logger=debug
+            to_chat=false
+        [/wml_message]
+
+        {REPEAT 5 (
+            {TEST_NEXT_UNIT {MACRO} (x,y=8,8)}
+        )}
+
+        [wml_message]
+            message="$answer_counter| answers made"
+            logger=debug
+            to_chat=false
+        [/wml_message]
+        {VARIABLE anslength $answers.length}
+        [wml_message]
+            message="$answers.length| anslength"
+            logger=debug
+            to_chat=false
+        [/wml_message]
+
+{IF_GEN_ANS
+       ({ASSERT ({VARIABLE_CONDITIONAL answer_counter equals $anslength})}
+        [wml_message]
+            message="unit counter = $unit_counter"
+            logger=debug
+            to_chat=false
+        [/wml_message]
+        {VARIABLE temp $units.length}
+        [wml_message]
+            message="units.length = $units.length"
+            logger=debug
+            to_chat=false
+        [/wml_message]) 
+()}
+    [/event]
+    [event]
+        name = side 1 turn refresh
+        {RETURN ([true][/true])}
     [/event]
 [/test]
 #enddef
 
-{MAKE_TEST_INIT_ONLY characterize_pathfinding_init TEST_PATHFIND}
+{MAKE_SHORT_TEST characterize_pathfinding_reach_1 TEST_PATHREACH GENERATED_REACHABILITY_ANSWERS_1 0}
+{MAKE_SHORT_TEST characterize_pathfinding_reach_2 TEST_PATHREACH GENERATED_REACHABILITY_ANSWERS_2 20}
+{MAKE_SHORT_TEST characterize_pathfinding_reach_3 TEST_PATHREACH GENERATED_REACHABILITY_ANSWERS_3 40}
+{MAKE_SHORT_TEST characterize_pathfinding_reach_4 TEST_PATHREACH GENERATED_REACHABILITY_ANSWERS_4 60}
+{MAKE_SHORT_TEST characterize_pathfinding_reach_5 TEST_PATHREACH GENERATED_REACHABILITY_ANSWERS_5 80}
+{MAKE_SHORT_TEST characterize_pathfinding_reach_6 TEST_PATHREACH GENERATED_REACHABILITY_ANSWERS_6 100}
+{MAKE_SHORT_TEST characterize_pathfinding_reach_7 TEST_PATHREACH GENERATED_REACHABILITY_ANSWERS_7 120}
diff --git a/wml_test_schedule b/wml_test_schedule
index 5a9a3198a424..6d6b2dfaffd0 100644
--- a/wml_test_schedule
+++ b/wml_test_schedule
@@ -76,6 +76,13 @@
 #
 0 store_locations_one
 0 characterize_pathfinding_one
+0 characterize_pathfinding_reach_1
+0 characterize_pathfinding_reach_2
+0 characterize_pathfinding_reach_3
+0 characterize_pathfinding_reach_4
+0 characterize_pathfinding_reach_5
+0 characterize_pathfinding_reach_6
+0 characterize_pathfinding_reach_7
 #
 # Attack calculations & codepath tests
 #