diff --git a/org/qmckl_ao.org b/org/qmckl_ao.org
index 3c76163..f1edca1 100644
--- a/org/qmckl_ao.org
+++ b/org/qmckl_ao.org
@@ -1772,8 +1772,21 @@ integer(c_int32_t) function test_qmckl_ao_gaussian_vgl(context) bind(C)
   test_qmckl_ao_gaussian_vgl = &
        qmckl_ao_gaussian_vgl(context, X, R, n, A, VGL, ldv)
 
-  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "gaussian_vgl"//C_NULL_CHAR, &
-    DBLE(test_qmckl_ao_gaussian_vgl))
+  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "gaussian_vgl_2,1"//C_NULL_CHAR, &
+    DBLE(VGL(2,1)))
+
+  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "gaussian_vgl_2,2"//C_NULL_CHAR, &
+    DBLE(VGL(2,2)))
+
+  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "gaussian_vgl_2,3"//C_NULL_CHAR, &
+    DBLE(VGL(2,3)))
+
+  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "gaussian_vgl_2,4"//C_NULL_CHAR, &
+    DBLE(VGL(2,4)))
+
+  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "gaussian_vgl_2,5"//C_NULL_CHAR, &
+    DBLE(VGL(2,5)))
+
 
   if (test_qmckl_ao_gaussian_vgl /= 0) return
 
@@ -2834,8 +2847,8 @@ integer(c_int32_t) function test_qmckl_ao_power(context) bind(C)
 
   test_qmckl_ao_power = qmckl_ao_power(context, n, X, LMAX, P, LDP)
 
-  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "power"//C_NULL_CHAR, &
-    DBLE(test_qmckl_ao_power))
+  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "power_2,2"//C_NULL_CHAR, &
+    DBLE(P(2,2)))
 
   if (test_qmckl_ao_power /= QMCKL_SUCCESS) return
 
@@ -3174,8 +3187,20 @@ integer(c_int32_t) function test_qmckl_ao_polynomial_vgl(context) bind(C)
   test_qmckl_ao_polynomial_vgl = &
        qmckl_ao_polynomial_vgl(context, X, R, lmax, n, L, ldl, VGL, ldv)
 
-  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "polynomial_vgl"//C_NULL_CHAR, &
-    DBLE(test_qmckl_ao_polynomial_vgl))
+  vfc_err = <("ao"//C_NULL_CHAR, "polynomial_vgl_1,2"//C_NULL_CHAR, &
+    DBLE(VGL(1,2)))
+
+  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "polynomial_vgl_2,2"//C_NULL_CHAR, &
+    DBLE(VGL(2,2)))
+
+  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "polynomial_vgl_3,2"//C_NULL_CHAR, &
+    DBLE(VGL(3,2)))
+
+  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "polynomial_vgl_4,2"//C_NULL_CHAR, &
+    DBLE(VGL(4,2)))
+
+  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "polynomial_vgl_5,2"//C_NULL_CHAR, &
+    DBLE(VGL(5,2)))
 
   if (test_qmckl_ao_polynomial_vgl /= QMCKL_SUCCESS) return
   if (n /= d) return
diff --git a/org/qmckl_distance.org b/org/qmckl_distance.org
index 816364d..6ed9091 100644
--- a/org/qmckl_distance.org
+++ b/org/qmckl_distance.org
@@ -323,7 +323,7 @@ integer(qmckl_exit_code) function test_qmckl_distance_sq(context) bind(C)
   test_qmckl_distance_sq = &
        qmckl_distance_sq(context, 'X', 't', m, n, A, LDA, B, LDB, C, LDC)
 
-  vfc_err = qmckl_probe("distance", "distance_sq_Xt", DBLE(C(2,2)))
+  vfc_err = qmckl_probe("distance", "distance_sq_Xt_2,2", DBLE(C(2,2)))
 
   if (test_qmckl_distance_sq == 0) return
 
@@ -331,14 +331,14 @@ integer(qmckl_exit_code) function test_qmckl_distance_sq(context) bind(C)
        qmckl_distance_sq(context, 't', 'X', m, n, A, LDA, B, LDB, C, LDC)
 
 
-  vfc_err = qmckl_probe("distance", "distance_sq_tX", DBLE(C(2,2)))
+  vfc_err = qmckl_probe("distance", "distance_sq_tX_2,2", DBLE(C(2,2)))
 
   if (test_qmckl_distance_sq == 0) return
 
   test_qmckl_distance_sq = &
        qmckl_distance_sq(context, 'T', 't', m, n, A, LDA, B, LDB, C, LDC)
 
-  vfc_err = qmckl_probe("distance", "distance_sq_Tt", DBLE(C(2,2)))
+  vfc_err = qmckl_probe("distance", "distance_sq_Tt_2,2", DBLE(C(2,2)))
 
   if (test_qmckl_distance_sq == 0) return
 
