diff --git a/org/qmckl_distance.org b/org/qmckl_distance.org
index a6cf49a..c435733 100644
--- a/org/qmckl_distance.org
+++ b/org/qmckl_distance.org
@@ -321,7 +321,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"//C_NULL_CHAR, "distance_sq_Xt_2_2"//C_NULL_CHAR, DBLE(C(2,2)))
+  vfc_err = qmckl_probe("distance", "distance_sq_Xt_2_2", C(2,2))
 
   if (test_qmckl_distance_sq == 0) return
 
@@ -329,7 +329,7 @@ integer(qmckl_exit_code) function test_qmckl_distance_sq(context) bind(C)
   test_qmckl_distance_sq = &
        qmckl_distance_sq(context, 't', 'X', m, n, A, LDA, B, LDB, C, LDC)
 
-  vfc_err = qmckl_probe("distance"//C_NULL_CHAR, "distance_sq_tX_2_2"//C_NULL_CHAR, DBLE(C(2,2)))
+  vfc_err = qmckl_probe("distance", "distance_sq_tX_2_2", C(2,2))
 
   if (test_qmckl_distance_sq == 0) return
 
@@ -337,7 +337,7 @@ integer(qmckl_exit_code) function test_qmckl_distance_sq(context) bind(C)
   test_qmckl_distance_sq = &
        qmckl_distance_sq(context, 'T', 't', m, n, A, LDA, B, LDB, C, LDC)
 
-  vfc_err = qmckl_probe_check("distance"//C_NULL_CHAR, "distance_sq_Tt_2_2"//C_NULL_CHAR, DBLE(C(2,2)), DBLE(0), DBLE(1.d-14))
+  vfc_err = qmckl_probe_check("distance", "distance_sq_Tt_2_2", C(2,2), 0.d0, 1.d-14)
 
   if (test_qmckl_distance_sq == 0) return
 
@@ -358,7 +358,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_check("distance"//C_NULL_CHAR, "distance_sq_nT_2_2"//C_NULL_CHAR, DBLE(C(2,2)), DBLE(0), DBLE(1.d-14))
+  vfc_err = qmckl_probe_check("distance", "distance_sq_nT_2_2", C(2,2), 0.d0, 1.d-14)
 
 
   test_qmckl_distance_sq = QMCKL_FAILURE
@@ -377,7 +377,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_check("distance"//C_NULL_CHAR, "distance_sq_Tn_2_2"//C_NULL_CHAR, DBLE(C(2,2)), DBLE(0), DBLE(1.d-14))
+  vfc_err =  qmckl_probe_check("distance", "distance_sq_Tn_2_2", C(2,2), 0.d0, 1.d-14)
 
   if (test_qmckl_distance_sq == 0) return
 
@@ -397,7 +397,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_check("distance"//C_NULL_CHAR, "distance_sq_nN_2_2"//C_NULL_CHAR, DBLE(C(2,2)), DBLE(0), DBLE(1.d-14))
+  vfc_err = qmckl_probe_check("distance", "distance_sq_nN_2_2", C(2,2), 0.d0, 1.d-14)
 
   test_qmckl_distance_sq = QMCKL_FAILURE
 
@@ -756,21 +756,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"//C_NULL_CHAR, "distance_Xt_2_2"//C_NULL_CHAR, DBLE(C(2,2)))
+  vfc_err = qmckl_probe("distance", "distance_Xt_2_2", 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"//C_NULL_CHAR, "distance_tX_2_2"//C_NULL_CHAR, DBLE(C(2,2)))
+  vfc_err = qmckl_probe("distance", "distance_tX_2_2", 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_check("distance"//C_NULL_CHAR, "distance_Tt_2_2"//C_NULL_CHAR, DBLE(C(2,2)), DBLE(0), DBLE(1.d-14))
+  vfc_err = qmckl_probe_check("distance", "distance_Tt_2_2", C(2,2), 0.d0, 1.d-14)
 
   if (test_qmckl_dist == 0) return
 
@@ -791,7 +791,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_check("distance"//C_NULL_CHAR, "distance_nT_2_2"//C_NULL_CHAR, DBLE(C(2,2)), DBLE(0), DBLE(1.d-14))
+  vfc_err = qmckl_probe_check("distance", "distance_nT_2_2", C(2,2), 0.d0, 1.d-14)
 
   if (test_qmckl_dist == 0) return
 
@@ -812,7 +812,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_check("distance"//C_NULL_CHAR, "distance_Tn_2_2"//C_NULL_CHAR, DBLE(C(2,2)), DBLE(0), DBLE(1.d-14))
+  vfc_err = qmckl_probe_check("distance", "distance_Tn_2_2", C(2,2), 0.d0, 1.d-14)
 
   if (test_qmckl_dist == 0) return
 
@@ -833,7 +833,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_check("distance"//C_NULL_CHAR, "distance_nN_2_2"//C_NULL_CHAR, DBLE(C(2,2)), DBLE(0), DBLE(1.d-14))
+  vfc_err = qmckl_probe_check("distance", "distance_nN_2_2", C(2,2), 0.d0, 1.d-14)
 
   if (test_qmckl_dist == 0) return