@@ -359,7 +359,7 @@ integer(qmckl_exit_code) function test_qmckl_distance_sq(context) bind(C)
   test_qmckl_distance_sq = &
        qmckl_distance_sq(context, 'n', 'T', m, n, A, LDA, B, LDB, C, LDC)
 
-  vfc_err = qmckl_probe("distance", "distance_sq_nT", DBLE(C(2,2)))
+  vfc_err = qmckl_probe("distance", "distance_sq_nT_2,2", DBLE(C(2,2)))
 
   if (test_qmckl_distance_sq == 0) return
 
@@ -380,7 +380,7 @@ integer(qmckl_exit_code) function test_qmckl_distance_sq(context) bind(C)
   test_qmckl_distance_sq = &
        qmckl_distance_sq(context, 'T', 'n', m, n, A, LDA, B, LDB, C, LDC)
 
-  vfc_err =  qmckl_probe("distance", "distance_sq_Tn", DBLE(C(2,2)))
+  vfc_err =  qmckl_probe("distance", "distance_sq_Tn_2,2", DBLE(C(2,2)))
 
   if (test_qmckl_distance_sq == 0) return
 
@@ -401,7 +401,7 @@ integer(qmckl_exit_code) function test_qmckl_distance_sq(context) bind(C)
   test_qmckl_distance_sq = &
        qmckl_distance_sq(context, 'n', 'N', m, n, A, LDA, B, LDB, C, LDC)
 
-  vfc_err = qmckl_probe("distance", "distance_sq_nN", DBLE(C(2,2)))
+  vfc_err = qmckl_probe("distance", "distance_sq_nN_2,2", DBLE(C(2,2)))
 
   if (test_qmckl_distance_sq == 0) return
 
@@ -760,21 +760,21 @@ integer(qmckl_exit_code) function test_qmckl_dist(context) bind(C)
   test_qmckl_dist = &
        qmckl_distance(context, 'X', 't', m, n, A, LDA, B, LDB, C, LDC)
 
-  vfc_err = qmckl_probe("distance", "distance_Xt", DBLE(C(2,2)))
+  vfc_err = qmckl_probe("distance", "distance_Xt_2,2", DBLE(C(2,2)))
 
   if (test_qmckl_dist == 0) return
 
   test_qmckl_dist = &
        qmckl_distance(context, 't', 'X', m, n, A, LDA, B, LDB, C, LDC)
 
-  vfc_err = qmckl_probe("distance", "distance_tX", DBLE(C(2,2)))
+  vfc_err = qmckl_probe("distance", "distance_tX_2,2", DBLE(C(2,2)))
 
   if (test_qmckl_dist == 0) return
 
   test_qmckl_dist = &
        qmckl_distance(context, 'T', 't', m, n, A, LDA, B, LDB, C, LDC)
 
-  vfc_err = qmckl_probe("distance", "distance_Tt", DBLE(C(2,2)))
+  vfc_err = qmckl_probe("distance", "distance_Tt_2,2", DBLE(C(2,2)))
 
   if (test_qmckl_dist == 0) return
 
@@ -795,7 +795,7 @@ integer(qmckl_exit_code) function test_qmckl_dist(context) bind(C)
   test_qmckl_dist = &
        qmckl_distance(context, 'n', 'T', m, n, A, LDA, B, LDB, C, LDC)
 
-  vfc_err = qmckl_probe("distance", "distance_nT", DBLE(C(2,2)))
+  vfc_err = qmckl_probe("distance", "distance_nT_2,2", DBLE(C(2,2)))
 
   if (test_qmckl_dist == 0) return
 
@@ -816,7 +816,7 @@ integer(qmckl_exit_code) function test_qmckl_dist(context) bind(C)
   test_qmckl_dist = &
        qmckl_distance(context, 'T', 'n', m, n, A, LDA, B, LDB, C, LDC)
 
-  vfc_err = qmckl_probe("distance", "distance_Tn", DBLE(C(2,2)))
+  vfc_err = qmckl_probe("distance", "distance_Tn_2,2", DBLE(C(2,2)))
 
   if (test_qmckl_dist == 0) return
 
@@ -837,7 +837,7 @@ integer(qmckl_exit_code) function test_qmckl_dist(context) bind(C)
   test_qmckl_dist = &
        qmckl_distance(context, 'n', 'N', m, n, A, LDA, B, LDB, C, LDC)
 
-  vfc_err = qmckl_probe("distance", "distance_nN", DBLE(C(2,2)))
+  vfc_err = qmckl_probe("distance", "distance_nN_2,2", DBLE(C(2,2)))
 
   if (test_qmckl_dist == 0) return