diff --git a/src/DrawResources/CURVES.tcl b/src/DrawResources/CURVES.tcl
index 0d99966235..40b281ee2a 100755
--- a/src/DrawResources/CURVES.tcl
+++ b/src/DrawResources/CURVES.tcl
@@ -15,6 +15,8 @@
 # purpose or non-infringement. Please see the License for the specific terms
 # and conditions governing the rights and limitations under the License.
 
+if { [info commands addmenu] == "" } { return }
+
 addmenu Curves "Line"    {
     dialbox line name l origin {0 0 0} direction {1 0 0}
 }
diff --git a/src/DrawResources/SURFACES.tcl b/src/DrawResources/SURFACES.tcl
index 176e5a9d70..d15b5e4b84 100755
--- a/src/DrawResources/SURFACES.tcl
+++ b/src/DrawResources/SURFACES.tcl
@@ -15,6 +15,8 @@
 # purpose or non-infringement. Please see the License for the specific terms
 # and conditions governing the rights and limitations under the License.
 
+if { [info commands addmenu] == "" } { return }
+
 proc dialanasurf {command sname args} {
     set com "dialbox $command name $sname origin {0 0 0} normal {0 0 1} xdir {1 0 0} "
     foreach l $args {append com " $l"}
diff --git a/src/DrawResources/TKTopTest.tcl b/src/DrawResources/TKTopTest.tcl
index ffc74bec48..9bd4513e97 100755
--- a/src/DrawResources/TKTopTest.tcl
+++ b/src/DrawResources/TKTopTest.tcl
@@ -16,5 +16,5 @@
 # and conditions governing the rights and limitations under the License.
 
 set Draw_GEOMETRY 1
-catch {source $env(CASROOT)/src/DrawResources/CURVES.tcl}
-catch {source $env(CASROOT)/src/DrawResources/SURFACES.tcl}
+source $env(CASROOT)/src/DrawResources/CURVES.tcl
+source $env(CASROOT)/src/DrawResources/SURFACES.tcl
diff --git a/src/DrawResources/TestCommands.tcl b/src/DrawResources/TestCommands.tcl
index f2b675bf16..d29235d5ca 100644
--- a/src/DrawResources/TestCommands.tcl
+++ b/src/DrawResources/TestCommands.tcl
@@ -324,10 +324,15 @@ proc testgrid {logdir args} {
 	# final 'exit' is needed when running on Linux under VirtualGl
 	puts $fd_cmd "exit"
 	close $fd_cmd
-	set command "exec DRAWEXE -f $logdir/$group/$grid/${casename}.tcl"
+
+        # commant to run DRAW with a command file;
+        # note that empty string is passed as standard input to avoid possible 
+        # hang-ups due to waiting for stdin of the launching process
+	set command "exec <<{} DRAWEXE -f $logdir/$group/$grid/${casename}.tcl"
+
 	# alternative method to run without temporary file; disabled as it needs too many backslashes
 #	else {
-#	    set command "exec DRAWEXE -c $imgdir_cmd\\\; set test_image $casename\\\; \
+#	    set command "exec <<\"\" DRAWEXE -c $imgdir_cmd\\\; set test_image $casename\\\; \
 #		         _run_test $dir $group $grid $casefile\\\; \
 #		         puts \\\[dlog get\\\]\\\; exit"
 #	}
@@ -506,24 +511,11 @@ proc _run_test {scriptsdir group gridname casefile} {
 	}
     }
 
-    # set datadir for this test case
-    if { [info exists env(CSF_TestDataPath)] } {
-	foreach ddir [regsub -all ";" [regsub "\\\\" $env(CSF_TestDataPath) "/"] " "] {
-	    if { [file isdirectory $ddir/$group] } {
-		set save_datadir [datadir]
-		datadir $ddir/$group
-		break
-	    }
-	}
-    }
-    if { ! [info exists save_datadir] } {
-	puts "Warning: no data directory found for group $group in path defined by CSF_TestDataPath"
-	set save_datadir [datadir]
-    }
-
     # evaluate test case 
     if [catch {
 	uplevel set casename [file tail $casefile]
+	uplevel set groupname $group
+	uplevel set gridname $gridname
 
         if { [file exists $scriptsdir/$group/begin] } {
 	    puts "Executing $scriptsdir/$group/begin..."; flush stdout
@@ -549,8 +541,6 @@ proc _run_test {scriptsdir group gridname casefile} {
 	puts "Tcl Exception: $res"
     }
 
-    datadir $save_datadir
-
     # stop logging
     if { $dlog_exists } {
 	rename puts {}
@@ -558,6 +548,9 @@ proc _run_test {scriptsdir group gridname casefile} {
 	dlog off
     }
 
+    # stop cpulimit killer if armed by the test
+    cpulimit
+
     # add timing info
     uplevel dchrono _timer stop
     set time [uplevel dchrono _timer show]
@@ -1154,44 +1147,46 @@ proc _path_separator {} {
 #   environment variable CSF_TestDataPath
 # If file is not found, raises Tcl error.
 proc locate_data_file {filename} {
-    global env
+    global env groupname gridname casename
 
     set scriptfile [info script]
     if { $scriptfile == "" } {
 	error "Error: This procedure (locate_data_file) is for use only in test scripts!"
     }
 
-    # look in subdirectories 'data' of grid and group directories
-    set scriptdir [file normalize [file dirname $scriptfile]]
-    if { [file tail $scriptdir] == "data" } {
-	if [file exists $scriptdir/$filename] {
-	    return $scriptdir/$filename
+    # check sub-directories data of the test case grid directory
+    # the current test case in paths indicated by CSF_TestScriptsPath
+    if { [info exists groupname] && [info exists gridname] && 
+         [info exists env(CSF_TestScriptsPath)] } {
+	foreach dir [_split_path $env(CSF_TestScriptsPath)] {
+	    if { [file exists $dir/$groupname/$gridname/data/$filename] } {
+		return [file normalize $dir/$groupname/$gridname/data/$filename]
+	    }
+	    if { [file exists $dir/$groupname/data/$filename] } {
+		return [file normalize $dir/$groupname/data/$filename]
+	    }
 	}
-    } else {
-	if [file exists $scriptdir/data/$filename] {
-	    return [file normalize $scriptdir/data/$filename]
-	}
-    }
-    if [file exists $scriptdir/../data/$filename] {
-	return [file normalize $scriptdir/../data/$filename]
     }
 
     # check sub-directories corresponding to group and grid of
     # the current test case in paths indicated by CSF_TestDataPath
-    if [info exists env(CSF_TestDataPath)] {
-	set grid [file tail $scriptdir]
-	set group [file tail [file dirname $scriptdir]]
+    if { [info exists groupname] && [info exists env(CSF_TestDataPath)] } {
 	foreach dir [_split_path $env(CSF_TestDataPath)] {
-	    if [file exists $dir/$group/$grid/$filename] {
-		return [file normalize $dir/$group/$grid/$filename]
+	    if { [info exists gridname] && [file exists $dir/$groupname/$gridname/$filename] } {
+		return [file normalize $dir/$groupname/$gridname/$filename]
 	    }
-	    if [file exists $dir/$group/$filename] {
-		return [file normalize $dir/$group/$filename]
+	    if { [file exists $dir/$groupname/$filename] } {
+		return [file normalize $dir/$groupname/$filename]
 	    }
 	}
     }
 
+    # check datadir
+    if { [file exists [uplevel datadir]/$filename] } {
+	return [uplevel datadir]/$filename
+    }
+
     # raise error
     error [join [list "Error: file $filename could not be found neither in script" \
 		      "directories nor in paths indicated by CSF_TestDataPath environment variable"] "\n"]
-}
\ No newline at end of file
+}
diff --git a/tests/3rdparty/begin b/tests/3rdparty/begin
index fc13c91486..81db90d041 100755
--- a/tests/3rdparty/begin
+++ b/tests/3rdparty/begin
@@ -1,7 +1,3 @@
-if { [string compare [datadir] "."] == 0 } {
-   datadir [file dirname [info script]]/data
-}
-
 cpulimit 1000
 
 if { [array get Draw_Groups "Primitive building commands"] == "" } {
@@ -19,12 +15,4 @@ if { [info exists test_image ] == 0 } {
    set test_image photo
 }
 
-if { [info exists WorkDirectory] == 0 } {
-    set WorkDirectory "/tmp"
-    if { [array get env TEMP] != "" } {
-	set WorkDirectory "$env(TEMP)"
-    }
-}
-                    
 vinit
-        
diff --git a/tests/3rdparty/export/A1 b/tests/3rdparty/export/A1
index b38c88f6ba..34a0771235 100755
--- a/tests/3rdparty/export/A1
+++ b/tests/3rdparty/export/A1
@@ -8,11 +8,11 @@ if { [array get Draw_Groups "XSTEP-STL/VRML"] == "" } {
     pload XSDRAW
 }
 
-meshfromstl m [datadir]/shape.stl
+meshfromstl m [locate_data_file shape.stl]
 
 meshdispmode m 34
 
-set aFile $WorkDirectory/shape.pdf
+set aFile $imagedir/shape.pdf
 
 set format PDF
 
diff --git a/tests/3rdparty/export/A2 b/tests/3rdparty/export/A2
index bf3b15121f..58a3f71f8a 100755
--- a/tests/3rdparty/export/A2
+++ b/tests/3rdparty/export/A2
@@ -30,7 +30,7 @@ vaxis ax1 100 100 100 100 100 0
 box a 110 110 110 200 200 200
 vdisplay a
 
-set aFile $WorkDirectory/ExportToPDF.pdf
+set aFile $imagedir/ExportToPDF.pdf
 
 set format PDF
 
diff --git a/tests/3rdparty/export/A3 b/tests/3rdparty/export/A3
index eba7cb03c0..39bef0f8bc 100644
--- a/tests/3rdparty/export/A3
+++ b/tests/3rdparty/export/A3
@@ -30,7 +30,7 @@ vaxis ax1 100 100 100 100 100 0
 box a 110 110 110 200 200 200
 vdisplay a
 
-set aFile $WorkDirectory/ExportToPS.ps
+set aFile $imagedir/ExportToPS.ps
 
 set format PS
 
diff --git a/tests/3rdparty/export/A4 b/tests/3rdparty/export/A4
index c441ef1b58..a54a8134c2 100644
--- a/tests/3rdparty/export/A4
+++ b/tests/3rdparty/export/A4
@@ -30,7 +30,7 @@ vaxis ax1 100 100 100 100 100 0
 box a 110 110 110 200 200 200
 vdisplay a
 
-set aFile $WorkDirectory/ExportToEPS.eps
+set aFile $imagedir/ExportToEPS.eps
 
 set format EPS
 
diff --git a/tests/3rdparty/export/A5 b/tests/3rdparty/export/A5
index d2f070d985..b171205a88 100644
--- a/tests/3rdparty/export/A5
+++ b/tests/3rdparty/export/A5
@@ -30,7 +30,7 @@ vaxis ax1 100 100 100 100 100 0
 box a 110 110 110 200 200 200
 vdisplay a
 
-set aFile $WorkDirectory/ExportToTEX.tex
+set aFile $imagedir/ExportToTEX.tex
 
 set format TEX
 
diff --git a/tests/3rdparty/export/A6 b/tests/3rdparty/export/A6
index 69cfd51b5a..a5715ab2ba 100644
--- a/tests/3rdparty/export/A6
+++ b/tests/3rdparty/export/A6
@@ -30,7 +30,7 @@ vaxis ax1 100 100 100 100 100 0
 box a 110 110 110 200 200 200
 vdisplay a
 
-set aFile $WorkDirectory/ExportToSVG.svg
+set aFile $imagedir/ExportToSVG.svg
 
 set format SVG
 
diff --git a/tests/3rdparty/export/A7 b/tests/3rdparty/export/A7
index ec21f39d16..750628d49b 100644
--- a/tests/3rdparty/export/A7
+++ b/tests/3rdparty/export/A7
@@ -30,7 +30,7 @@ vaxis ax1 100 100 100 100 100 0
 box a 110 110 110 200 200 200
 vdisplay a
 
-set aFile $WorkDirectory/ExportToPGF.pgf
+set aFile $imagedir/ExportToPGF.pgf
 
 set format PGF
 
diff --git a/tests/blend/buildevol/F6 b/tests/blend/buildevol/F6
index 2f72c52e83..2f260b03b3 100644
--- a/tests/blend/buildevol/F6
+++ b/tests/blend/buildevol/F6
@@ -6,7 +6,7 @@
 #cut s s1 s2
 #save s L12.draw 
 
-restore L12.draw s
+restore [locate_data_file L12.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 mkevol result s
diff --git a/tests/blend/buildevol/F9 b/tests/blend/buildevol/F9
old mode 100755
new mode 100644
index e9859acce5..74886fef63
--- a/tests/blend/buildevol/F9
+++ b/tests/blend/buildevol/F9
@@ -1,4 +1,4 @@
-restore 2_O12.draw s
+restore [locate_data_file 2_O12.draw] s
 explode s e
 
 mkevol result s
diff --git a/tests/blend/buildevol/G2 b/tests/blend/buildevol/G2
index ec8e90d1f4..3e60630027 100644
--- a/tests/blend/buildevol/G2
+++ b/tests/blend/buildevol/G2
@@ -4,7 +4,7 @@
 #cut s s1 s2
 #save s A1234.draw 
 
-restore A1234.draw s
+restore [locate_data_file A1234.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 mkevol result s
diff --git a/tests/blend/buildevol/G3 b/tests/blend/buildevol/G3
index 24ff3aa515..909d63d9af 100644
--- a/tests/blend/buildevol/G3
+++ b/tests/blend/buildevol/G3
@@ -4,7 +4,7 @@
 #fuse s s1 s2
 #save s A5678.draw 
 
-restore A5678.draw s
+restore [locate_data_file A5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 mkevol result s
diff --git a/tests/blend/buildevol/G4 b/tests/blend/buildevol/G4
index 885700f529..700d4435cb 100644
--- a/tests/blend/buildevol/G4
+++ b/tests/blend/buildevol/G4
@@ -5,7 +5,7 @@
 #cut s s1 s2
 #save s B1234.draw 
 
-restore B1234.draw s
+restore [locate_data_file B1234.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 mkevol result s
diff --git a/tests/blend/buildevol/G5 b/tests/blend/buildevol/G5
index e02c5e238e..6eed8ca6e0 100644
--- a/tests/blend/buildevol/G5
+++ b/tests/blend/buildevol/G5
@@ -5,7 +5,7 @@
 #fuse s s1 s2
 #save s B5678.draw 
 
-restore B5678.draw s
+restore [locate_data_file B5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 mkevol result s
diff --git a/tests/blend/buildevol/G6 b/tests/blend/buildevol/G6
index 2ef66c203f..dd82ddb2b9 100644
--- a/tests/blend/buildevol/G6
+++ b/tests/blend/buildevol/G6
@@ -5,7 +5,7 @@
 #fuse s s1 s2
 #save s C5678.draw 
 
-restore C5678.draw s
+restore [locate_data_file C5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 mkevol result s
diff --git a/tests/blend/buildevol/G7 b/tests/blend/buildevol/G7
index 57b1a64c7c..0c2a95b4d4 100644
--- a/tests/blend/buildevol/G7
+++ b/tests/blend/buildevol/G7
@@ -5,7 +5,7 @@
 #cut s s1 s2
 #save s D1234.draw 
 
-restore D1234.draw s
+restore [locate_data_file D1234.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 mkevol result s
diff --git a/tests/blend/buildevol/G8 b/tests/blend/buildevol/G8
index f6a63f2dfa..ae61b3c1ab 100644
--- a/tests/blend/buildevol/G8
+++ b/tests/blend/buildevol/G8
@@ -4,7 +4,7 @@
 #fuse s s1 s2
 #save s D5678.draw 
 
-restore D5678.draw s
+restore [locate_data_file D5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 mkevol result s
diff --git a/tests/blend/buildevol/G9 b/tests/blend/buildevol/G9
index 0e1bccb3bb..a30f16d107 100644
--- a/tests/blend/buildevol/G9
+++ b/tests/blend/buildevol/G9
@@ -5,7 +5,7 @@
 #fuse s s1 s2
 #save s E5678.draw 
 
-restore E5678.draw s
+restore [locate_data_file E5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 mkevol result s
diff --git a/tests/blend/buildevol/H1 b/tests/blend/buildevol/H1
index f88fe1b52b..aa32f4e626 100644
--- a/tests/blend/buildevol/H1
+++ b/tests/blend/buildevol/H1
@@ -5,7 +5,7 @@
 #cut s s1 s2
 #save s F1234.draw 
 
-restore F1234.draw s
+restore [locate_data_file F1234.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 mkevol result s
diff --git a/tests/blend/buildevol/H2 b/tests/blend/buildevol/H2
index 2eaa9fb736..ba44231350 100644
--- a/tests/blend/buildevol/H2
+++ b/tests/blend/buildevol/H2
@@ -5,7 +5,7 @@
 #fuse s s1 s2
 #save s F5678.draw 
 
-restore F5678.draw s
+restore [locate_data_file F5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 mkevol result s
diff --git a/tests/blend/buildevol/H3 b/tests/blend/buildevol/H3
index 9be9c8011a..43f1113aa8 100644
--- a/tests/blend/buildevol/H3
+++ b/tests/blend/buildevol/H3
@@ -6,7 +6,7 @@
 #cut s s1 s2
 #save s G1234.draw 
 
-restore G1234.draw s
+restore [locate_data_file G1234.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 mkevol result s
diff --git a/tests/blend/buildevol/H4 b/tests/blend/buildevol/H4
index ef59fe5f00..06bf0694e3 100644
--- a/tests/blend/buildevol/H4
+++ b/tests/blend/buildevol/H4
@@ -6,7 +6,7 @@
 #fuse s s1 s2
 #save s G5678.draw 
 
-restore G5678.draw s
+restore [locate_data_file G5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 mkevol result s
diff --git a/tests/blend/buildevol/H5 b/tests/blend/buildevol/H5
index 89c705be92..d661067da0 100644
--- a/tests/blend/buildevol/H5
+++ b/tests/blend/buildevol/H5
@@ -5,7 +5,7 @@
 #cut s s1 s2
 #save s H1234.draw 
 
-restore H1234.draw s
+restore [locate_data_file H1234.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 mkevol result s
diff --git a/tests/blend/buildevol/H6 b/tests/blend/buildevol/H6
index f852aefa1c..84972a26df 100644
--- a/tests/blend/buildevol/H6
+++ b/tests/blend/buildevol/H6
@@ -5,7 +5,7 @@
 #fuse s s1 s2
 #save s H5678.draw 
 
-restore H5678.draw s
+restore [locate_data_file H5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 mkevol result s
diff --git a/tests/blend/buildevol/H7 b/tests/blend/buildevol/H7
index 17c146c842..f16a089598 100644
--- a/tests/blend/buildevol/H7
+++ b/tests/blend/buildevol/H7
@@ -5,7 +5,7 @@
 #cut s s1 s2
 #save s I1234.draw 
 
-restore I1234.draw s
+restore [locate_data_file I1234.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 mkevol result s
diff --git a/tests/blend/buildevol/H8 b/tests/blend/buildevol/H8
index 911541b66f..f6091905c0 100644
--- a/tests/blend/buildevol/H8
+++ b/tests/blend/buildevol/H8
@@ -5,7 +5,7 @@
 #fuse s s1 s2
 #save s I5678.draw 
 
-restore I5678.draw s
+restore [locate_data_file I5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 mkevol result s
diff --git a/tests/blend/buildevol/H9 b/tests/blend/buildevol/H9
index 5562402115..39244cfd09 100644
--- a/tests/blend/buildevol/H9
+++ b/tests/blend/buildevol/H9
@@ -3,7 +3,7 @@
 #ttranslate c 0 0 10
 #fuse s b c
 
-restore 6_A1234.draw s
+restore [locate_data_file 6_A1234.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 mkevol result s
diff --git a/tests/blend/buildevol/I1 b/tests/blend/buildevol/I1
index 9721ba895b..ab41df4c0b 100644
--- a/tests/blend/buildevol/I1
+++ b/tests/blend/buildevol/I1
@@ -3,7 +3,7 @@
 #ttranslate c 0 0 10
 #fuse s b c
 
-restore 6_A1234.draw s
+restore [locate_data_file 6_A1234.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 mkevol result s
diff --git a/tests/blend/buildevol/I2 b/tests/blend/buildevol/I2
index 6d7f37eaeb..6ef7d9443f 100644
--- a/tests/blend/buildevol/I2
+++ b/tests/blend/buildevol/I2
@@ -8,7 +8,7 @@
 #fuse s f1 c
 #donly s
 
-restore 6_A56.draw s
+restore [locate_data_file 6_A56.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 mkevol result s
diff --git a/tests/blend/buildevol/I3 b/tests/blend/buildevol/I3
index d68aab388b..4a79fbd373 100644
--- a/tests/blend/buildevol/I3
+++ b/tests/blend/buildevol/I3
@@ -2,7 +2,7 @@
 #pcone c 13 5 20
 #fuse s b c
 
-restore 6_B1234.draw s
+restore [locate_data_file 6_B1234.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 mkevol result s
diff --git a/tests/blend/buildevol/I4 b/tests/blend/buildevol/I4
index 84f4acb657..169fde53ce 100644
--- a/tests/blend/buildevol/I4
+++ b/tests/blend/buildevol/I4
@@ -2,7 +2,7 @@
 #pcone c 13 5 20
 #fuse s b c
 
-restore 6_B1234.draw s
+restore [locate_data_file 6_B1234.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 mkevol result s
diff --git a/tests/blend/buildevol/I5 b/tests/blend/buildevol/I5
index 6de4df3dd8..2bff48c906 100644
--- a/tests/blend/buildevol/I5
+++ b/tests/blend/buildevol/I5
@@ -7,7 +7,7 @@
 #fuse s f1 c
 #donly s
 
-restore 6_B56.draw s
+restore [locate_data_file 6_B56.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 mkevol result s
diff --git a/tests/blend/buildevol/I6 b/tests/blend/buildevol/I6
index 24a56a3430..92af637c8f 100644
--- a/tests/blend/buildevol/I6
+++ b/tests/blend/buildevol/I6
@@ -1,7 +1,7 @@
 #box b -15 -15 -15 30 30 15
 #psphere s 13 0 90 
 #fuse s s b
-restore 6_C1234.draw s
+restore [locate_data_file 6_C1234.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 mkevol result s
diff --git a/tests/blend/buildevol/I7 b/tests/blend/buildevol/I7
index f22c38b06d..ab7a27fa9c 100644
--- a/tests/blend/buildevol/I7
+++ b/tests/blend/buildevol/I7
@@ -2,7 +2,7 @@
 #psphere s 13 0 90 
 #fuse s s b
 
-restore 6_C1234.draw s
+restore [locate_data_file 6_C1234.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 mkevol result s
diff --git a/tests/blend/buildevol/I8 b/tests/blend/buildevol/I8
index 4216ab3d05..68643d7b42 100644
--- a/tests/blend/buildevol/I8
+++ b/tests/blend/buildevol/I8
@@ -6,7 +6,7 @@
 #ttranslate c 0 0 -10
 #fuse s f1 c
 
-restore 6_C56.draw s
+restore [locate_data_file 6_C56.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 mkevol result s
diff --git a/tests/blend/buildevol/I9 b/tests/blend/buildevol/I9
index 75fcba80d3..902aa5d39e 100644
--- a/tests/blend/buildevol/I9
+++ b/tests/blend/buildevol/I9
@@ -2,7 +2,7 @@
 #ptorus s 20 5 0 90
 #fuse s s b
 
-restore 6_D1234.draw s
+restore [locate_data_file 6_D1234.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 mkevol result s
diff --git a/tests/blend/buildevol/J1 b/tests/blend/buildevol/J1
index 35965e7b06..bb35198498 100644
--- a/tests/blend/buildevol/J1
+++ b/tests/blend/buildevol/J1
@@ -2,7 +2,7 @@
 #ptorus s 20 5 0 90
 #fuse s s b
 
-restore 6_D1234.draw s
+restore [locate_data_file 6_D1234.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 mkevol result s
diff --git a/tests/blend/buildevol/J2 b/tests/blend/buildevol/J2
index fc51212e59..afeddc4b47 100644
--- a/tests/blend/buildevol/J2
+++ b/tests/blend/buildevol/J2
@@ -6,7 +6,7 @@
 #ttranslate c 0 0 -10
 #fuse s f1 c
 
-restore 6_D56.draw s
+restore [locate_data_file 6_D56.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 mkevol result s
diff --git a/tests/blend/buildevol/J3 b/tests/blend/buildevol/J3
index 69e5e31044..a6c2855de9 100644
--- a/tests/blend/buildevol/J3
+++ b/tests/blend/buildevol/J3
@@ -6,7 +6,7 @@
 #trotate s 0 0 0 1 1 0 -40
 #trotate s 0 0 0 0 0 1 -10
 
-restore 6_E1234.draw s
+restore [locate_data_file 6_E1234.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 mkevol result s
diff --git a/tests/blend/buildevol/J4 b/tests/blend/buildevol/J4
index 60c4d8c4c7..cc1269432e 100644
--- a/tests/blend/buildevol/J4
+++ b/tests/blend/buildevol/J4
@@ -6,7 +6,7 @@
 #trotate s 0 0 0 1 1 0 -40
 #trotate s 0 0 0 0 0 1 -10
 
-restore 6_E1234.draw s
+restore [locate_data_file 6_E1234.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 mkevol result s
diff --git a/tests/blend/buildevol/J5 b/tests/blend/buildevol/J5
index dfe2c4c923..b35d098bbf 100644
--- a/tests/blend/buildevol/J5
+++ b/tests/blend/buildevol/J5
@@ -13,7 +13,7 @@
 #explode s F
 #glue s c s c_3 s_2
 
-restore 6_E56.draw s
+restore [locate_data_file 6_E56.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 mkevol result s
diff --git a/tests/blend/buildevol/J6 b/tests/blend/buildevol/J6
index fc85f6bf2d..eaaa34b9a6 100644
--- a/tests/blend/buildevol/J6
+++ b/tests/blend/buildevol/J6
@@ -6,7 +6,7 @@
 #prism f w 2 0 30
 #fuse s f b
 
-restore 6_F1234.draw s
+restore [locate_data_file 6_F1234.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 mkevol result s
diff --git a/tests/blend/buildevol/J7 b/tests/blend/buildevol/J7
index 7d51084433..c6554bd80c 100644
--- a/tests/blend/buildevol/J7
+++ b/tests/blend/buildevol/J7
@@ -6,7 +6,7 @@
 #prism f w 2 0 30
 #fuse s f b
 
-restore 6_F1234.draw s
+restore [locate_data_file 6_F1234.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 mkevol result s
diff --git a/tests/blend/buildevol/J8 b/tests/blend/buildevol/J8
index 3d87ee23d1..d889c387cf 100644
--- a/tests/blend/buildevol/J8
+++ b/tests/blend/buildevol/J8
@@ -10,7 +10,7 @@
 #ttranslate c 0 0 -10
 #fuse s f1 c
 
-restore 6_F56.draw s
+restore [locate_data_file 6_F56.draw] s
 tscale s 0 0 0 SCALE2
 nexplode s E
 mkevol result s
diff --git a/tests/blend/buildevol/J9 b/tests/blend/buildevol/J9
index e99a3543bf..16d750b5ca 100644
--- a/tests/blend/buildevol/J9
+++ b/tests/blend/buildevol/J9
@@ -11,7 +11,7 @@
 #explode p F
 #glue s p b p_2 b_2
 
-restore 6_G1234.draw s
+restore [locate_data_file 6_G1234.draw] s
 tscale s 0 0 0 SCALE2
 explode  s E
 mkevol result s
diff --git a/tests/blend/buildevol/K1 b/tests/blend/buildevol/K1
index 0b033366ec..412b49b609 100644
--- a/tests/blend/buildevol/K1
+++ b/tests/blend/buildevol/K1
@@ -11,7 +11,7 @@
 #explode p F
 #glue s p b p_2 b_2
 
-restore 6_G1234.draw s
+restore [locate_data_file 6_G1234.draw] s
 tscale s 0 0 0 SCALE2
 explode  s E
 mkevol result s
diff --git a/tests/blend/buildevol/K2 b/tests/blend/buildevol/K2
index ed2ee56cd3..178e47879e 100644
--- a/tests/blend/buildevol/K2
+++ b/tests/blend/buildevol/K2
@@ -17,7 +17,7 @@ puts "TODO OCC22817 All:Faulty shapes in variables faulty_1 to faulty_2"
 #explode r F
 #glue s c r c_3 s_6 
 
-restore 6_G56.draw s
+restore [locate_data_file 6_G56.draw] s
 tscale s 0 0 0 SCALE2
 fsameparameter s
 explode  s E
diff --git a/tests/blend/buildevol/K3 b/tests/blend/buildevol/K3
index b72a84f421..e0d72371a8 100644
--- a/tests/blend/buildevol/K3
+++ b/tests/blend/buildevol/K3
@@ -7,7 +7,7 @@
 #pipe s1 w p
 #fuse s s1 b
 
-restore 6_H1234.draw s
+restore [locate_data_file 6_H1234.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 mkevol result s
diff --git a/tests/blend/buildevol/K4 b/tests/blend/buildevol/K4
index 4609cea7f6..c56e8dbacd 100644
--- a/tests/blend/buildevol/K4
+++ b/tests/blend/buildevol/K4
@@ -7,7 +7,7 @@
 #pipe s1 w p
 #fuse s s1 b
 
-restore 6_H1234.draw s
+restore [locate_data_file 6_H1234.draw] s
 explode s E
 mkevol result s
 updatevol s_3 0 2*SCALE2 1 5*SCALE2 2 2*SCALE2
diff --git a/tests/blend/buildevol/K5 b/tests/blend/buildevol/K5
index da7aecbf63..dac833f5e2 100644
--- a/tests/blend/buildevol/K5
+++ b/tests/blend/buildevol/K5
@@ -12,7 +12,7 @@
 #fuse s f1 c
 #donly s
 
-restore 6_H56.draw s
+restore [locate_data_file 6_H56.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 mkevol result s
diff --git a/tests/blend/buildevol/K6 b/tests/blend/buildevol/K6
index 6c4b65b4c7..aae50ec8a2 100644
--- a/tests/blend/buildevol/K6
+++ b/tests/blend/buildevol/K6
@@ -4,7 +4,7 @@
 #ttranslate s2 0 7 7
 #fuse s s1 s2
 
-restore 6_I1234.draw  s
+restore [locate_data_file 6_I1234.draw]  s
 tscale s 0 0 0 SCALE2
 explode s E
 mkevol result s
diff --git a/tests/blend/buildevol/K7 b/tests/blend/buildevol/K7
index cbf653278d..f192b7ba6e 100644
--- a/tests/blend/buildevol/K7
+++ b/tests/blend/buildevol/K7
@@ -4,7 +4,7 @@
 #ttranslate s2 0 7 7
 #fuse s s1 s2
 
-restore 6_I1234.draw s
+restore [locate_data_file 6_I1234.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 mkevol result s
diff --git a/tests/blend/buildevol/K8 b/tests/blend/buildevol/K8
index 22b0294dda..5e981724b3 100644
--- a/tests/blend/buildevol/K8
+++ b/tests/blend/buildevol/K8
@@ -6,7 +6,7 @@
 #pcylinder s4 3 20 
 #fuse s s4 s3
 
-restore 6_I56.draw s
+restore [locate_data_file 6_I56.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 mkevol result s
diff --git a/tests/blend/complex/A1 b/tests/blend/complex/A1
index b382f7637a..c38a59fa5c 100644
--- a/tests/blend/complex/A1
+++ b/tests/blend/complex/A1
@@ -5,7 +5,7 @@
 ## ====================================
 puts "TODO OCC22817 All:TEST INCOMPLETE"
 
-restore indus05-A1.rle s
+restore [locate_data_file indus05-A1.rle] s
 explode s e
 blend result s 2 s_4 s_5 s_15 s_16
 
diff --git a/tests/blend/complex/A2 b/tests/blend/complex/A2
index 535881e739..ba34dd8bb5 100644
--- a/tests/blend/complex/A2
+++ b/tests/blend/complex/A2
@@ -4,7 +4,7 @@
 ## Comment : from original bug PRO4495
 ## ====================================
 
-restore indus05.rle s
+restore [locate_data_file indus05.rle] s
 tscale s 0 0 0 1000
 explode s e
 blend result s 2 s_26
diff --git a/tests/blend/complex/A3 b/tests/blend/complex/A3
index 949aa3e77b..2f9cf14e75 100644
--- a/tests/blend/complex/A3
+++ b/tests/blend/complex/A3
@@ -4,7 +4,7 @@
 ## Comment : from original bug PRO4497
 ## ====================================
 
-restore indus09.rle s
+restore [locate_data_file indus09.rle] s
 tscale s 0 0 0 1000
 explode s e
 blend result s 5 s_8
diff --git a/tests/blend/complex/A4 b/tests/blend/complex/A4
index 852c6595ad..e64663bebd 100644
--- a/tests/blend/complex/A4
+++ b/tests/blend/complex/A4
@@ -4,7 +4,7 @@
 ## Comment : from original bug PRO4497
 ## ====================================
 
-restore indus09.rle s
+restore [locate_data_file indus09.rle] s
 tscale s 0 0 0 1000
 explode s e
 blend result s 5 s_12
diff --git a/tests/blend/complex/A5 b/tests/blend/complex/A5
index 943f0c4c79..682721d46c 100644
--- a/tests/blend/complex/A5
+++ b/tests/blend/complex/A5
@@ -4,7 +4,7 @@
 ## Comment : from original bug PRO4536
 ## ====================================
 
-restore blend04.rle s
+restore [locate_data_file blend04.rle] s
 tscale s 0 0 0 1000
 explode s e
 blend result s 5 s_3
diff --git a/tests/blend/complex/A6 b/tests/blend/complex/A6
index 6d9b3001e0..c8ab59d8af 100644
--- a/tests/blend/complex/A6
+++ b/tests/blend/complex/A6
@@ -4,7 +4,7 @@
 ## Comment : from original bug PRO4536
 ## ====================================
 
-restore blend04.rle s
+restore [locate_data_file blend04.rle] s
 tscale s 0 0 0 1000
 explode s e
 blend result s 5 s_6
diff --git a/tests/blend/complex/A7 b/tests/blend/complex/A7
index ffec8dac51..ac903dfbc7 100644
--- a/tests/blend/complex/A7
+++ b/tests/blend/complex/A7
@@ -5,7 +5,7 @@
 ## ====================================
 puts "TODO OCC22817 All:TEST INCOMPLETE"
 
-restore blend06.rle s
+restore [locate_data_file blend06.rle] s
 tscale s 0 0 0 1000
 explode s e
 blend myResult s 6 s_5
diff --git a/tests/blend/complex/A8 b/tests/blend/complex/A8
index 4087b20900..3358abc601 100644
--- a/tests/blend/complex/A8
+++ b/tests/blend/complex/A8
@@ -4,7 +4,7 @@
 ## Comment : from pro9169:
 ## ====================================
 
-restore pro9169.rle s
+restore [locate_data_file pro9169.rle] s
 explode s e
 blend result s 1 s_27
 
diff --git a/tests/blend/complex/A9 b/tests/blend/complex/A9
index 37c5effdff..220329d43e 100644
--- a/tests/blend/complex/A9
+++ b/tests/blend/complex/A9
@@ -4,7 +4,7 @@
 ## Comment : from pro9169:
 ## ====================================
 
-restore pro9169.rle s
+restore [locate_data_file pro9169.rle] s
 explode s e
 blend result s 10.0 s_22
 
diff --git a/tests/blend/complex/B1 b/tests/blend/complex/B1
index a321d8ace6..3187e4b99f 100644
--- a/tests/blend/complex/B1
+++ b/tests/blend/complex/B1
@@ -4,7 +4,7 @@
 ## Comment : from pro5203
 ## ====================================
 
-restore pro5203.rle a
+restore [locate_data_file pro5203.rle] a
 explode a e
 blend result a 0.001 a_32  0.001 a_190.001 a_31
 
diff --git a/tests/blend/complex/B2 b/tests/blend/complex/B2
index c9ead463b6..c98e655a6c 100644
--- a/tests/blend/complex/B2
+++ b/tests/blend/complex/B2
@@ -5,7 +5,7 @@
 ## ====================================
 puts "TODO OCC22817 All:TEST INCOMPLETE"
 
-restore pro10320.rle a
+restore [locate_data_file pro10320.rle] a
 explode a e
 blend result a 15 a_15
 
diff --git a/tests/blend/complex/B3 b/tests/blend/complex/B3
index 51f71f8e8a..27deb814d7 100644
--- a/tests/blend/complex/B3
+++ b/tests/blend/complex/B3
@@ -4,7 +4,7 @@
 ## Comment : from PRO11555
 ## ====================================
 
-restore pro11555.rle a
+restore [locate_data_file pro11555.rle] a
 explode a e
 blend result a 2 a_1 2 a_2
 
diff --git a/tests/blend/complex/B4 b/tests/blend/complex/B4
index 7e0e3bc9b8..096638f030 100644
--- a/tests/blend/complex/B4
+++ b/tests/blend/complex/B4
@@ -4,7 +4,7 @@
 ## Comment : from pro11907
 ## ====================================
 
-restore pro11907.rle a
+restore [locate_data_file pro11907.rle] a
 nexplode a e
 blend result a 4 a_10
 explode result Sh
diff --git a/tests/blend/complex/B6 b/tests/blend/complex/B6
index 948168de8f..ea5a139dbe 100644
--- a/tests/blend/complex/B6
+++ b/tests/blend/complex/B6
@@ -4,7 +4,7 @@
 ## Comment : from pro12881
 ## ====================================
 
-restore pro12881.rle a
+restore [locate_data_file pro12881.rle] a
 explode a e
 blend result a 5 a_89
 
diff --git a/tests/blend/complex/B7 b/tests/blend/complex/B7
index 1dcae755af..f4a3f9c55c 100644
--- a/tests/blend/complex/B7
+++ b/tests/blend/complex/B7
@@ -5,7 +5,7 @@
 ## ====================================
 puts "TODO OCC22817 All:TEST INCOMPLETE"
 
-restore pro12894.rle a
+restore [locate_data_file pro12894.rle] a
 explode a e
 blend result a 7 a_18 7 a_1 7 a_66
 
diff --git a/tests/blend/complex/B8 b/tests/blend/complex/B8
index c5193c5e47..6c1c2ac0a5 100644
--- a/tests/blend/complex/B8
+++ b/tests/blend/complex/B8
@@ -4,7 +4,7 @@
 ## Comment : from pro12920.rle
 ## ====================================
 
-restore pro12894.rle a
+restore [locate_data_file pro12894.rle] a
 explode a e
 blend result a 5 a_89
 
diff --git a/tests/blend/complex/B9 b/tests/blend/complex/B9
index 33f980783a..3bd9091b58 100644
--- a/tests/blend/complex/B9
+++ b/tests/blend/complex/B9
@@ -4,7 +4,7 @@
 ## Comment : from cts19997
 ## ====================================
 
-restore cts19997.rle a
+restore [locate_data_file cts19997.rle] a
 nexplode a e
 blend result a 2 a_1
 
diff --git a/tests/blend/complex/C1 b/tests/blend/complex/C1
index 898724a548..7393e09add 100644
--- a/tests/blend/complex/C1
+++ b/tests/blend/complex/C1
@@ -4,7 +4,7 @@
 ## Comment : from cts19335
 ## ====================================
 
-restore cts19335.rle a
+restore [locate_data_file cts19335.rle] a
 nexplode a e
 blend result a 2 a_20
 
diff --git a/tests/blend/complex/C2 b/tests/blend/complex/C2
index 257eb46321..b389591227 100644
--- a/tests/blend/complex/C2
+++ b/tests/blend/complex/C2
@@ -4,7 +4,7 @@
 ## Comment : from cts40124
 ## ====================================
 
-restore cts40124.rle a
+restore [locate_data_file cts40124.rle] a
 nexplode a e
 blend result a 0.01 a_16 0.02 a_9 0.03 a_14 0.01 a_15 0.02 a_22 0.03 a_17
 explode result sh
diff --git a/tests/blend/complex/C3 b/tests/blend/complex/C3
index ebf7a42eac..648ad85c64 100644
--- a/tests/blend/complex/C3
+++ b/tests/blend/complex/C3
@@ -4,7 +4,7 @@
 ## Comment : from pro5477
 ## ====================================
 
-restore pro5477.rle a
+restore [locate_data_file pro5477.rle] a
 tscale a 0 0 0 1000
 nexplode a e
 blend result a 10 a_13
diff --git a/tests/blend/complex/C4 b/tests/blend/complex/C4
index 7870fdffce..06f6dd29c0 100644
--- a/tests/blend/complex/C4
+++ b/tests/blend/complex/C4
@@ -4,7 +4,7 @@
 ## Comment : from pro5545
 ## ====================================
 
-restore pro5545.rle a
+restore [locate_data_file pro5545.rle] a
 encoderegularity a 1
 tscale a 0 0 0 1000
 nexplode a e
diff --git a/tests/blend/complex/C5 b/tests/blend/complex/C5
index 04e085274b..4f035457e0 100644
--- a/tests/blend/complex/C5
+++ b/tests/blend/complex/C5
@@ -4,9 +4,9 @@
 ## Comment : from pro6309
 ## ====================================
 
-restore pro6309a.rle a
+restore [locate_data_file pro6309a.rle] a
 tscale a 0 0 0 1000
-restore pro6309b.rle b
+restore [locate_data_file pro6309b.rle] b
 tscale b 0 0 0 1000
 #restore pro6309c.rle c
 #restore pro6309d.rle d
diff --git a/tests/blend/complex/C6 b/tests/blend/complex/C6
index 35e4bc870e..048f90a38c 100644
--- a/tests/blend/complex/C6
+++ b/tests/blend/complex/C6
@@ -4,7 +4,7 @@
 ## Comment : from pro6944
 ## ====================================
 
-restore pro6944.rle a
+restore [locate_data_file pro6944.rle] a
 tscale a 0 0 0 1000
 nexplode a e
 blend result a 12 a_16 12 a_15 12 a_17
diff --git a/tests/blend/complex/C7 b/tests/blend/complex/C7
index 26e072433c..7bf6ca7dd8 100644
--- a/tests/blend/complex/C7
+++ b/tests/blend/complex/C7
@@ -4,7 +4,7 @@
 ## Comment : from pro9067
 ## ====================================
 
-restore pro9067.rle a
+restore [locate_data_file pro9067.rle] a
 nexplode a e
 blend result a 2 a_60
 nexplode result e
diff --git a/tests/blend/complex/C8 b/tests/blend/complex/C8
index b48accdbf7..7de8f5088b 100644
--- a/tests/blend/complex/C8
+++ b/tests/blend/complex/C8
@@ -4,7 +4,7 @@
 ## Comment : from pro9523
 ## ====================================
 
-restore pro9523.rle a
+restore [locate_data_file pro9523.rle] a
 nexplode a e
 blend result a 2.5 a_4
 
diff --git a/tests/blend/complex/C9 b/tests/blend/complex/C9
index 9b9a6efe1a..ab6c53c45f 100644
--- a/tests/blend/complex/C9
+++ b/tests/blend/complex/C9
@@ -4,7 +4,7 @@
 ## Comment : from ?
 ## ====================================
 
-restore cfi900H2.rle a
+restore [locate_data_file cfi900H2.rle] a
 nexplode a e
 blend result a 1 a_66
 
diff --git a/tests/blend/complex/D1 b/tests/blend/complex/D1
index 977c6dad84..efab0cbc49 100644
--- a/tests/blend/complex/D1
+++ b/tests/blend/complex/D1
@@ -4,7 +4,7 @@
 ## Comment : from pro12832
 ## ====================================
 
-restore pro12832.rle a
+restore [locate_data_file pro12832.rle] a
 explode a e
 blend result a 3 a_28
 
diff --git a/tests/blend/complex/D2 b/tests/blend/complex/D2
index baeba095a6..89b3b0a207 100644
--- a/tests/blend/complex/D2
+++ b/tests/blend/complex/D2
@@ -4,7 +4,7 @@
 ## Comment : from pro10391
 ## ====================================
 
-restore pro10391.rle a
+restore [locate_data_file pro10391.rle] a
 explode a e
 erase a
 blend result a 10 a_3 5 a_4 10 a_2 5 a_13 5 a_11 10 a_14 5 a_15 10 a_12 5 a_6 5 a_9
diff --git a/tests/blend/complex/D3 b/tests/blend/complex/D3
index e36d24ab5f..0106316b14 100644
--- a/tests/blend/complex/D3
+++ b/tests/blend/complex/D3
@@ -4,7 +4,7 @@
 ## Comment : from fra60610
 ## ====================================
 
-restore fra60610.rle a
+restore [locate_data_file fra60610.rle] a
 nexplode a e
 blend result a 2 a_69
 
diff --git a/tests/blend/complex/D4 b/tests/blend/complex/D4
index 81921ce4f0..4abd8ff3f6 100644
--- a/tests/blend/complex/D4
+++ b/tests/blend/complex/D4
@@ -4,7 +4,7 @@
 ## Comment : from
 ## ====================================
 
-restore cfi900H7.rle a
+restore [locate_data_file cfi900H7.rle] a
 nexplode a e
 blend result a 5 a_5 5 a_13 5 a_28
 
diff --git a/tests/blend/complex/D5 b/tests/blend/complex/D5
index 678daea668..2ea124f7fa 100644
--- a/tests/blend/complex/D5
+++ b/tests/blend/complex/D5
@@ -4,7 +4,7 @@
 ## Comment : from ger60206
 ## ====================================
 
-restore ger60206.rle a
+restore [locate_data_file ger60206.rle] a
 explode a e
 mkevol result a
 updatevol a_21 0 0.5 1 1
diff --git a/tests/blend/complex/D6 b/tests/blend/complex/D6
index 214ee42a10..4af68e7402 100644
--- a/tests/blend/complex/D6
+++ b/tests/blend/complex/D6
@@ -4,7 +4,7 @@
 ## Comment : from pro10321
 ## ====================================
 
-restore pro10321.rle a
+restore [locate_data_file pro10321.rle] a
 explode a e
 blend result a 59 a_13
 
diff --git a/tests/blend/complex/D8 b/tests/blend/complex/D8
index dfcfa0e43d..a73eafab6b 100644
--- a/tests/blend/complex/D8
+++ b/tests/blend/complex/D8
@@ -4,7 +4,7 @@
 ## Comment : from ID150018
 ## ====================================
 
-restore id150018.rle a
+restore [locate_data_file id150018.rle] a
 nexplode a e
 blend result a 30 a_20
 
diff --git a/tests/blend/complex/D9 b/tests/blend/complex/D9
index c4e2a2d64c..387a2300d3 100644
--- a/tests/blend/complex/D9
+++ b/tests/blend/complex/D9
@@ -4,7 +4,7 @@
 ## Comment : from jap50078
 ## ====================================
 
-restore jap50078.rle a
+restore [locate_data_file jap50078.rle] a
 nexplode a e
 blend result a 13 a_12 13 a_17 13 a_41 13 a_42
 
diff --git a/tests/blend/complex/E1 b/tests/blend/complex/E1
index 24014bf87a..e2ebe51341 100644
--- a/tests/blend/complex/E1
+++ b/tests/blend/complex/E1
@@ -4,7 +4,7 @@
 ## Comment : from pro8783
 ## ====================================
 
-restore pro8783.rle a
+restore [locate_data_file pro8783.rle] a
 explode a e
 mkevol result a
 updatevol a_4 0 15 0.5 9 1 5
diff --git a/tests/blend/complex/E2 b/tests/blend/complex/E2
index 8fafc63042..d65dfb421e 100644
--- a/tests/blend/complex/E2
+++ b/tests/blend/complex/E2
@@ -4,7 +4,7 @@
 ## Comment : from pro8792
 ## ====================================
 
-restore pro8792.rle a
+restore [locate_data_file pro8792.rle] a
 explode a e
 mkevol result a
 updatevol a_20 0 15 0.5 20 1 5
diff --git a/tests/blend/complex/E3 b/tests/blend/complex/E3
index b7ca77ff8e..62c544eb52 100644
--- a/tests/blend/complex/E3
+++ b/tests/blend/complex/E3
@@ -4,7 +4,7 @@
 ## Comment : from pro10356
 ## ====================================
 
-restore pro10356.rle a
+restore [locate_data_file pro10356.rle] a
 explode a e
 blend result a 19 a_17 14 a_20 14 a_23 14 a_1 16 a_2 34 a_5 7 a_8 19 a_11 19 a_14 7 a_22 7 a_25 7 a_27 7 a_4 7 a_7 7 a_10 7 a_13 7 a_16 7 a_19
 
diff --git a/tests/blend/complex/E4 b/tests/blend/complex/E4
index 3454215ebf..4b0f68e15c 100644
--- a/tests/blend/complex/E4
+++ b/tests/blend/complex/E4
@@ -4,7 +4,7 @@
 ## Comment : from pro10631
 ## ====================================
 
-restore pro10631.rle a
+restore [locate_data_file pro10631.rle] a
 explode a e
 blend result a 5 a_45
 
diff --git a/tests/blend/complex/E5 b/tests/blend/complex/E5
index 1feb898c4c..c142cbd534 100644
--- a/tests/blend/complex/E5
+++ b/tests/blend/complex/E5
@@ -4,7 +4,7 @@
 ## Comment : from pro7788
 ## ====================================
 
-restore pro7788.rle a
+restore [locate_data_file pro7788.rle] a
 explode a e
 blend result a 20 a_8 20 a_11 20 a_1 20 a_12
 
diff --git a/tests/blend/complex/E6 b/tests/blend/complex/E6
index 45bad7932f..2e86fddecf 100644
--- a/tests/blend/complex/E6
+++ b/tests/blend/complex/E6
@@ -4,7 +4,7 @@
 ## Comment : from pro10522
 ## ====================================
 
-restore pro10522.rle a
+restore [locate_data_file pro10522.rle] a
 explode a e
 blend result a 2 a_82
 
diff --git a/tests/blend/complex/E7 b/tests/blend/complex/E7
index 6798ca8b2c..9bf3c42800 100644
--- a/tests/blend/complex/E7
+++ b/tests/blend/complex/E7
@@ -4,7 +4,7 @@
 ## Comment : from pro11850
 ## ====================================
 
-restore pro11850.rle a
+restore [locate_data_file pro11850.rle] a
 explode a e
 blend result a 3 a_22
 
diff --git a/tests/blend/complex/E8 b/tests/blend/complex/E8
index d14f00bc69..7b40e98594 100644
--- a/tests/blend/complex/E8
+++ b/tests/blend/complex/E8
@@ -4,7 +4,7 @@
 ## Comment : from pro12404
 ## ====================================
 
-restore pro12404.rle a
+restore [locate_data_file pro12404.rle] a
 explode a e
 blend result a 10 a_8 10 a_13
 
diff --git a/tests/blend/complex/E9 b/tests/blend/complex/E9
index f2fbfd7b23..dcb08eacac 100644
--- a/tests/blend/complex/E9
+++ b/tests/blend/complex/E9
@@ -4,7 +4,7 @@
 ## Comment : from pro10117
 ## ====================================
 
-restore pro10117.rle a
+restore [locate_data_file pro10117.rle] a
 explode a e
 blend result a 2 a_128 1 a_10
 
diff --git a/tests/blend/complex/F1 b/tests/blend/complex/F1
index 4fbb249d98..4000470532 100644
--- a/tests/blend/complex/F1
+++ b/tests/blend/complex/F1
@@ -4,7 +4,7 @@
 ## Comment : from id150009
 ## ====================================
 
-restore id150009.rle a
+restore [locate_data_file id150009.rle] a
 explode a e
 blend result a 10 a_9
 
diff --git a/tests/blend/complex/F2 b/tests/blend/complex/F2
index a8a79ea074..b3ede101d6 100644
--- a/tests/blend/complex/F2
+++ b/tests/blend/complex/F2
@@ -4,7 +4,7 @@
 ## Comment : from id150009
 ## ====================================
 
-restore id150009.rle a
+restore [locate_data_file id150009.rle] a
 explode a e
 blend result a 10 a_17
 
diff --git a/tests/blend/complex/F3 b/tests/blend/complex/F3
index 23009960cb..9ddb38d013 100644
--- a/tests/blend/complex/F3
+++ b/tests/blend/complex/F3
@@ -4,7 +4,7 @@
 ## Comment : from pro13127
 ## ====================================
 
-restore pro13127.rle a
+restore [locate_data_file pro13127.rle] a
 explode a e
 blend result a 10 a_28
 explode result e
diff --git a/tests/blend/complex/F4 b/tests/blend/complex/F4
index 5ad942bbd1..8168ffaccc 100644
--- a/tests/blend/complex/F4
+++ b/tests/blend/complex/F4
@@ -4,7 +4,7 @@
 ## Comment : from cts20686
 ## ====================================
 
-restore cts20686.rle a
+restore [locate_data_file cts20686.rle] a
 explode a e
 blend result a 10 a_4 10 a_15 10 a_13 10 a_10 10 a_7
 
diff --git a/tests/blend/complex/F5 b/tests/blend/complex/F5
index 1a34cd5e7e..d72bd8ea43 100644
--- a/tests/blend/complex/F5
+++ b/tests/blend/complex/F5
@@ -4,7 +4,7 @@
 ## Comment : from cts20970
 ## ====================================
 
-restore cts20970.rle a
+restore [locate_data_file cts20970.rle] a
 explode a e
 blend result a 1 a_108
 # radius of 0.8 is OK
diff --git a/tests/blend/complex/F6 b/tests/blend/complex/F6
index 84650acf6c..c27645350c 100644
--- a/tests/blend/complex/F6
+++ b/tests/blend/complex/F6
@@ -5,7 +5,7 @@
 ## ====================================
 puts "TODO OCC22817 All:Faulty shapes in variables faulty_1 to faulty_14"
 
-restore cts21020.rle a
+restore [locate_data_file cts21020.rle] a
 explode a e
 blend result a 0.05 a_8 0.05 a_10 0.05 a_9 0.05 a_5 0.05 a_3 0.05 a_1
 
diff --git a/tests/blend/complex/F7 b/tests/blend/complex/F7
index 8c1fa3ad29..69d240934c 100644
--- a/tests/blend/complex/F7
+++ b/tests/blend/complex/F7
@@ -4,7 +4,7 @@
 ## Comment : from pro13225
 ## ====================================
 
-restore pro13225.rle a
+restore [locate_data_file pro13225.rle] a
 explode a e
 blend result a 10 a_3 10 a_8 10 a_7 10 a_6
 
diff --git a/tests/blend/complex/F8 b/tests/blend/complex/F8
index 52c68baca8..9d60e834cb 100644
--- a/tests/blend/complex/F8
+++ b/tests/blend/complex/F8
@@ -5,7 +5,7 @@
 ## ====================================
 puts "TODO OCC22817 All:Faulty shapes in variables faulty_1 to faulty_8"
 
-restore  pro13892.rle a
+restore [locate_data_file pro13892.rle] a
 explode a e
 blend result a 15 a_60
 
diff --git a/tests/blend/complex/F9 b/tests/blend/complex/F9
index 6df4519c75..be2424e136 100644
--- a/tests/blend/complex/F9
+++ b/tests/blend/complex/F9
@@ -7,7 +7,7 @@ puts "TODO OCC22817 All:exception.+There are no suitable edges"
 puts "TODO OCC22817 All:\\*\\* Exception \\*\\*"
 puts "TODO OCC22817 All:TEST INCOMPLETE"
 
-restore pro13893.rle a
+restore [locate_data_file pro13893.rle] a
 explode a e
 blend result a 1 a_9
 
diff --git a/tests/blend/complex/G1 b/tests/blend/complex/G1
index e243426483..3c2ea058fc 100644
--- a/tests/blend/complex/G1
+++ b/tests/blend/complex/G1
@@ -4,7 +4,7 @@
 ## Comment : from pro14035
 ## ====================================
 
-restore pro14035.rle a
+restore [locate_data_file pro14035.rle] a
 explode a e
 blend result a 3 a_9 3 a_7 3 a_5 3 a_3 3 a_1 3 a_2 3 a_4 3 a_6 3 a_8
 # it's a_8 which causes the problem
diff --git a/tests/blend/complex/G2 b/tests/blend/complex/G2
index b9f8801d2e..4975024e8f 100644
--- a/tests/blend/complex/G2
+++ b/tests/blend/complex/G2
@@ -4,7 +4,7 @@
 ## Comment : from pro14550
 ## ====================================
 
-restore pro14550.rle a
+restore [locate_data_file pro14550.rle] a
 explode a e
 blend result a 5 a_1 5 a_3 5 a_4 5 a_2
 # on its own a_1 is ok
diff --git a/tests/blend/complex/G3 b/tests/blend/complex/G3
index ef3d69a873..8fa26bfb9f 100644
--- a/tests/blend/complex/G3
+++ b/tests/blend/complex/G3
@@ -4,7 +4,7 @@
 ## Comment : from pro14551
 ## ====================================
 
-restore pro14551.rle a
+restore [locate_data_file pro14551.rle] a
 explode a e
 mkevol result a
 updatevol a_7 0 20 1 40
diff --git a/tests/blend/complex/G4 b/tests/blend/complex/G4
index daa3086027..838a8e7e6a 100644
--- a/tests/blend/complex/G4
+++ b/tests/blend/complex/G4
@@ -4,7 +4,7 @@
 ## Comment : from cts20006
 ## ====================================
 
-restore cts20006.rle a
+restore [locate_data_file cts20006.rle] a
 explode a e
 blend result a 30 a_18 30 a_20 30 a_24 30 a_16
 
diff --git a/tests/blend/complex/G5 b/tests/blend/complex/G5
index a1a497566b..9138fe9bc0 100644
--- a/tests/blend/complex/G5
+++ b/tests/blend/complex/G5
@@ -4,7 +4,7 @@
 ## Comment : from cts21183
 ## ====================================
 
-restore cts21183.rle a
+restore [locate_data_file cts21183.rle] a
 explode a e
 blend result a 10 a_51
 
diff --git a/tests/blend/complex/G6 b/tests/blend/complex/G6
index 62e97cc403..ae8c76ef36 100644
--- a/tests/blend/complex/G6
+++ b/tests/blend/complex/G6
@@ -7,7 +7,7 @@ puts "TODO OCC22817 All:exception.+There are no suitable edges"
 puts "TODO OCC22817 All:\\*\\* Exception \\*\\*"
 puts "TODO OCC22817 All:TEST INCOMPLETE"
 
-restore cts21363.rle a
+restore [locate_data_file cts21363.rle] a
 explode a e
 blend result a 0.2 a_24
 # value of 0.1 works
diff --git a/tests/blend/complex/G7 b/tests/blend/complex/G7
index 356b2a32b7..86e6c8910d 100644
--- a/tests/blend/complex/G7
+++ b/tests/blend/complex/G7
@@ -5,7 +5,7 @@
 ## ====================================
 puts "TODO OCC22817 All:TEST INCOMPLETE"
 
-restore cts21630.rle a
+restore [locate_data_file cts21630.rle] a
 explode a e
 # this may not be all the fillets
 blend result a 2 s_132 2 s_139 0.5 s_4 0.5 s_144 0.5 s_119 1 s_50
diff --git a/tests/blend/complex/G8 b/tests/blend/complex/G8
index 9138e0d340..ffdddf6dbe 100644
--- a/tests/blend/complex/G8
+++ b/tests/blend/complex/G8
@@ -4,7 +4,7 @@
 ## Comment : from ID260039
 ## ====================================
 
-restore id260039.rle a
+restore [locate_data_file id260039.rle] a
 explode a e
 blend result a 5 a_16
 explode result e
diff --git a/tests/blend/complex/H3 b/tests/blend/complex/H3
index d894ac87a0..2122164f6b 100644
--- a/tests/blend/complex/H3
+++ b/tests/blend/complex/H3
@@ -9,7 +9,7 @@ puts "TODO OCC22817 All:TEST INCOMPLETE"
 # - Il y des faces singulieres
 # - Il y des aretes partielement tangentes
 # - Et plein d'aretes de cassures de l'ordre de 1 ou 0.1 degree
-restore cts16288.rle m
+restore [locate_data_file cts16288.rle] m
 # Pour avoir un resultat valide, il faut un model valide
 fsameparameter m 0.001
 # Probleme de construction du model => 5 degree c'est tangent!
diff --git a/tests/blend/complex/H4 b/tests/blend/complex/H4
index a2038427ad..8280cfe922 100644
--- a/tests/blend/complex/H4
+++ b/tests/blend/complex/H4
@@ -5,7 +5,7 @@
 ## ====================================
 puts "TODO OCC22817 All:TEST INCOMPLETE"
 
-restore buc60330.rle a
+restore [locate_data_file buc60330.rle] a
 explode a e
 blend result a 10 a_5 10 a_6
 ## ca marche mais pas ceci
diff --git a/tests/blend/encoderegularity/A1 b/tests/blend/encoderegularity/A1
index 860435ebb3..a19b53ad0d 100644
--- a/tests/blend/encoderegularity/A1
+++ b/tests/blend/encoderegularity/A1
@@ -1,4 +1,4 @@
-restore conge001.brep m
+restore [locate_data_file conge001.brep] m
 explode m E
 # Pas m_34 m_35
 encoderegularity m 3
diff --git a/tests/blend/encoderegularity/A2 b/tests/blend/encoderegularity/A2
index dc62a9be28..8b6775ff69 100644
--- a/tests/blend/encoderegularity/A2
+++ b/tests/blend/encoderegularity/A2
@@ -1,4 +1,4 @@
-restore conge003.brep m
+restore [locate_data_file conge003.brep] m
 explode m E
 # Pas Prendre :
 # m_3 m_4 m_5 m_13 m_14 m_15 m_16 m_17 m_18 m_19 
diff --git a/tests/blend/encoderegularity/A3 b/tests/blend/encoderegularity/A3
index b54fc1281e..0a8312f923 100644
--- a/tests/blend/encoderegularity/A3
+++ b/tests/blend/encoderegularity/A3
@@ -1,4 +1,4 @@
-restore conge004.brep m
+restore [locate_data_file conge004.brep] m
 explode m E
 encoderegularity m 3
 blend result m 10 m_5 10 m_6 \
diff --git a/tests/blend/encoderegularity/A4 b/tests/blend/encoderegularity/A4
index afc144ae2e..28f3a56b8f 100644
--- a/tests/blend/encoderegularity/A4
+++ b/tests/blend/encoderegularity/A4
@@ -1,4 +1,4 @@
-restore conge006.brep m
+restore [locate_data_file conge006.brep] m
 explode m E
 encoderegularity m 3
 blend result m 3 m_1 3 m_2 3 m_3 3 m_4 3 m_5 3 m_6 3 m_7 3 m_8 3 m_9 \
diff --git a/tests/blend/encoderegularity/A5 b/tests/blend/encoderegularity/A5
index 0b47729411..be5083501c 100644
--- a/tests/blend/encoderegularity/A5
+++ b/tests/blend/encoderegularity/A5
@@ -1,4 +1,4 @@
-restore conge007.brep m
+restore [locate_data_file conge007.brep] m
 explode m E
 # R=15 : m_29 m_31 m_27 m_26
 encoderegularity m 3
diff --git a/tests/blend/encoderegularity/A6 b/tests/blend/encoderegularity/A6
index ebedc9bdc0..5285731edb 100644
--- a/tests/blend/encoderegularity/A6
+++ b/tests/blend/encoderegularity/A6
@@ -1,4 +1,4 @@
-restore conge008.brep m
+restore [locate_data_file conge008.brep] m
 explode m E
 encoderegularity m 3
 blend result m 10 m_1 10 m_2 10 m_3 10 m_4 10 m_5 10 m_6 \
diff --git a/tests/blend/encoderegularity/A7 b/tests/blend/encoderegularity/A7
index fbe5ac6d93..f32a268c0b 100644
--- a/tests/blend/encoderegularity/A7
+++ b/tests/blend/encoderegularity/A7
@@ -1,4 +1,4 @@
-restore conge009.brep m
+restore [locate_data_file conge009.brep] m
 explode m E
 encoderegularity m 3
 blend result m 7 m_1 7 m_5 7 m_7 7 m_8 7 m_9 7 m_10 7 m_11 7 m_12 \
diff --git a/tests/blend/simple/K1 b/tests/blend/simple/K1
index 415a0c0fef..457c704624 100644
--- a/tests/blend/simple/K1
+++ b/tests/blend/simple/K1
@@ -6,7 +6,7 @@
 #cut s s1 s2
 #save s L12.draw 
 
-restore L12.draw s
+restore [locate_data_file L12.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_5
diff --git a/tests/blend/simple/K5 b/tests/blend/simple/K5
index 5bad0a9902..60c7a31d25 100644
--- a/tests/blend/simple/K5
+++ b/tests/blend/simple/K5
@@ -4,7 +4,7 @@
 #cut s s1 s2
 #save s A1234.draw 
 
-restore A1234.draw s
+restore [locate_data_file A1234.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 1*SCALE1 s_10
diff --git a/tests/blend/simple/K6 b/tests/blend/simple/K6
index 78c740f356..eda06e75d6 100644
--- a/tests/blend/simple/K6
+++ b/tests/blend/simple/K6
@@ -4,7 +4,7 @@
 #cut s s1 s2
 #save s A1234.draw 
 
-restore A1234.draw s
+restore [locate_data_file A1234.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_10 0.5*SCALE1 s_11 0.5*SCALE1 s_15
diff --git a/tests/blend/simple/K7 b/tests/blend/simple/K7
index 30d99d1e03..62864f9a51 100644
--- a/tests/blend/simple/K7
+++ b/tests/blend/simple/K7
@@ -4,7 +4,7 @@
 #cut s s1 s2
 #save s A1234.draw 
 
-restore A1234.draw s
+restore [locate_data_file A1234.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_22 0.5*SCALE1 s_9 0.5*SCALE1 s_4 0.5*SCALE1 s_17
diff --git a/tests/blend/simple/K8 b/tests/blend/simple/K8
index a5644ca2ae..2aa7864484 100644
--- a/tests/blend/simple/K8
+++ b/tests/blend/simple/K8
@@ -4,7 +4,7 @@
 #fuse s s1 s2
 #save s A5678.draw 
 
-restore A5678.draw s
+restore [locate_data_file A5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 1*SCALE1 s_16
diff --git a/tests/blend/simple/K9 b/tests/blend/simple/K9
index 0bccefaeac..e05eae4b38 100644
--- a/tests/blend/simple/K9
+++ b/tests/blend/simple/K9
@@ -4,7 +4,7 @@
 #fuse s s1 s2
 #save s A5678.draw 
 
-restore A5678.draw s
+restore [locate_data_file A5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_16 0.5*SCALE1 s_15 0.5*SCALE1 s_24
diff --git a/tests/blend/simple/L1 b/tests/blend/simple/L1
index 81618a486a..40ae1893fe 100644
--- a/tests/blend/simple/L1
+++ b/tests/blend/simple/L1
@@ -4,7 +4,7 @@
 #fuse s s1 s2
 #save s A5678.draw 
 
-restore A5678.draw s
+restore [locate_data_file A5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_1 0.5*SCALE1 s_20 0.5*SCALE1 s_15 0.5*SCALE1 s_24
diff --git a/tests/blend/simple/L2 b/tests/blend/simple/L2
index e541a979e4..458bcc284a 100644
--- a/tests/blend/simple/L2
+++ b/tests/blend/simple/L2
@@ -5,7 +5,7 @@
 #cut s s1 s2
 #save s B1234.draw 
 
-restore B1234.draw s
+restore [locate_data_file B1234.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 1*SCALE1 s_9
diff --git a/tests/blend/simple/L3 b/tests/blend/simple/L3
index 88c645098f..6b28b1b386 100644
--- a/tests/blend/simple/L3
+++ b/tests/blend/simple/L3
@@ -5,7 +5,7 @@
 #cut s s1 s2
 #save s B1234.draw 
 
-restore B1234.draw s
+restore [locate_data_file B1234.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_9 0.5*SCALE1 s_7 0.5*SCALE1 s_12
diff --git a/tests/blend/simple/L4 b/tests/blend/simple/L4
index bb2da33a99..89690a48e0 100644
--- a/tests/blend/simple/L4
+++ b/tests/blend/simple/L4
@@ -5,7 +5,7 @@
 #cut s s1 s2
 #save s B1234.draw 
 
-restore B1234.draw s
+restore [locate_data_file B1234.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_12 0.5*SCALE1 s_13 0.5*SCALE1 s_16
diff --git a/tests/blend/simple/L5 b/tests/blend/simple/L5
index 2f65762a30..ee306035bc 100644
--- a/tests/blend/simple/L5
+++ b/tests/blend/simple/L5
@@ -5,7 +5,7 @@
 #fuse s s1 s2
 #save s B5678.draw 
 
-restore B5678.draw s
+restore [locate_data_file B5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 1*SCALE1 s_2
diff --git a/tests/blend/simple/L6 b/tests/blend/simple/L6
index 1922aacc95..d7f95cdb35 100644
--- a/tests/blend/simple/L6
+++ b/tests/blend/simple/L6
@@ -5,7 +5,7 @@
 #fuse s s1 s2
 #save s B5678.draw 
 
-restore B5678.draw s
+restore [locate_data_file B5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_2 0.5*SCALE1 s_1 0.5*SCALE1 s_10
diff --git a/tests/blend/simple/L7 b/tests/blend/simple/L7
index 7eb611bc76..0036ae7f90 100644
--- a/tests/blend/simple/L7
+++ b/tests/blend/simple/L7
@@ -5,7 +5,7 @@
 #fuse s s1 s2
 #save s B5678.draw 
 
-restore B5678.draw s
+restore [locate_data_file B5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_2 0.5*SCALE1 s_8 0.5*SCALE1 s_10 0.5*SCALE1 s_4
diff --git a/tests/blend/simple/L8 b/tests/blend/simple/L8
index 726f54c720..a98fc36695 100644
--- a/tests/blend/simple/L8
+++ b/tests/blend/simple/L8
@@ -5,7 +5,7 @@
 #cut s s1 s2
 #save s C1234.draw 
 
-restore C1234.draw s
+restore [locate_data_file C1234.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_12 0.5*SCALE1 s_11 0.5*SCALE1 s_15 
diff --git a/tests/blend/simple/L9 b/tests/blend/simple/L9
index c7e0094c09..bab937c3b8 100644
--- a/tests/blend/simple/L9
+++ b/tests/blend/simple/L9
@@ -5,7 +5,7 @@
 #cut s s1 s2
 #save s C1234.draw 
 
-restore C1234.draw s
+restore [locate_data_file C1234.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_4 0.5*SCALE1 s_2 0.5*SCALE1 s_12 
diff --git a/tests/blend/simple/M1 b/tests/blend/simple/M1
index 07ca50563d..cbebd31643 100644
--- a/tests/blend/simple/M1
+++ b/tests/blend/simple/M1
@@ -5,7 +5,7 @@
 #fuse s s1 s2
 #save s C5678.draw 
 
-restore C5678.draw s
+restore [locate_data_file C5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 1*SCALE1 s_14
diff --git a/tests/blend/simple/M2 b/tests/blend/simple/M2
index 5609e4fdf7..a34c176e03 100644
--- a/tests/blend/simple/M2
+++ b/tests/blend/simple/M2
@@ -5,7 +5,7 @@
 #fuse s s1 s2
 #save s C5678.draw 
 
-restore C5678.draw s
+restore [locate_data_file C5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_14 0.5*SCALE1 s_18 0.5*SCALE1 s_13
diff --git a/tests/blend/simple/M3 b/tests/blend/simple/M3
index 48b74894d2..76a246a458 100644
--- a/tests/blend/simple/M3
+++ b/tests/blend/simple/M3
@@ -5,7 +5,7 @@
 #fuse s s1 s2
 #save s C5678.draw 
 
-restore C5678.draw s
+restore [locate_data_file C5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_3 0.5*SCALE1 s_18 0.5*SCALE1 s_13
diff --git a/tests/blend/simple/M4 b/tests/blend/simple/M4
index 4c96d3bec9..21ef8c7cf0 100644
--- a/tests/blend/simple/M4
+++ b/tests/blend/simple/M4
@@ -5,7 +5,7 @@
 #cut s s1 s2
 #save s D1234.draw 
 
-restore D1234.draw s
+restore [locate_data_file D1234.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 1*SCALE1 s_15
diff --git a/tests/blend/simple/M5 b/tests/blend/simple/M5
index c014130547..3ad1dd84c5 100644
--- a/tests/blend/simple/M5
+++ b/tests/blend/simple/M5
@@ -5,7 +5,7 @@
 #cut s s1 s2
 #save s D1234.draw 
 
-restore D1234.draw s
+restore [locate_data_file D1234.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_15 0.5*SCALE1 s_14 0.5*SCALE1 s_18
diff --git a/tests/blend/simple/M6 b/tests/blend/simple/M6
index 09d555adf0..739d5bb27f 100644
--- a/tests/blend/simple/M6
+++ b/tests/blend/simple/M6
@@ -5,7 +5,7 @@
 #cut s s1 s2
 #save s D1234.draw 
 
-restore D1234.draw s
+restore [locate_data_file D1234.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_2 0.5*SCALE1 s_4 0.5*SCALE1 s_6
diff --git a/tests/blend/simple/M7 b/tests/blend/simple/M7
index 270c837da2..9b999b9de6 100644
--- a/tests/blend/simple/M7
+++ b/tests/blend/simple/M7
@@ -4,7 +4,7 @@
 #fuse s s1 s2
 #save s D5678.draw 
 
-restore D5678.draw s
+restore [locate_data_file D5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 1*SCALE1 s_14
diff --git a/tests/blend/simple/M8 b/tests/blend/simple/M8
index 2e4ec79256..148c8523a7 100644
--- a/tests/blend/simple/M8
+++ b/tests/blend/simple/M8
@@ -4,7 +4,7 @@
 #fuse s s1 s2
 #save s D5678.draw 
 
-restore D5678.draw s
+restore [locate_data_file D5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_14 0.5*SCALE1 s_5 0.5*SCALE1 s_6 
diff --git a/tests/blend/simple/M9 b/tests/blend/simple/M9
index 9976ba843e..234885232c 100644
--- a/tests/blend/simple/M9
+++ b/tests/blend/simple/M9
@@ -4,7 +4,7 @@
 #fuse s s1 s2
 #save s D5678.draw 
 
-restore D5678.draw s
+restore [locate_data_file D5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_7 0.5*SCALE1 s_5 0.5*SCALE1 s_6 
diff --git a/tests/blend/simple/N1 b/tests/blend/simple/N1
index a4761b28b1..eb7b62cafd 100644
--- a/tests/blend/simple/N1
+++ b/tests/blend/simple/N1
@@ -4,7 +4,7 @@
 #cut s s1 s2
 #save s E1234.draw 
 
-restore E1234.draw s
+restore [locate_data_file E1234.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_5 0.5*SCALE1 s_7 0.5*SCALE1 s_10
diff --git a/tests/blend/simple/N2 b/tests/blend/simple/N2
index 2ae5d12240..eab01e0f28 100644
--- a/tests/blend/simple/N2
+++ b/tests/blend/simple/N2
@@ -4,7 +4,7 @@
 #cut s s1 s2
 #save s E1234.draw 
 
-restore E1234.draw s
+restore [locate_data_file E1234.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_5 0.5*SCALE1 s_9 0.5*SCALE1 s_10 0.5*SCALE1 s_2
diff --git a/tests/blend/simple/N3 b/tests/blend/simple/N3
index 75713477b4..16e9b64821 100644
--- a/tests/blend/simple/N3
+++ b/tests/blend/simple/N3
@@ -5,7 +5,7 @@
 #fuse s s1 s2
 #save s E5678.draw 
 
-restore E5678.draw s
+restore [locate_data_file E5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_4 
diff --git a/tests/blend/simple/N4 b/tests/blend/simple/N4
index 885c89c84b..f095e862ed 100644
--- a/tests/blend/simple/N4
+++ b/tests/blend/simple/N4
@@ -5,7 +5,7 @@
 #fuse s s1 s2
 #save s E5678.draw 
 
-restore E5678.draw s
+restore [locate_data_file E5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_4 0.5*SCALE1 s_13 0.5*SCALE1 s_2
diff --git a/tests/blend/simple/N5 b/tests/blend/simple/N5
index d7becfbf79..7a40cd1ca6 100644
--- a/tests/blend/simple/N5
+++ b/tests/blend/simple/N5
@@ -5,7 +5,7 @@
 #fuse s s1 s2
 #save s E5678.draw 
 
-restore E5678.draw s
+restore [locate_data_file E5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_2 0.5*SCALE1 s_10
diff --git a/tests/blend/simple/N6 b/tests/blend/simple/N6
index bbe5af5383..bbae051615 100644
--- a/tests/blend/simple/N6
+++ b/tests/blend/simple/N6
@@ -5,7 +5,7 @@
 #cut s s1 s2
 #save s F1234.draw 
 
-restore F1234.draw s
+restore [locate_data_file F1234.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_5
diff --git a/tests/blend/simple/N7 b/tests/blend/simple/N7
index 8ab5bbcd36..0532bdab49 100644
--- a/tests/blend/simple/N7
+++ b/tests/blend/simple/N7
@@ -5,7 +5,7 @@
 #cut s s1 s2
 #save s F1234.draw 
 
-restore F1234.draw s
+restore [locate_data_file F1234.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_5 0.5*SCALE1 s_4 0.5*SCALE1 s_10 
diff --git a/tests/blend/simple/N8 b/tests/blend/simple/N8
index 5056b7298a..23ac7d4c19 100644
--- a/tests/blend/simple/N8
+++ b/tests/blend/simple/N8
@@ -5,7 +5,7 @@
 #cut s s1 s2
 #save s F1234.draw 
 
-restore F1234.draw s
+restore [locate_data_file F1234.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_5 0.5*SCALE1 s_4 0.5*SCALE1 s_6 0.5*SCALE1 s_7 
diff --git a/tests/blend/simple/N9 b/tests/blend/simple/N9
index b9ee622b94..0ba9aedc39 100644
--- a/tests/blend/simple/N9
+++ b/tests/blend/simple/N9
@@ -5,7 +5,7 @@
 #fuse s s1 s2
 #save s F5678.draw 
 
-restore F5678.draw s
+restore [locate_data_file F5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 1*SCALE1 s_7
diff --git a/tests/blend/simple/O1 b/tests/blend/simple/O1
index 1387ede69d..34ddf024ae 100644
--- a/tests/blend/simple/O1
+++ b/tests/blend/simple/O1
@@ -5,7 +5,7 @@
 #fuse s s1 s2
 #save s F5678.draw 
 
-restore F5678.draw s
+restore [locate_data_file F5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_7 0.5*SCALE1 s_6 0.5*SCALE1 s_14
diff --git a/tests/blend/simple/O2 b/tests/blend/simple/O2
index b5809575e8..15789220fd 100644
--- a/tests/blend/simple/O2
+++ b/tests/blend/simple/O2
@@ -5,7 +5,7 @@
 #fuse s s1 s2
 #save s F5678.draw 
 
-restore F5678.draw s
+restore [locate_data_file F5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_4 0.5*SCALE1 s_5 0.5*SCALE1 s_6 0.5*SCALE1 s_7
diff --git a/tests/blend/simple/O3 b/tests/blend/simple/O3
index f39334dea7..e2649424c5 100644
--- a/tests/blend/simple/O3
+++ b/tests/blend/simple/O3
@@ -6,7 +6,7 @@
 #cut s s1 s2
 #save s G1234.draw 
 
-restore G1234.draw s
+restore [locate_data_file G1234.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_6
diff --git a/tests/blend/simple/O4 b/tests/blend/simple/O4
index ed52242f7e..db3a52f4ec 100644
--- a/tests/blend/simple/O4
+++ b/tests/blend/simple/O4
@@ -6,7 +6,7 @@
 #cut s s1 s2
 #save s G1234.draw 
 
-restore G1234.draw s
+restore [locate_data_file G1234.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_6 0.5*SCALE1 s_5 0.5*SCALE1 s_11
diff --git a/tests/blend/simple/O5 b/tests/blend/simple/O5
index 1d1a87e7a3..fc7300541f 100644
--- a/tests/blend/simple/O5
+++ b/tests/blend/simple/O5
@@ -6,7 +6,7 @@
 #cut s s1 s2
 #save s G1234.draw 
 
-restore G1234.draw s
+restore [locate_data_file G1234.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_6 0.5*SCALE1 s_5 0.5*SCALE1 s_4
diff --git a/tests/blend/simple/O6 b/tests/blend/simple/O6
index 5cad542ca9..023d76ed94 100644
--- a/tests/blend/simple/O6
+++ b/tests/blend/simple/O6
@@ -6,7 +6,7 @@
 #fuse s s1 s2
 #save s G5678.draw 
 
-restore G5678.draw s
+restore [locate_data_file G5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_6
diff --git a/tests/blend/simple/O7 b/tests/blend/simple/O7
index 38ad7cce1b..7785c92a66 100644
--- a/tests/blend/simple/O7
+++ b/tests/blend/simple/O7
@@ -6,7 +6,7 @@
 #fuse s s1 s2
 #save s G5678.draw 
 
-restore G5678.draw s
+restore [locate_data_file G5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_6 0.5*SCALE1 s_5 0.5*SCALE1 s_11
diff --git a/tests/blend/simple/O8 b/tests/blend/simple/O8
index 97e4dcf238..b2d0658d62 100644
--- a/tests/blend/simple/O8
+++ b/tests/blend/simple/O8
@@ -5,7 +5,7 @@
 #cut s s1 s2
 #save s H1234.draw 
 
-restore H1234.draw s
+restore [locate_data_file H1234.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_3
diff --git a/tests/blend/simple/O9 b/tests/blend/simple/O9
index 3df2b7eb2d..dfed15ea08 100644
--- a/tests/blend/simple/O9
+++ b/tests/blend/simple/O9
@@ -5,7 +5,7 @@
 #cut s s1 s2
 #save s H1234.draw 
 
-restore H1234.draw s
+restore [locate_data_file H1234.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_3 0.5*SCALE1 s_1 0.5*SCALE1 s_5
diff --git a/tests/blend/simple/P1 b/tests/blend/simple/P1
index 3c373f945f..ff16d151d9 100644
--- a/tests/blend/simple/P1
+++ b/tests/blend/simple/P1
@@ -5,7 +5,7 @@
 #fuse s s1 s2
 #save s H5678.draw 
 
-restore H5678.draw s
+restore [locate_data_file H5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_3
diff --git a/tests/blend/simple/P2 b/tests/blend/simple/P2
index 587f1acf16..ef232fc708 100644
--- a/tests/blend/simple/P2
+++ b/tests/blend/simple/P2
@@ -5,7 +5,7 @@
 #fuse s s1 s2
 #save s H5678.draw 
 
-restore H5678.draw s
+restore [locate_data_file H5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_3 0.5*SCALE1 s_1
diff --git a/tests/blend/simple/P3 b/tests/blend/simple/P3
index cd7f86f5be..dccac28f20 100644
--- a/tests/blend/simple/P3
+++ b/tests/blend/simple/P3
@@ -5,7 +5,7 @@
 #fuse s s1 s2
 #save s H5678.draw 
 
-restore H5678.draw s
+restore [locate_data_file H5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_3 0.5*SCALE1 s_1 0.5*SCALE1 s_5 0.5*SCALE1 s_2
diff --git a/tests/blend/simple/P4 b/tests/blend/simple/P4
index 5da34d714a..9796d37ed6 100644
--- a/tests/blend/simple/P4
+++ b/tests/blend/simple/P4
@@ -5,7 +5,7 @@
 #cut s s1 s2
 #save s I1234.draw 
 
-restore I1234.draw s
+restore [locate_data_file I1234.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_3
diff --git a/tests/blend/simple/P5 b/tests/blend/simple/P5
index 8cf2dec530..0a484c97ea 100644
--- a/tests/blend/simple/P5
+++ b/tests/blend/simple/P5
@@ -5,7 +5,7 @@
 #cut s s1 s2
 #save s I1234.draw 
 
-restore I1234.draw s
+restore [locate_data_file I1234.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_3 0.5*SCALE1 s_1
diff --git a/tests/blend/simple/P6 b/tests/blend/simple/P6
index c8e2def73e..3757ad0a04 100644
--- a/tests/blend/simple/P6
+++ b/tests/blend/simple/P6
@@ -5,7 +5,7 @@
 #fuse s s1 s2
 #save s I5678.draw 
 
-restore I5678.draw s
+restore [locate_data_file I5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_4
diff --git a/tests/blend/simple/P7 b/tests/blend/simple/P7
index e0102d4f7b..f2992cd36f 100644
--- a/tests/blend/simple/P7
+++ b/tests/blend/simple/P7
@@ -5,7 +5,7 @@
 #fuse s s1 s2
 #save s I5678.draw 
 
-restore I5678.draw s
+restore [locate_data_file I5678.draw] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_4 0.5*SCALE1 s_5 0.5*SCALE1 s_13
diff --git a/tests/blend/simple/Q3 b/tests/blend/simple/Q3
index d126e92538..be2f0a74f0 100644
--- a/tests/blend/simple/Q3
+++ b/tests/blend/simple/Q3
@@ -1,5 +1,5 @@
 puts "TODO OCC22817 All: TEST INCOMPLETE"
-restore 4_E1(test16).draw s
+restore [locate_data_file 4_E1(test16).draw] s
 tscale s 0 0 0 SCALE
 explode s E
 blend result s 1*SCALE s_5
diff --git a/tests/blend/simple/Q5 b/tests/blend/simple/Q5
index 7485c2f101..cec1b20b2e 100644
--- a/tests/blend/simple/Q5
+++ b/tests/blend/simple/Q5
@@ -1,4 +1,4 @@
-restore 4_G1(test22).draw s
+restore [locate_data_file 4_G1(test22).draw] s
 tscale s 0 0 0 SCALE
 explode s E
 blend result s SCALE*2.5 s_17
diff --git a/tests/blend/simple/Q6 b/tests/blend/simple/Q6
index f1e6332a37..ed9744c593 100644
--- a/tests/blend/simple/Q6
+++ b/tests/blend/simple/Q6
@@ -1,4 +1,4 @@
-restore 4_H1(test23).draw s
+restore [locate_data_file 4_H1(test23).draw] s
 tscale s 0 0 0 SCALE
 explode s E
 blend result s SCALE*2 s_5
diff --git a/tests/blend/simple/Q8 b/tests/blend/simple/Q8
index 3fd3e02ca7..7919f32775 100644
--- a/tests/blend/simple/Q8
+++ b/tests/blend/simple/Q8
@@ -1,5 +1,5 @@
 puts "TODO OCC22817 All:TEST INCOMPLETE"
-restore 4_J1(test1).draw s
+restore [locate_data_file 4_J1(test1).draw] s
 tscale s 0 0 0 SCALE
 explode s E
 blend result s 10*SCALE s_12
diff --git a/tests/blend/simple/Q9 b/tests/blend/simple/Q9
index eee7cf5514..ce8ce7b595 100644
--- a/tests/blend/simple/Q9
+++ b/tests/blend/simple/Q9
@@ -1,4 +1,4 @@
-restore 4_K1(hlacg01).draw s
+restore [locate_data_file 4_K1(hlacg01).draw] s
 tscale s 0 0 0 SCALE
 explode s E
 blend result s SCALE*0.0025 s_6
diff --git a/tests/blend/simple/R1 b/tests/blend/simple/R1
index 9f744d7bb7..f5099a3968 100644
--- a/tests/blend/simple/R1
+++ b/tests/blend/simple/R1
@@ -1,4 +1,4 @@
-restore 4_L1(hlacg03).draw s
+restore [locate_data_file 4_L1(hlacg03).draw] s
 tscale s 0 0 0 SCALE
 explode s E
 blend result s SCALE*0.011 s_6 SCALE*0.011 s_5 SCALE*0.011 s_9
diff --git a/tests/blend/simple/R2 b/tests/blend/simple/R2
index c8b0af793f..d13a5d9629 100644
--- a/tests/blend/simple/R2
+++ b/tests/blend/simple/R2
@@ -1,4 +1,4 @@
-restore 4_M1(hlacg04).draw s
+restore [locate_data_file 4_M1(hlacg04).draw] s
 tscale s 0 0 0 SCALE
 explode s E
 blend result s SCALE*0.011 s_6
diff --git a/tests/blend/simple/R3 b/tests/blend/simple/R3
index a2f8dc460d..841c3994c0 100644
--- a/tests/blend/simple/R3
+++ b/tests/blend/simple/R3
@@ -1,4 +1,4 @@
-restore 4_N1(hlacg05).draw s
+restore [locate_data_file 4_N1(hlacg05).draw] s
 tscale s 0 0 0 SCALE
 explode s E
 blend result s SCALE*0.0005 s_1
diff --git a/tests/blend/simple/R4 b/tests/blend/simple/R4
index 3d9a9f37d2..f7506c2fd4 100644
--- a/tests/blend/simple/R4
+++ b/tests/blend/simple/R4
@@ -1,4 +1,4 @@
-restore 4_O1(hlacg06).draw s
+restore [locate_data_file 4_O1(hlacg06).draw] s
 tscale s 0 0 0 SCALE
 explode s E
 blend result s SCALE*0.0005 s_25
diff --git a/tests/blend/simple/R5 b/tests/blend/simple/R5
index 958dac0574..690d0ae53e 100644
--- a/tests/blend/simple/R5
+++ b/tests/blend/simple/R5
@@ -1,4 +1,4 @@
-restore 4_P1(hlacg07).draw s
+restore [locate_data_file 4_P1(hlacg07).draw] s
 tscale s 0 0 0 SCALE
 explode s E
 blend result s SCALE*0.0005 s_10
diff --git a/tests/blend/simple/R6 b/tests/blend/simple/R6
index 6aa4f25e13..48c9a7b6ee 100644
--- a/tests/blend/simple/R6
+++ b/tests/blend/simple/R6
@@ -1,4 +1,4 @@
-restore 4_Q1(hlacg08).draw s
+restore [locate_data_file 4_Q1(hlacg08).draw] s
 tscale s 0 0 0 SCALE
 explode s E
 blend result s SCALE*0.0005 s_21
diff --git a/tests/blend/simple/R7 b/tests/blend/simple/R7
index 0b821f62b1..fbd3eaefe9 100644
--- a/tests/blend/simple/R7
+++ b/tests/blend/simple/R7
@@ -1,4 +1,4 @@
-restore 4_T1(shell).draw s
+restore [locate_data_file 4_T1(shell).draw] s
 tscale s 0 0 0 SCALE
 explode s E
 blend result s SCALE*0.001 s_2  SCALE*0.001 s_4  SCALE*0.001 s_1  SCALE*0.001 s_3  \
diff --git a/tests/blend/simple/R8 b/tests/blend/simple/R8
index 82c9459a5b..e262e2257a 100644
--- a/tests/blend/simple/R8
+++ b/tests/blend/simple/R8
@@ -4,7 +4,7 @@
 #fuse s b c
 #save s 6_A1234.draw
 
-restore 6_A1234.draw s
+restore [locate_data_file 6_A1234.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 blend result s 3*SCALE2 s_5
diff --git a/tests/blend/simple/R9 b/tests/blend/simple/R9
index f9534b96fc..e0a6e5e23b 100644
--- a/tests/blend/simple/R9
+++ b/tests/blend/simple/R9
@@ -3,7 +3,7 @@
 #ttranslate c 0 0 10
 #fuse s b c
 
-restore 6_A1234.draw s
+restore [locate_data_file 6_A1234.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 blend result s 3*SCALE2 s_4
diff --git a/tests/blend/simple/S1 b/tests/blend/simple/S1
index 91ec18b6f9..de2d87cd21 100644
--- a/tests/blend/simple/S1
+++ b/tests/blend/simple/S1
@@ -9,7 +9,7 @@
 #donly s
 #save s 6_A56.draw
 
-restore 6_A56.draw s
+restore [locate_data_file 6_A56.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 blend result s 6*SCALE2 s_10
diff --git a/tests/blend/simple/S2 b/tests/blend/simple/S2
index c384cd10ed..6c2cd1c163 100644
--- a/tests/blend/simple/S2
+++ b/tests/blend/simple/S2
@@ -3,7 +3,7 @@
 #fuse s b c
 #save s 6_B1234.draw
 
-restore 6_B1234.draw s
+restore [locate_data_file 6_B1234.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 blend result s 8*SCALE2 s_7
diff --git a/tests/blend/simple/S3 b/tests/blend/simple/S3
index 3da89abbdd..8cf9344909 100644
--- a/tests/blend/simple/S3
+++ b/tests/blend/simple/S3
@@ -2,7 +2,7 @@
 #pcone c 10 5 20
 #fuse s b c
 
-restore 6_B1234.draw s
+restore [locate_data_file 6_B1234.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 blend result s 8*SCALE2 s_3
diff --git a/tests/blend/simple/S4 b/tests/blend/simple/S4
index 322c32aded..dea1915d9f 100644
--- a/tests/blend/simple/S4
+++ b/tests/blend/simple/S4
@@ -8,7 +8,7 @@
 #donly s
 #save s 6_B56.draw
 
-restore 6_B56.draw s
+restore [locate_data_file 6_B56.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 blend result s 8*SCALE2 s_3
diff --git a/tests/blend/simple/S5 b/tests/blend/simple/S5
index 5202638dd2..1f3f2fd899 100644
--- a/tests/blend/simple/S5
+++ b/tests/blend/simple/S5
@@ -3,7 +3,7 @@
 #fuse s s b
 #save s 6_C1234.draw 
 
-restore 6_C1234.draw s
+restore [locate_data_file 6_C1234.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 blend result s 3*SCALE2 s_8
diff --git a/tests/blend/simple/S6 b/tests/blend/simple/S6
index 4646089e74..510d3d0019 100644
--- a/tests/blend/simple/S6
+++ b/tests/blend/simple/S6
@@ -2,7 +2,7 @@
 #psphere s 13 0 90 
 #fuse s s b
 
-restore 6_C1234.draw s
+restore [locate_data_file 6_C1234.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 blend result s 3*SCALE2 s_7
diff --git a/tests/blend/simple/S7 b/tests/blend/simple/S7
index c9e0463ff6..c9cbfcc0b5 100644
--- a/tests/blend/simple/S7
+++ b/tests/blend/simple/S7
@@ -7,7 +7,7 @@
 #fuse s f1 c
 #save s 6_C56.draw
 
-restore 6_C56.draw s
+restore [locate_data_file 6_C56.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 blend result s 3*SCALE2 s_3
diff --git a/tests/blend/simple/S8 b/tests/blend/simple/S8
index 2bdff41914..916fca6581 100644
--- a/tests/blend/simple/S8
+++ b/tests/blend/simple/S8
@@ -3,7 +3,7 @@
 #fuse s s b
 #save s 6_D1234.draw 
 
-restore 6_D1234.draw s
+restore [locate_data_file 6_D1234.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 blend result s 10*SCALE2 s_8
diff --git a/tests/blend/simple/S9 b/tests/blend/simple/S9
index 39272c0e0c..851ecc04d9 100644
--- a/tests/blend/simple/S9
+++ b/tests/blend/simple/S9
@@ -2,7 +2,7 @@
 #ptorus s 20 5 0 90
 #fuse s s b
 
-restore 6_D1234.draw s
+restore [locate_data_file 6_D1234.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 blend result s 10*SCALE2 s_7
diff --git a/tests/blend/simple/T1 b/tests/blend/simple/T1
index 0cff161010..7410125352 100644
--- a/tests/blend/simple/T1
+++ b/tests/blend/simple/T1
@@ -7,7 +7,7 @@
 #fuse s f1 c
 #save s 6_D56.draw
 
-restore 6_D56.draw s
+restore [locate_data_file 6_D56.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 blend result s 8*SCALE2 s_3
diff --git a/tests/blend/simple/T2 b/tests/blend/simple/T2
index 3060b61756..66a7f8df42 100644
--- a/tests/blend/simple/T2
+++ b/tests/blend/simple/T2
@@ -7,7 +7,7 @@
 #trotate s 0 0 0 0 0 1 -10
 #save s 6_E1234.draw
 
-restore 6_E1234.draw s
+restore [locate_data_file 6_E1234.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 blend result s 4*SCALE2 s_13
diff --git a/tests/blend/simple/T3 b/tests/blend/simple/T3
index 4e532204a1..75a1c15d72 100644
--- a/tests/blend/simple/T3
+++ b/tests/blend/simple/T3
@@ -6,7 +6,7 @@
 #trotate s 0 0 0 1 1 0 -40
 #trotate s 0 0 0 0 0 1 -10
 
-restore 6_E1234.draw s
+restore [locate_data_file 6_E1234.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 blend result s 8*SCALE2 s_7
diff --git a/tests/blend/simple/T4 b/tests/blend/simple/T4
index 4852d9a77f..246af6558b 100644
--- a/tests/blend/simple/T4
+++ b/tests/blend/simple/T4
@@ -12,7 +12,7 @@
 #glue s c r c_3 r_2
 #save s 6_E56.draw
 
-restore 6_E56.draw s
+restore [locate_data_file 6_E56.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 blend result s 8*SCALE2 s_7
diff --git a/tests/blend/simple/T5 b/tests/blend/simple/T5
index 2e8cb5e144..d1f4c7fbe8 100644
--- a/tests/blend/simple/T5
+++ b/tests/blend/simple/T5
@@ -7,7 +7,7 @@
 #fuse s f b
 #save s 6_F1234.draw
 
-restore 6_F1234.draw s
+restore [locate_data_file 6_F1234.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 blend result s 4*SCALE2 s_14
diff --git a/tests/blend/simple/T6 b/tests/blend/simple/T6
index 0612fbb02a..a5215266f2 100644
--- a/tests/blend/simple/T6
+++ b/tests/blend/simple/T6
@@ -6,7 +6,7 @@
 #prism f w 2 0 30
 #fuse s f b
 
-restore 6_F1234.draw s
+restore [locate_data_file 6_F1234.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 blend result s 6*SCALE2 s_7
diff --git a/tests/blend/simple/T7 b/tests/blend/simple/T7
index 5b8325d37c..4592fad875 100644
--- a/tests/blend/simple/T7
+++ b/tests/blend/simple/T7
@@ -11,7 +11,7 @@
 #fuse s f1 c
 #save s 6_F56.draw
 
-restore 6_F56.draw s
+restore [locate_data_file 6_F56.draw] s
 tscale s 0 0 0 SCALE2
 nexplode s E
 blend result s 6*SCALE2 s_8
diff --git a/tests/blend/simple/T8 b/tests/blend/simple/T8
index 9646f62e95..dd36baace6 100644
--- a/tests/blend/simple/T8
+++ b/tests/blend/simple/T8
@@ -12,7 +12,7 @@
 #glue s p b p_2 b_2
 #save s 6_G1234.draw
 
-restore 6_G1234.draw s
+restore [locate_data_file 6_G1234.draw] s
 tscale s 0 0 0 SCALE2
 explode  s E
 blend result s 6*SCALE2 s_13
diff --git a/tests/blend/simple/T9 b/tests/blend/simple/T9
index 6794a4222d..52c1eb577b 100644
--- a/tests/blend/simple/T9
+++ b/tests/blend/simple/T9
@@ -11,7 +11,7 @@
 #explode p F
 #glue s p b p_2 b_2
 
-restore 6_G1234.draw s
+restore [locate_data_file 6_G1234.draw] s
 tscale s 0 0 0 SCALE2
 explode  s E
 blend result s 10*SCALE2 s_10
diff --git a/tests/blend/simple/U1 b/tests/blend/simple/U1
index d90137fd8c..d8bed70a7e 100644
--- a/tests/blend/simple/U1
+++ b/tests/blend/simple/U1
@@ -19,7 +19,7 @@ puts "TODO OCC22817 All:Faulty shapes in variables faulty_1 to faulty_2 "
 #glue s c r c_3 r_6 
 #save s 6_G56.draw
 
-restore 6_G56.draw s
+restore [locate_data_file 6_G56.draw] s
 tscale s 0 0 0 SCALE2
 fsameparameter s
 explode  s E
diff --git a/tests/blend/simple/U2 b/tests/blend/simple/U2
index 3fa5330fe4..ba017be1f0 100644
--- a/tests/blend/simple/U2
+++ b/tests/blend/simple/U2
@@ -8,7 +8,7 @@
 #fuse s s1 b
 #save s 6_H1234.draw
 
-restore 6_H1234.draw s
+restore [locate_data_file 6_H1234.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 blend result s 5*SCALE2 s_14
diff --git a/tests/blend/simple/U3 b/tests/blend/simple/U3
index 8e8b94a752..720f9be386 100644
--- a/tests/blend/simple/U3
+++ b/tests/blend/simple/U3
@@ -8,7 +8,7 @@
 #fuse s s1 b
 
 
-restore 6_H1234.draw s
+restore [locate_data_file 6_H1234.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 blend result s 5*SCALE2 s_3
diff --git a/tests/blend/simple/U4 b/tests/blend/simple/U4
index 84191eb3db..ec74131a48 100644
--- a/tests/blend/simple/U4
+++ b/tests/blend/simple/U4
@@ -13,7 +13,7 @@
 #donly s
 #save s 6_H56.draw
 
-restore 6_H56.draw s
+restore [locate_data_file 6_H56.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 blend result s 5*SCALE2 s_2
diff --git a/tests/blend/simple/U5 b/tests/blend/simple/U5
index 8973feda7b..3fd1a4e4f2 100644
--- a/tests/blend/simple/U5
+++ b/tests/blend/simple/U5
@@ -5,7 +5,7 @@
 #fuse s s1 s2
 #save s 6_I1234.draw 
 
-restore 6_I1234.draw  s
+restore [locate_data_file 6_I1234.draw]  s
 tscale s 0 0 0 SCALE2
 explode s E
 blend result s 2.5*SCALE2 s_6
diff --git a/tests/blend/simple/U6 b/tests/blend/simple/U6
index a6b6698af1..267b5d2414 100644
--- a/tests/blend/simple/U6
+++ b/tests/blend/simple/U6
@@ -4,7 +4,7 @@
 #ttranslate s2 0 7 7
 #fuse s s1 s2
 
-restore 6_I1234.draw s
+restore [locate_data_file 6_I1234.draw] s
 tscale s 0 0 0 SCALE2
 explode s E
 blend result s 3*SCALE2 s_1
diff --git a/tests/blend/simple/U7 b/tests/blend/simple/U7
index 4f1a466f6f..2f902272cf 100644
--- a/tests/blend/simple/U7
+++ b/tests/blend/simple/U7
@@ -8,7 +8,7 @@ puts "TODO OCC22817 All:TEST INCOMPLETE"
 #fuse s s4 s3
 #save s 6_I56.draw 
 
-restore 6_I56.draw  s
+restore [locate_data_file 6_I56.draw]  s
 tscale s 0 0 0 SCALE2
 explode s E
 blend result s 3*SCALE2 s_6
diff --git a/tests/blend/simple/U9 b/tests/blend/simple/U9
index 173ab7d4d4..bdbd4b4a05 100644
--- a/tests/blend/simple/U9
+++ b/tests/blend/simple/U9
@@ -1,4 +1,4 @@
-restore 8_B1.draw s
+restore [locate_data_file 8_B1.draw] s
 tscale s 0 0 0 SCALE
 explode s e
 blend result  s SCALE*0.15 s_1
diff --git a/tests/blend/simple/V2 b/tests/blend/simple/V2
index bea50fc53b..0d43515165 100644
--- a/tests/blend/simple/V2
+++ b/tests/blend/simple/V2
@@ -1,4 +1,4 @@
-restore 8_D1.draw  s
+restore [locate_data_file 8_D1.draw]  s
 tscale s 0 0 0 SCALE1 
 explode s E
 blend result s 2*SCALE1 s_2
diff --git a/tests/blend/simple/V3 b/tests/blend/simple/V3
index a2d028df03..4717706c6c 100644
--- a/tests/blend/simple/V3
+++ b/tests/blend/simple/V3
@@ -12,7 +12,7 @@
 #trotate s 0 0 0 0 0 1 -20
 #save s 8_E1.draw  
 
-restore  8_E1.draw  s
+restore [locate_data_file 8_E1.draw]  s
 tscale s 0 0 0 SCALE1
 explode s E
 blend result s 0.5*SCALE1 s_2 
diff --git a/tests/blend/simple/V4 b/tests/blend/simple/V4
index 0c9c9e9b78..dc770c7460 100644
--- a/tests/blend/simple/V4
+++ b/tests/blend/simple/V4
@@ -1,6 +1,6 @@
 #modele fabrique dans STRIM et transfere dans DRAW
 
-restore 8_F1.draw  s
+restore [locate_data_file 8_F1.draw]  s
 tscale s 0 0 0 SCALE1 
 explode s E
 blend result s 8*SCALE1 s_4
diff --git a/tests/blend/simple/V5 b/tests/blend/simple/V5
index a9432e7387..54bc0795ef 100644
--- a/tests/blend/simple/V5
+++ b/tests/blend/simple/V5
@@ -9,7 +9,7 @@
 #trotate s 0 0 0 0 0 1 -20
 #save s 8_G1.draw 
 
-restore 8_G1.draw s
+restore [locate_data_file 8_G1.draw] s
 tscale s 0 0 0 SCALE1
 explode s E
 blend result s 0.5*SCALE1 s_2 
diff --git a/tests/blend/simple/V6 b/tests/blend/simple/V6
index 8be375e461..e2f3b6ce73 100644
--- a/tests/blend/simple/V6
+++ b/tests/blend/simple/V6
@@ -11,7 +11,7 @@
 #pipe s d w
 #save s  8_I1.draw 
 
-restore 8_I1.draw s
+restore [locate_data_file 8_I1.draw] s
 tscale s 0 0 0 SCALE1
 fsameparameter s
 explode s E
diff --git a/tests/blend/simple/V7 b/tests/blend/simple/V7
index 4eed9ff1d3..5c9660b2d8 100644
--- a/tests/blend/simple/V7
+++ b/tests/blend/simple/V7
@@ -1,4 +1,4 @@
-restore 8_J1.draw s
+restore [locate_data_file 8_J1.draw] s
 tscale s 0 0 0 SCALE
 explode s e
 blend result  s 5*SCALE1 s_3
diff --git a/tests/blend/simple/V8 b/tests/blend/simple/V8
index 56bf096ec3..f83fc4522c 100644
--- a/tests/blend/simple/V8
+++ b/tests/blend/simple/V8
@@ -4,7 +4,7 @@
 ## Comment : From CV tests serie page 5
 ## ======================================
 
-restore 1_A12.rle s
+restore [locate_data_file 1_A12.rle] s
 explode s E
 blend result s 1 s_6 1 s_10
 
diff --git a/tests/blend/simple/V9 b/tests/blend/simple/V9
index eff07b458c..94ad9bb789 100644
--- a/tests/blend/simple/V9
+++ b/tests/blend/simple/V9
@@ -4,7 +4,7 @@
 ## Comment : From CV tests serie page 6
 ## ======================================
 
-restore 1_A12.rle s
+restore [locate_data_file 1_A12.rle] s
 explode s E
 blend result s 1 s_6 0.5 s_10
 
diff --git a/tests/blend/simple/W1 b/tests/blend/simple/W1
index 2dd82c8eb5..670d11ba54 100644
--- a/tests/blend/simple/W1
+++ b/tests/blend/simple/W1
@@ -4,7 +4,7 @@
 ## Comment : From CV tests serie page 7
 ## ======================================
 
-restore 1_B12.rle s
+restore [locate_data_file 1_B12.rle] s
 explode s E
 blend result s 1 s_6 1 s_10 1 s_5
 
diff --git a/tests/blend/simple/W2 b/tests/blend/simple/W2
index 56b1e5dc86..61faa8c36a 100644
--- a/tests/blend/simple/W2
+++ b/tests/blend/simple/W2
@@ -4,7 +4,7 @@
 ## Comment : From CV tests serie page 9/10
 ## ========================================
 
-restore 1_C1234.rle s
+restore [locate_data_file 1_C1234.rle] s
 explode s E
 blend result s 0.2 s_2
 
diff --git a/tests/blend/simple/W3 b/tests/blend/simple/W3
index df44c32b72..cb3402f55a 100644
--- a/tests/blend/simple/W3
+++ b/tests/blend/simple/W3
@@ -4,7 +4,7 @@
 ## Comment : From CV tests serie page 11
 ## ======================================
 
-restore 1_C1234.rle s
+restore [locate_data_file 1_C1234.rle] s
 explode s E
 blend result s 0.2 s_2 0.2 s_6
 
diff --git a/tests/blend/simple/W4 b/tests/blend/simple/W4
index 0001614a40..a20f347840 100644
--- a/tests/blend/simple/W4
+++ b/tests/blend/simple/W4
@@ -4,7 +4,7 @@
 ## Comment : From CV tests serie page 12/13
 ## ===========================================
 
-restore 1_C1234.rle s
+restore [locate_data_file 1_C1234.rle] s
 explode s E
 blend result s 0.2 s_2 0.2 s_1
 
diff --git a/tests/blend/simple/W5 b/tests/blend/simple/W5
index 73e99a57bd..d6be81eb18 100644
--- a/tests/blend/simple/W5
+++ b/tests/blend/simple/W5
@@ -4,7 +4,7 @@
 ## Comment : From CV tests serie page 14
 ## ===========================================
 
-restore 1_C1234.rle s
+restore [locate_data_file 1_C1234.rle] s
 explode s E
 blend result s 0.2 s_2 0.2 s_1 0.2 s_6
 
diff --git a/tests/blend/simple/W6 b/tests/blend/simple/W6
index 93d4fb5a2c..1b8ac3d05d 100644
--- a/tests/blend/simple/W6
+++ b/tests/blend/simple/W6
@@ -4,7 +4,7 @@
 ## Comment : From CV tests serie page 15
 ## ===========================================
 
-restore 1_D12.rle s
+restore [locate_data_file 1_D12.rle] s
 explode s E
 blend result s 5 s_5
 
diff --git a/tests/blend/simple/W7 b/tests/blend/simple/W7
index 195176f695..ee084aa6cb 100644
--- a/tests/blend/simple/W7
+++ b/tests/blend/simple/W7
@@ -6,7 +6,7 @@
 
 puts "TODO OCC22739 All:TEST INCOMPLETE"
 
-restore 1_D12.rle s
+restore [locate_data_file 1_D12.rle] s
 explode s E
 blend result s 10 s_5
 
diff --git a/tests/blend/simple/W8 b/tests/blend/simple/W8
index 0cbe6a23c0..9b340c5a5b 100644
--- a/tests/blend/simple/W8
+++ b/tests/blend/simple/W8
@@ -4,7 +4,7 @@
 ## Comment : From CV tests serie page 18
 ## ===========================================
 
-restore 1_E12.rle s
+restore [locate_data_file 1_E12.rle] s
 explode s E
 blend result s 5 s_5
 
diff --git a/tests/blend/simple/W9 b/tests/blend/simple/W9
index b2f20929d4..a7727d0be5 100644
--- a/tests/blend/simple/W9
+++ b/tests/blend/simple/W9
@@ -4,7 +4,7 @@
 ## Comment : From CV tests serie page 19
 ## ===========================================
 
-restore 1_E12.rle s
+restore [locate_data_file 1_E12.rle] s
 explode s E
 blend result s 15 s_5
 
diff --git a/tests/blend/simple/X2 b/tests/blend/simple/X2
index 1024defaf6..6d85ef7197 100644
--- a/tests/blend/simple/X2
+++ b/tests/blend/simple/X2
@@ -4,7 +4,7 @@
 ## Comment : From CV tests serie page 21/22
 ## ===========================================
 
-restore 1_F1.rle s
+restore [locate_data_file 1_F1.rle] s
 explode s E
 blend result s 20.5 s_11
 
diff --git a/tests/blend/simple/X3 b/tests/blend/simple/X3
index 0f6380ab2d..576b6a74a4 100644
--- a/tests/blend/simple/X3
+++ b/tests/blend/simple/X3
@@ -4,7 +4,7 @@
 ## Comment : From CV tests serie page 23/24
 ## ===========================================
 
-restore 1_G1.rle s
+restore [locate_data_file 1_G1.rle] s
 explode s E
 blend result s 25 s_3
 
diff --git a/tests/blend/simple/X4 b/tests/blend/simple/X4
index 6b716e9601..08e2ec5068 100644
--- a/tests/blend/simple/X4
+++ b/tests/blend/simple/X4
@@ -4,7 +4,7 @@
 ## Comment : From CV tests serie page 25/26
 ## ===========================================
 
-restore 1_H1.rle s
+restore [locate_data_file 1_H1.rle] s
 explode s E
 blend result s 30 s_14
 
diff --git a/tests/blend/simple/X5 b/tests/blend/simple/X5
index 3fd8470938..af2fdfdbb6 100644
--- a/tests/blend/simple/X5
+++ b/tests/blend/simple/X5
@@ -4,7 +4,7 @@
 ## Comment : From CV tests serie page 27/28/29
 ## ===========================================
 
-restore 1_I12.rle s
+restore [locate_data_file 1_I12.rle] s
 trotate s 0 0 0 0 0 1 -85
 explode s E
 blend result s 10  s_22 10 s_20 10 s_25 10 s_16 10 s_15 10 s_18
diff --git a/tests/blend/simple/X6 b/tests/blend/simple/X6
index d16a8a8447..6c4be4de51 100644
--- a/tests/blend/simple/X6
+++ b/tests/blend/simple/X6
@@ -4,7 +4,7 @@
 ## Comment : From CV tests serie page 32/33
 ## ===========================================
 
-restore 1_J1.rle s0
+restore [locate_data_file 1_J1.rle] s0
 explode s0 E
 blend s s0 30 s0_5
 blend result s0 30 s0_5 30 s0_10
diff --git a/tests/blend/simple/X7 b/tests/blend/simple/X7
index 420da89275..57794e4033 100644
--- a/tests/blend/simple/X7
+++ b/tests/blend/simple/X7
@@ -4,7 +4,7 @@
 ## Comment : From CV tests serie page 34/35
 ## ===========================================
 
-restore 1_K1.rle s
+restore [locate_data_file 1_K1.rle] s
 explode s E
 blend result s 10 s_23
 
diff --git a/tests/blend/simple/X8 b/tests/blend/simple/X8
index 3cd2847023..d74e142fb2 100644
--- a/tests/blend/simple/X8
+++ b/tests/blend/simple/X8
@@ -4,7 +4,7 @@
 ## Comment : From CV tests serie page 37/38
 ## ===========================================
 
-restore 1_M12.rle s
+restore [locate_data_file 1_M12.rle] s
 trotate s 0 0 0 1 0 0 90
 explode s E
 blend result s 10 s_2 10 s_4 10 s_12 10 s_13
diff --git a/tests/blend/simple/X9 b/tests/blend/simple/X9
index 1a6dbab570..342f4cb490 100644
--- a/tests/blend/simple/X9
+++ b/tests/blend/simple/X9
@@ -4,7 +4,7 @@
 ## Comment : From CV tests serie page 39/40
 ## ===========================================
 
-restore 1_M12.rle s
+restore [locate_data_file 1_M12.rle] s
 trotate s 0 0 0 1 0 0 90
 explode s E
 blend result s 10 s_2
diff --git a/tests/blend/simple/Y1 b/tests/blend/simple/Y1
index 31275ecc82..54c743cfd0 100644
--- a/tests/blend/simple/Y1
+++ b/tests/blend/simple/Y1
@@ -4,7 +4,7 @@
 ## Comment : From CV tests serie page 41/42
 ## ===========================================
 
-restore 1_N1234.rle s
+restore [locate_data_file 1_N1234.rle] s
 explode s E
 blend result s 10 s_7
 
diff --git a/tests/blend/simple/Y2 b/tests/blend/simple/Y2
index 382cb46b3a..a3713b472a 100644
--- a/tests/blend/simple/Y2
+++ b/tests/blend/simple/Y2
@@ -4,7 +4,7 @@
 ## Comment : From CV tests serie page 43
 ## ===========================================
 
-restore 1_N1234.rle s
+restore [locate_data_file 1_N1234.rle] s
 explode s E
 blend result s 15 s_7
 
diff --git a/tests/blend/simple/Y3 b/tests/blend/simple/Y3
index 4b86cf3167..9d9b7ffe4c 100644
--- a/tests/blend/simple/Y3
+++ b/tests/blend/simple/Y3
@@ -4,7 +4,7 @@
 ## Comment : From CV tests serie page 44
 ## ===========================================
 
-restore 1_N1234.rle s
+restore [locate_data_file 1_N1234.rle] s
 explode s E
 blend result s 20 s_7
 
diff --git a/tests/blend/simple/Y4 b/tests/blend/simple/Y4
index df75d4ea26..a6afb98a8e 100644
--- a/tests/blend/simple/Y4
+++ b/tests/blend/simple/Y4
@@ -4,7 +4,7 @@
 ## Comment : From CV tests serie page 45
 ## ===========================================
 
-restore 1_N1234.rle s
+restore [locate_data_file 1_N1234.rle] s
 explode s E
 blend result s 25 s_7
 
diff --git a/tests/blend/simple/Y5 b/tests/blend/simple/Y5
index 8bef9ef097..512101707e 100644
--- a/tests/blend/simple/Y5
+++ b/tests/blend/simple/Y5
@@ -5,7 +5,7 @@
 ## ===========================================
 
 # is this test 01 or 02 ?
-restore 1_O123.rle tmp
+restore [locate_data_file 1_O123.rle] tmp
 explode tmp E
 blend s tmp 5 tmp_5
 explode s E
diff --git a/tests/blend/simple/Y6 b/tests/blend/simple/Y6
index a080c538b2..8d9f906585 100644
--- a/tests/blend/simple/Y6
+++ b/tests/blend/simple/Y6
@@ -5,7 +5,7 @@
 ## ===========================================
 
 # Is this test 02 or 03 ?
-restore 1_O123.rle tmp
+restore [locate_data_file 1_O123.rle] tmp
 explode tmp E
 blend s tmp 5 tmp_5
 explode s E
diff --git a/tests/blend/simple/Y7 b/tests/blend/simple/Y7
index 041918a897..1dc57ef86f 100644
--- a/tests/blend/simple/Y7
+++ b/tests/blend/simple/Y7
@@ -6,7 +6,7 @@
 
 puts "TODO OCC22739 All:TEST INCOMPLETE"
 
-restore 1_R1.rle s
+restore [locate_data_file 1_R1.rle] s
 explode s E
 blend result s 12 s_5
 
diff --git a/tests/blend/simple/Y8 b/tests/blend/simple/Y8
index 3d0f6d1649..c6929a4fbc 100644
--- a/tests/blend/simple/Y8
+++ b/tests/blend/simple/Y8
@@ -1,7 +1,7 @@
 # Original bug : hkg60206
 # Date : 26Aout98
 
-restore hkg60206.rle  a
+restore [locate_data_file hkg60206.rle]  a
 explode a f
 explode a_3 e
 
diff --git a/tests/blend/simple/Y9 b/tests/blend/simple/Y9
index d9c792a543..340013bd68 100644
--- a/tests/blend/simple/Y9
+++ b/tests/blend/simple/Y9
@@ -1,7 +1,7 @@
 # Original bug : cts21349
 # Date : 26Aout98
 
-restore cts21349.rle a 
+restore [locate_data_file cts21349.rle] a 
 encoderegularity a 1
 nexplode a e
 
diff --git a/tests/blend/tolblend_buildvol/A2 b/tests/blend/tolblend_buildvol/A2
index 2e2c4e8f2d..a074f65656 100644
--- a/tests/blend/tolblend_buildvol/A2
+++ b/tests/blend/tolblend_buildvol/A2
@@ -2,7 +2,7 @@
 #explode s f
 #sewing s s_1 s_3
 
-restore 7_B2.draw s
+restore [locate_data_file 7_B2.draw] s
 tscale  s 0 0 0 SCALE1
 explode s E
 mkevol P s
diff --git a/tests/blend/tolblend_buildvol/A3 b/tests/blend/tolblend_buildvol/A3
index fa24689ef5..959cc67599 100644
--- a/tests/blend/tolblend_buildvol/A3
+++ b/tests/blend/tolblend_buildvol/A3
@@ -13,7 +13,7 @@ puts "TODO OCC22817 Mandriva2010: Error : The square of reult shape is"
 #sewing s b1_1 b2_1 b3_6
 #########################
 
-restore 7_B3.draw s
+restore [locate_data_file 7_B3.draw] s
 tscale  s 0 0 0 SCALE
 explode s E
 mkevol P s
diff --git a/tests/blend/tolblend_buildvol/A6 b/tests/blend/tolblend_buildvol/A6
index c73e5bf6fe..b8aed54cdd 100644
--- a/tests/blend/tolblend_buildvol/A6
+++ b/tests/blend/tolblend_buildvol/A6
@@ -2,7 +2,7 @@
 #explode s f
 #sewing s s_1 s_3
 
-restore 7_B2.draw s
+restore [locate_data_file 7_B2.draw] s
 tscale  s 0 0 0 SCALE1
 explode s E
 mkevol P s
diff --git a/tests/blend/tolblend_buildvol/A7 b/tests/blend/tolblend_buildvol/A7
index bfb54b96ff..39feb2b8c1 100644
--- a/tests/blend/tolblend_buildvol/A7
+++ b/tests/blend/tolblend_buildvol/A7
@@ -13,7 +13,7 @@ puts "TODO OCC22817 Mandriva2010: Error : The square of reult shape is"
 #sewing s b1_1 b2_1 b3_6
 #########################
 
-restore 7_B3.draw s
+restore [locate_data_file 7_B3.draw] s
 tscale  s 0 0 0 SCALE
 explode s E
 mkevol P s
diff --git a/tests/blend/tolblend_buildvol/A9 b/tests/blend/tolblend_buildvol/A9
index 01c17d956d..ac4ad6f23e 100644
--- a/tests/blend/tolblend_buildvol/A9
+++ b/tests/blend/tolblend_buildvol/A9
@@ -1,6 +1,6 @@
 #pcone s 10 5 20
 
-restore 7_F2.draw s
+restore [locate_data_file 7_F2.draw] s
 tscale s 0 0 0 SCALE1
 explode s E
 mkevol result s
diff --git a/tests/blend/tolblend_simple/A3 b/tests/blend/tolblend_simple/A3
index 8c5dc80985..3567deb30d 100644
--- a/tests/blend/tolblend_simple/A3
+++ b/tests/blend/tolblend_simple/A3
@@ -9,7 +9,7 @@
 #explode t sh
 #save t_1 5_B12.draw 
 
-restore 5_B12.draw s
+restore [locate_data_file 5_B12.draw] s
 tscale s 0 0 0 SCALE1
 explode s E 
 blend result s 0.5*SCALE1 s_4 0.5*SCALE1 s_8 0.5*SCALE1 s_7 0.5*SCALE1 s_3
diff --git a/tests/blend/tolblend_simple/A4 b/tests/blend/tolblend_simple/A4
index 6781156680..643513bf0c 100644
--- a/tests/blend/tolblend_simple/A4
+++ b/tests/blend/tolblend_simple/A4
@@ -10,7 +10,7 @@
 #explode t sh
 #save t_1 5_B12.draw 
 
-restore 5_B12.draw s
+restore [locate_data_file 5_B12.draw] s
 tscale s 0 0 0 SCALE1 
 explode s E 
 blend result s 0.5*SCALE1 s_4 0.4*SCALE1 s_8 0.6*SCALE1 s_7 0.3*SCALE1 s_3
diff --git a/tests/blend/tolblend_simple/A5 b/tests/blend/tolblend_simple/A5
index 03b908542e..a224430a6d 100644
--- a/tests/blend/tolblend_simple/A5
+++ b/tests/blend/tolblend_simple/A5
@@ -1,4 +1,4 @@
-restore 5_C12.draw  s
+restore [locate_data_file 5_C12.draw]  s
 tscale s 0 0 0 SCALE1 
 explode s E
 blend result s 2*SCALE1 s_2 2*SCALE1 s_11  2*SCALE1 s_5  2*SCALE1 s_3 
diff --git a/tests/blend/tolblend_simple/A6 b/tests/blend/tolblend_simple/A6
index 4c720cc12b..79898c333b 100644
--- a/tests/blend/tolblend_simple/A6
+++ b/tests/blend/tolblend_simple/A6
@@ -1,4 +1,4 @@
-restore 5_C12.draw  s
+restore [locate_data_file 5_C12.draw]  s
 tscale s 0 0 0 SCALE1 
 explode s E
 blend result s 2*SCALE1 s_2 3*SCALE1 s_11  2.5*SCALE1 s_5  3.5*SCALE1 s_3 
diff --git a/tests/blend/tolblend_simple/A7 b/tests/blend/tolblend_simple/A7
index 9d45ed9b19..9604f1dd89 100644
--- a/tests/blend/tolblend_simple/A7
+++ b/tests/blend/tolblend_simple/A7
@@ -4,7 +4,7 @@
 #explode s sh
 #save sh_1 5_D12.draw 
 
-restore 5_D12.draw  s
+restore [locate_data_file 5_D12.draw]  s
 tscale s 0 0 0 SCALE1 
 explode s E
 blend result s 8*SCALE1 s_8  8*SCALE1 s_1 8*SCALE1 s_3 8*SCALE1 s_7
diff --git a/tests/blend/tolblend_simple/A8 b/tests/blend/tolblend_simple/A8
index 8165ccd5c7..50813f6464 100644
--- a/tests/blend/tolblend_simple/A8
+++ b/tests/blend/tolblend_simple/A8
@@ -4,7 +4,7 @@
 #explode s sh
 #save sh_1 5_D12.draw 
 
-restore 5_D12.draw  s
+restore [locate_data_file 5_D12.draw]  s
 tscale s 0 0 0 SCALE1 
 explode s E
 blend result s 20*SCALE1 s_8  6*SCALE1 s_1 20*SCALE1 s_3 5*SCALE1 s_7
diff --git a/tests/blend/tolblend_simple/A9 b/tests/blend/tolblend_simple/A9
index 423cb21df1..61cfa21490 100644
--- a/tests/blend/tolblend_simple/A9
+++ b/tests/blend/tolblend_simple/A9
@@ -12,7 +12,7 @@
 #trotate s 0 0 0 0 0 1 -20
 #save s 5_E12.draw
 
-restore 5_E12.draw s 
+restore [locate_data_file 5_E12.draw] s 
 tscale s 0 0 0 SCALE1
 explode s E
 blend result s 1.2*SCALE1 s_13 1.4*SCALE1 s_12 6*SCALE1 s_10 1*SCALE1 s_2 5*SCALE1 s_3
diff --git a/tests/blend/tolblend_simple/B1 b/tests/blend/tolblend_simple/B1
index d08c9d3e16..839d6090ba 100644
--- a/tests/blend/tolblend_simple/B1
+++ b/tests/blend/tolblend_simple/B1
@@ -9,7 +9,7 @@
 #trotate s 0 0 0 0 0 1 -25
 #save s 5_I12.draw 
 
-restore 5_I12.draw  s
+restore [locate_data_file 5_I12.draw]  s
 tscale s 0 0 0 SCALE1 
 explode s E
 blend result s 0.5*SCALE1 s_11 0.5*SCALE1 s_12 0.5*SCALE1 s_2 0.5*SCALE1 s_3 0.5*SCALE1 s_9  0.5*SCALE1 s_10
diff --git a/tests/blend/tolblend_simple/B2 b/tests/blend/tolblend_simple/B2
index f89f91e6f2..3cffd98037 100644
--- a/tests/blend/tolblend_simple/B2
+++ b/tests/blend/tolblend_simple/B2
@@ -9,7 +9,7 @@
 #trotate s 0 0 0 0 0 1 -25
 #save s 5_I12.draw 
 
-restore 5_I12.draw  s
+restore [locate_data_file 5_I12.draw]  s
 tscale s 0 0 0 SCALE1 
 explode s E
 blend result s 0.15*SCALE1 s_11 0.3*SCALE1 s_12 0.3*SCALE1 s_2  0.15*SCALE1 s_3 0.25*SCALE1 s_9 0.3*SCALE1 s_10
diff --git a/tests/blend/tolblend_simple/B3 b/tests/blend/tolblend_simple/B3
index ff2ce758ef..f21b7e4770 100644
--- a/tests/blend/tolblend_simple/B3
+++ b/tests/blend/tolblend_simple/B3
@@ -13,7 +13,7 @@
 #glue s b3 r b3_1 r_4
 #save s 5_J12.draw
 
-restore  5_J12.draw s
+restore [locate_data_file 5_J12.draw] s
 tscale s 0 0 0 SCALE1
 explode s E
 blend result s 2*SCALE1 s_26 2*SCALE1 s_19  2*SCALE1 s_15 2*SCALE1 s_16 2*SCALE1 s_27 2*SCALE1 s_25
diff --git a/tests/blend/tolblend_simple/B4 b/tests/blend/tolblend_simple/B4
index 8a41bc6bdb..70d384f1fc 100644
--- a/tests/blend/tolblend_simple/B4
+++ b/tests/blend/tolblend_simple/B4
@@ -5,7 +5,7 @@
 #glue t c s1 c_3 s1_4
 #fit
 
-restore 7_A1.draw s
+restore [locate_data_file 7_A1.draw] s
 tscale  s 0 0 0 SCALE1 
 explode s E
 blend result s 15*SCALE1 s_4
diff --git a/tests/blend/tolblend_simple/B5 b/tests/blend/tolblend_simple/B5
index af28fd117c..6cd591267c 100644
--- a/tests/blend/tolblend_simple/B5
+++ b/tests/blend/tolblend_simple/B5
@@ -10,7 +10,7 @@
 #explode s2 f
 #sewing s s1_1 s2_1
 
-restore 7_A2.draw s
+restore [locate_data_file 7_A2.draw] s
 tscale  s 0 0 0 SCALE1 
 explode s e
 blend result s 15*SCALE1 s_3
diff --git a/tests/blend/tolblend_simple/B6 b/tests/blend/tolblend_simple/B6
index 3ed087d031..f2379d5864 100644
--- a/tests/blend/tolblend_simple/B6
+++ b/tests/blend/tolblend_simple/B6
@@ -1,4 +1,4 @@
-restore blend05.draw s
+restore [locate_data_file blend05.draw] s
 tscale  s 0 0 0 SCALE 
 explode s e
 blend result s 0.015*SCALE s_2 0.015*SCALE s_22
diff --git a/tests/blend/tolblend_simple/B7 b/tests/blend/tolblend_simple/B7
index a5762af775..6b7bb702c9 100644
--- a/tests/blend/tolblend_simple/B7
+++ b/tests/blend/tolblend_simple/B7
@@ -5,7 +5,7 @@
 #explode p F
 #glue s c p c_3 p_2
 
-restore 7_A4.draw s
+restore [locate_data_file 7_A4.draw] s
 tscale  s 0 0 0 SCALE1 
 explode s e
 blend result s 15*SCALE1 s_2
diff --git a/tests/blend/tolblend_simple/B8 b/tests/blend/tolblend_simple/B8
index cea012c87c..9d38356e6d 100644
--- a/tests/blend/tolblend_simple/B8
+++ b/tests/blend/tolblend_simple/B8
@@ -5,7 +5,7 @@
 #glue t c s1 c_3 s1_4
 #fit
 
-restore 7_C1.draw s
+restore [locate_data_file 7_C1.draw] s
 tscale  s 0 0 0 SCALE1 
 explode s E
 blend result s 15*SCALE1 s_3
diff --git a/tests/blend/tolblend_simple/B9 b/tests/blend/tolblend_simple/B9
index 31c82be34c..7304d203c4 100644
--- a/tests/blend/tolblend_simple/B9
+++ b/tests/blend/tolblend_simple/B9
@@ -12,7 +12,7 @@
 #explode s F
 #sewing s s_1 s_4
 
-restore 7_C2.draw s
+restore [locate_data_file 7_C2.draw] s
 tscale s 0 0 0 SCALE1 
 explode s e
 blend result s 15*SCALE1 s_3
diff --git a/tests/blend/tolblend_simple/C1 b/tests/blend/tolblend_simple/C1
index fc5845587e..74b67b9170 100644
--- a/tests/blend/tolblend_simple/C1
+++ b/tests/blend/tolblend_simple/C1
@@ -14,7 +14,7 @@
 #sewing s t_1 t_5 t2_1 t2_5
 #explode s Sh
 
-restore 7_C3.draw s
+restore [locate_data_file 7_C3.draw] s
 tscale  s 0 0 0 SCALE1 
 explode s e
 blend result s 5*SCALE1 s_3 5*SCALE1 s_8
diff --git a/tests/blend/tolblend_simple/C2 b/tests/blend/tolblend_simple/C2
index 0427e23b64..5545d785a7 100644
--- a/tests/blend/tolblend_simple/C2
+++ b/tests/blend/tolblend_simple/C2
@@ -5,7 +5,7 @@
 #explode p F
 #glue s c p c_3 p_2
 
-restore 7_C4.draw s
+restore [locate_data_file 7_C4.draw] s
 tscale  s 0 0 0 SCALE1 
 explode s e
 blend result s 15*SCALE1 s_2
diff --git a/tests/blend/tolblend_simple/C3 b/tests/blend/tolblend_simple/C3
index e6e03fc999..8fb703af1c 100644
--- a/tests/blend/tolblend_simple/C3
+++ b/tests/blend/tolblend_simple/C3
@@ -5,7 +5,7 @@
 #explode p F
 #glue s c p c_3 p_2
 
-restore 7_F1.draw s
+restore [locate_data_file 7_F1.draw] s
 tscale  s 0 0 0 SCALE1 
 explode s e
 blend result s 5*SCALE1 s_2
diff --git a/tests/blend/tolblend_simple/C4 b/tests/blend/tolblend_simple/C4
index d341f0fe18..3907842eaf 100644
--- a/tests/blend/tolblend_simple/C4
+++ b/tests/blend/tolblend_simple/C4
@@ -1,4 +1,4 @@
-restore 11_A1.draw  s
+restore [locate_data_file 11_A1.draw]  s
 tscale s 0 0 0 SCALE1 
 explode s E 
 blend result s 2*SCALE1 s_17
diff --git a/tests/blend/tolblend_simple/C5 b/tests/blend/tolblend_simple/C5
index f76cf7cbfa..176e6ef7dd 100644
--- a/tests/blend/tolblend_simple/C5
+++ b/tests/blend/tolblend_simple/C5
@@ -1,4 +1,4 @@
-restore 11_A2.draw  s
+restore [locate_data_file 11_A2.draw]  s
 tscale s 0 0 0 SCALE1 
 explode s E 
 blend result s 10*SCALE1 s_7
diff --git a/tests/blend/tolblend_simple/C6 b/tests/blend/tolblend_simple/C6
index b124098e62..d8875ffbf0 100644
--- a/tests/blend/tolblend_simple/C6
+++ b/tests/blend/tolblend_simple/C6
@@ -1,4 +1,4 @@
-restore 11_B1.draw  s
+restore [locate_data_file 11_B1.draw]  s
 tscale s 0 0 0 SCALE1 
 explode s E 
 blend result s 50*SCALE1 s_3
diff --git a/tests/blend/tolblend_simple/C7 b/tests/blend/tolblend_simple/C7
index d3512ae207..edbea38a1c 100644
--- a/tests/blend/tolblend_simple/C7
+++ b/tests/blend/tolblend_simple/C7
@@ -1,4 +1,4 @@
-restore 11_C1.draw  s
+restore [locate_data_file 11_C1.draw]  s
 tscale s 0 0 0 SCALE1 
 explode s E 
 blend result s 8*SCALE1 s_1
diff --git a/tests/blend/tolblend_simple/C8 b/tests/blend/tolblend_simple/C8
index e4580af105..8552a41353 100644
--- a/tests/blend/tolblend_simple/C8
+++ b/tests/blend/tolblend_simple/C8
@@ -1,4 +1,4 @@
-restore 11_D1.draw  s
+restore [locate_data_file 11_D1.draw]  s
 tscale s 0 0 0 SCALE1 
 explode s E 
 blend result s 20*SCALE1 s_8
diff --git a/tests/blend/tolblend_simple/C9 b/tests/blend/tolblend_simple/C9
index a69376a166..53cc745a9d 100644
--- a/tests/blend/tolblend_simple/C9
+++ b/tests/blend/tolblend_simple/C9
@@ -1,7 +1,7 @@
 puts "TODO OCC22817 All:An exception was caught"
 puts "TODO OCC22817 All:\\*\\* Exception \\*\\*"
 puts "TODO OCC22817 All:TEST INCOMPLETE"
-restore 11_D2.draw  s
+restore [locate_data_file 11_D2.draw]  s
 tscale s 0 0 0 SCALE1 
 explode s E 
 blend result s 20*SCALE1 s_16
diff --git a/tests/blend/tolblend_simple/D1 b/tests/blend/tolblend_simple/D1
index c357a91b2f..3c63f827d4 100644
--- a/tests/blend/tolblend_simple/D1
+++ b/tests/blend/tolblend_simple/D1
@@ -1,4 +1,4 @@
-restore 11_E1.draw  s
+restore [locate_data_file 11_E1.draw]  s
 tscale s 0 0 0 SCALE1 
 explode s E 
 blend result s 2*SCALE1 s_11
diff --git a/tests/blend/tolblend_simple/D2 b/tests/blend/tolblend_simple/D2
index b680eb9217..0a63b60c8a 100644
--- a/tests/blend/tolblend_simple/D2
+++ b/tests/blend/tolblend_simple/D2
@@ -1,4 +1,4 @@
-restore 11_E2.draw  s
+restore [locate_data_file 11_E2.draw]  s
 tscale s 0 0 0 SCALE1 
 explode s E 
 blend result s 7*SCALE1 s_1
diff --git a/tests/blend/tolblend_simple/D6 b/tests/blend/tolblend_simple/D6
index 59f38674c5..519c564346 100644
--- a/tests/blend/tolblend_simple/D6
+++ b/tests/blend/tolblend_simple/D6
@@ -9,7 +9,7 @@
 #explode t sh
 #save t_1 5_B12.draw 
 
-restore 5_B12.draw s
+restore [locate_data_file 5_B12.draw] s
 tscale s 0 0 0 SCALE1
 explode s E 
 blend result s 0.5*SCALE1 s_4 0.5*SCALE1 s_8 0.5*SCALE1 s_7 
diff --git a/tests/blend/tolblend_simple/D7 b/tests/blend/tolblend_simple/D7
index e0c61c71f4..859a9a0b92 100644
--- a/tests/blend/tolblend_simple/D7
+++ b/tests/blend/tolblend_simple/D7
@@ -10,7 +10,7 @@
 #explode t sh
 #save t_1 5_B12.draw 
 
-restore 5_B12.draw s
+restore [locate_data_file 5_B12.draw] s
 tscale s 0 0 0 SCALE1 
 explode s E 
 blend result s 0.5*SCALE1 s_4 0.5*SCALE1 s_7 
diff --git a/tests/blend/tolblend_simple/D8 b/tests/blend/tolblend_simple/D8
index 018f6c45ec..1cf3ca0df4 100644
--- a/tests/blend/tolblend_simple/D8
+++ b/tests/blend/tolblend_simple/D8
@@ -10,7 +10,7 @@
 #explode t sh
 #save t_1 5_B12.draw 
 
-restore 5_B12.draw s
+restore [locate_data_file 5_B12.draw] s
 tscale s 0 0 0 SCALE1 
 explode s E 
 blend result s 0.5*SCALE1 s_4 0.5*SCALE1 s_8 
diff --git a/tests/blend/tolblend_simple/D9 b/tests/blend/tolblend_simple/D9
index 215b394f09..ae840d5756 100644
--- a/tests/blend/tolblend_simple/D9
+++ b/tests/blend/tolblend_simple/D9
@@ -1,4 +1,4 @@
-restore 5_C12.draw  s
+restore [locate_data_file 5_C12.draw]  s
 tscale s 0 0 0 SCALE1 
 explode s E
 blend result s 2*SCALE1 s_2 2*SCALE1 s_11  2*SCALE1 s_5
diff --git a/tests/blend/tolblend_simple/E1 b/tests/blend/tolblend_simple/E1
index cd6c88d3cb..8c2a4fa696 100644
--- a/tests/blend/tolblend_simple/E1
+++ b/tests/blend/tolblend_simple/E1
@@ -1,4 +1,4 @@
-restore 5_C12.draw  s
+restore [locate_data_file 5_C12.draw]  s
 tscale s 0 0 0 SCALE1 
 explode s E
 blend result s 2*SCALE1 s_2  2*SCALE1 s_5
diff --git a/tests/blend/tolblend_simple/E2 b/tests/blend/tolblend_simple/E2
index 27e71a49e6..029d84e19b 100644
--- a/tests/blend/tolblend_simple/E2
+++ b/tests/blend/tolblend_simple/E2
@@ -1,4 +1,4 @@
-restore 5_C12.draw  s
+restore [locate_data_file 5_C12.draw]  s
 tscale s 0 0 0 SCALE1 
 explode s E
 blend result s 2*SCALE1 s_2  2.5*SCALE1 s_11 
diff --git a/tests/blend/tolblend_simple/E3 b/tests/blend/tolblend_simple/E3
index 0ea9bc03a4..91b98f30a9 100644
--- a/tests/blend/tolblend_simple/E3
+++ b/tests/blend/tolblend_simple/E3
@@ -4,7 +4,7 @@
 #explode s sh
 #save sh_1 5_D12.draw 
 
-restore 5_D12.draw  s
+restore [locate_data_file 5_D12.draw]  s
 tscale s 0 0 0 SCALE1 
 explode s E
 blend result s 8*SCALE1 s_8  8*SCALE1 s_1 8*SCALE1 s_3 
diff --git a/tests/blend/tolblend_simple/E4 b/tests/blend/tolblend_simple/E4
index 40e794116c..9be41dfc26 100644
--- a/tests/blend/tolblend_simple/E4
+++ b/tests/blend/tolblend_simple/E4
@@ -4,7 +4,7 @@
 #explode s sh
 #save sh_1 5_D12.draw 
 
-restore 5_D12.draw  s
+restore [locate_data_file 5_D12.draw]  s
 tscale s 0 0 0 SCALE1 
 explode s E
 blend result s 20*SCALE1 s_8  20*SCALE1 s_3 
diff --git a/tests/blend/tolblend_simple/E5 b/tests/blend/tolblend_simple/E5
index 2cd121f077..0751b2d904 100644
--- a/tests/blend/tolblend_simple/E5
+++ b/tests/blend/tolblend_simple/E5
@@ -4,7 +4,7 @@
 #explode s sh
 #save sh_1 5_D12.draw 
 
-restore 5_D12.draw  s
+restore [locate_data_file 5_D12.draw]  s
 tscale s 0 0 0 SCALE1 
 explode s E
 blend result s 20*SCALE1 s_8  20*SCALE1 s_1 
diff --git a/tests/blend/tolblend_simple/E6 b/tests/blend/tolblend_simple/E6
index 821be6488e..039621ae96 100644
--- a/tests/blend/tolblend_simple/E6
+++ b/tests/blend/tolblend_simple/E6
@@ -12,7 +12,7 @@
 #trotate s 0 0 0 0 0 1 -20
 #save s 5_E12.draw
 
-restore 5_E12.draw s 
+restore [locate_data_file 5_E12.draw] s 
 tscale s 0 0 0 SCALE1
 explode s E
 blend result s 0.5*SCALE1 s_2 0.5*SCALE1 s_3 0.5*SCALE1 s_10 0.5*SCALE1 s_12 
diff --git a/tests/blend/tolblend_simple/E7 b/tests/blend/tolblend_simple/E7
index 4a528da590..4a4f14ee06 100644
--- a/tests/blend/tolblend_simple/E7
+++ b/tests/blend/tolblend_simple/E7
@@ -12,7 +12,7 @@
 #trotate s 0 0 0 0 0 1 -20
 #save s 5_E12.draw
 
-restore 5_E12.draw s 
+restore [locate_data_file 5_E12.draw] s 
 tscale s 0 0 0 SCALE1
 explode s E
 blend result s 0.5*SCALE1 s_2 0.5*SCALE1 s_3 0.5*SCALE1 s_12  
diff --git a/tests/blend/tolblend_simple/E8 b/tests/blend/tolblend_simple/E8
index 69645efb7d..0be800765a 100644
--- a/tests/blend/tolblend_simple/E8
+++ b/tests/blend/tolblend_simple/E8
@@ -12,7 +12,7 @@
 #trotate s 0 0 0 0 0 1 -20
 #save s 5_E12.draw
 
-restore 5_E12.draw s 
+restore [locate_data_file 5_E12.draw] s 
 tscale s 0 0 0 SCALE1
 explode s E
 blend result s 0.5*SCALE1 s_2 0.5*SCALE1 s_3 0.5*SCALE1 s_10
diff --git a/tests/blend/tolblend_simple/E9 b/tests/blend/tolblend_simple/E9
index 798da8ee30..2bf6e3a933 100644
--- a/tests/blend/tolblend_simple/E9
+++ b/tests/blend/tolblend_simple/E9
@@ -1,6 +1,6 @@
 #modele fabrique dans STRIM et transfere dans DRAW
 
-restore 5_G12.draw  s
+restore [locate_data_file 5_G12.draw]  s
 tscale s 0 0 0 SCALE1 
 explode s E
 blend result s 7.5*SCALE1 s_4  6*SCALE1 s_5  6.5*SCALE1 s_11  
diff --git a/tests/blend/tolblend_simple/F1 b/tests/blend/tolblend_simple/F1
index aae78e200b..b3a902a797 100644
--- a/tests/blend/tolblend_simple/F1
+++ b/tests/blend/tolblend_simple/F1
@@ -1,4 +1,4 @@
-restore 13_A12.draw s
+restore [locate_data_file 13_A12.draw] s
 tscale s 0 0 0 SCALE1
 explode s E
 blend result s 0.5*SCALE1 s_2 1*SCALE1 s_5  0.5*SCALE1 s_8 
diff --git a/tests/blend/tolblend_simple/F2 b/tests/blend/tolblend_simple/F2
index 645f076043..76523f68cb 100644
--- a/tests/blend/tolblend_simple/F2
+++ b/tests/blend/tolblend_simple/F2
@@ -1,4 +1,4 @@
-restore 13_A12.draw s
+restore [locate_data_file 13_A12.draw] s
 tscale s 0 0 0 SCALE1
 explode s E
 blend result s   1*SCALE1 s_5 1*SCALE1 s_8
diff --git a/tests/blend/tolblend_simple/F3 b/tests/blend/tolblend_simple/F3
index cbd10a0998..2a9b080d85 100644
--- a/tests/blend/tolblend_simple/F3
+++ b/tests/blend/tolblend_simple/F3
@@ -1,4 +1,4 @@
-restore 13_B12.draw s
+restore [locate_data_file 13_B12.draw] s
 tscale s 0 0 0 SCALE1
 explode s E
 blend result s 0.5*SCALE1 s_2 2*SCALE1 s_1  0.5*SCALE1 s_7 
diff --git a/tests/blend/tolblend_simple/F4 b/tests/blend/tolblend_simple/F4
index 9881a5b9ff..5513b7ced2 100644
--- a/tests/blend/tolblend_simple/F4
+++ b/tests/blend/tolblend_simple/F4
@@ -1,4 +1,4 @@
-restore 13_B12.draw s
+restore [locate_data_file 13_B12.draw] s
 tscale s 0 0 0 SCALE1
 explode s E
 blend result s 1.7*SCALE1 s_1 1.1*SCALE1 s_7
diff --git a/tests/blend/tolblend_simple/F5 b/tests/blend/tolblend_simple/F5
index 4cb119dc55..2f57fcef29 100644
--- a/tests/blend/tolblend_simple/F5
+++ b/tests/blend/tolblend_simple/F5
@@ -1,7 +1,7 @@
 puts "TODO OCC22817 All:An exception was caught"
 puts "TODO OCC22817 All:\\*\\* Exception \\*\\*"
 puts "TODO OCC22817 All:TEST INCOMPLETE"
-restore 13_C12.draw s
+restore [locate_data_file 13_C12.draw] s
 tscale s 0 0 0 SCALE1
 explode s E
 blend result s 4*SCALE1 s_9 5*SCALE1 s_10  6*SCALE1 s_2 4*SCALE1 s_1
diff --git a/tests/blend/tolblend_simple/F6 b/tests/blend/tolblend_simple/F6
index a54cbca698..9b35fb28b2 100644
--- a/tests/blend/tolblend_simple/F6
+++ b/tests/blend/tolblend_simple/F6
@@ -1,7 +1,7 @@
 puts "TODO OCC22817 All:An exception was caught"
 puts "TODO OCC22817 All:\\*\\* Exception \\*\\*"
 puts "TODO OCC22817 All:TEST INCOMPLETE"
-restore 13_C12.draw s
+restore [locate_data_file 13_C12.draw] s
 tscale s 0 0 0 SCALE1
 explode s E
 blend result s 5*SCALE1 s_9 5*SCALE1 s_10  5*SCALE1 s_2
diff --git a/tests/blend/tolblend_simple/F7 b/tests/blend/tolblend_simple/F7
index ea9fcdbc80..10a8049d5a 100644
--- a/tests/blend/tolblend_simple/F7
+++ b/tests/blend/tolblend_simple/F7
@@ -1,4 +1,4 @@
-restore 13_D12.draw s
+restore [locate_data_file 13_D12.draw] s
 tscale s 0 0 0 SCALE1
 explode s E
 blend result s 2*SCALE1 s_2 2*SCALE1 s_12  2*SCALE1 s_5 2*SCALE1 s_3
diff --git a/tests/blend/tolblend_simple/F8 b/tests/blend/tolblend_simple/F8
index 3e8ac9dfd5..c9f81c79fb 100644
--- a/tests/blend/tolblend_simple/F8
+++ b/tests/blend/tolblend_simple/F8
@@ -1,4 +1,4 @@
-restore 13_D12.draw s
+restore [locate_data_file 13_D12.draw] s
 tscale s 0 0 0 SCALE1
 explode s E
 blend result s 2*SCALE1 s_2  1.5*SCALE1 s_5 2.5*SCALE1 s_3
diff --git a/tests/blend/tolblend_simple/F9 b/tests/blend/tolblend_simple/F9
index ca4349dc3e..2db73d8b29 100644
--- a/tests/blend/tolblend_simple/F9
+++ b/tests/blend/tolblend_simple/F9
@@ -1,7 +1,7 @@
 puts "TODO OCC22817 All:An exception was caught"
 puts "TODO OCC22817 All:\\*\\* Exception \\*\\*"
 puts "TODO OCC22817 All:TEST INCOMPLETE"
-restore 13_E12.draw s
+restore [locate_data_file 13_E12.draw] s
 tscale s 0 0 0 SCALE1
 explode s E
 blend result s 5*SCALE1 s_2 5*SCALE1 s_12 5*SCALE1 s_9  5*SCALE1 s_1
diff --git a/tests/blend/tolblend_simple/G1 b/tests/blend/tolblend_simple/G1
index 94d77c8c97..1a2a681887 100644
--- a/tests/blend/tolblend_simple/G1
+++ b/tests/blend/tolblend_simple/G1
@@ -1,7 +1,7 @@
 puts "TODO OCC22817 All:An exception was caught"
 puts "TODO OCC22817 All:\\*\\* Exception \\*\\*"
 puts "TODO OCC22817 All:TEST INCOMPLETE"
-restore 13_E12.draw s
+restore [locate_data_file 13_E12.draw] s
 tscale s 0 0 0 SCALE1
 explode s E
 blend result s 7*SCALE1 s_2 7*SCALE1 s_12  7*SCALE1 s_1
diff --git a/tests/boolean/bcommon_2d/A1 b/tests/boolean/bcommon_2d/A1
index 2e143585bd..d025e2a379 100644
--- a/tests/boolean/bcommon_2d/A1
+++ b/tests/boolean/bcommon_2d/A1
@@ -1,5 +1,5 @@
-restore case_1_solid.brep a
-restore case_1_edge1.brep b
+restore [locate_data_file case_1_solid.brep] a
+restore [locate_data_file case_1_edge1.brep] b
 bcommon result b a
 set length 100.002
 set nbsh_v 4
diff --git a/tests/boolean/bcommon_2d/A2 b/tests/boolean/bcommon_2d/A2
index e1c241bc73..6d7bec1410 100644
--- a/tests/boolean/bcommon_2d/A2
+++ b/tests/boolean/bcommon_2d/A2
@@ -1,5 +1,5 @@
-restore case_1_solid.brep a
-restore case_1_edge2.brep b
+restore [locate_data_file case_1_solid.brep] a
+restore [locate_data_file case_1_edge2.brep] b
 bcommon result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcommon_2d/A3 b/tests/boolean/bcommon_2d/A3
index 6aaeb5a1a0..e9e9a3a341 100644
--- a/tests/boolean/bcommon_2d/A3
+++ b/tests/boolean/bcommon_2d/A3
@@ -1,5 +1,5 @@
-restore case_1_solid.brep a
-restore case_1_edge3.brep b
+restore [locate_data_file case_1_solid.brep] a
+restore [locate_data_file case_1_edge3.brep] b
 bcommon result b a
 set length 297.02
 set nbsh_v 2
diff --git a/tests/boolean/bcommon_2d/A4 b/tests/boolean/bcommon_2d/A4
index a8eafb013c..75e07362b2 100644
--- a/tests/boolean/bcommon_2d/A4
+++ b/tests/boolean/bcommon_2d/A4
@@ -1,5 +1,5 @@
-restore case_1_solid.brep a
-restore case_1_edge4.brep b
+restore [locate_data_file case_1_solid.brep] a
+restore [locate_data_file case_1_edge4.brep] b
 bcommon result b a
 set length 474.239
 set nbsh_v 2
diff --git a/tests/boolean/bcommon_2d/A5 b/tests/boolean/bcommon_2d/A5
index da019125e2..734c6b4df4 100644
--- a/tests/boolean/bcommon_2d/A5
+++ b/tests/boolean/bcommon_2d/A5
@@ -1,5 +1,5 @@
-restore case_1_solid.brep a
-restore case_1_wire1.brep b
+restore [locate_data_file case_1_solid.brep] a
+restore [locate_data_file case_1_wire1.brep] b
 bcommon result b a
 set length 100.002
 set nbsh_v 4
diff --git a/tests/boolean/bcommon_2d/A6 b/tests/boolean/bcommon_2d/A6
index d688c6dbfe..ca2d72b141 100644
--- a/tests/boolean/bcommon_2d/A6
+++ b/tests/boolean/bcommon_2d/A6
@@ -1,5 +1,5 @@
-restore case_1_solid.brep a
-restore case_1_wire2.brep b
+restore [locate_data_file case_1_solid.brep] a
+restore [locate_data_file case_1_wire2.brep] b
 bcommon result b a
 set length 350.738
 set nbsh_v 3
diff --git a/tests/boolean/bcommon_2d/A7 b/tests/boolean/bcommon_2d/A7
index 9d3a09cfa5..0e42bde504 100644
--- a/tests/boolean/bcommon_2d/A7
+++ b/tests/boolean/bcommon_2d/A7
@@ -1,5 +1,5 @@
-restore case_1_solid.brep a
-restore case_1_wire3.brep b
+restore [locate_data_file case_1_solid.brep] a
+restore [locate_data_file case_1_wire3.brep] b
 bcommon result b a
 set length 942.478
 set nbsh_v 4
diff --git a/tests/boolean/bcommon_2d/A8 b/tests/boolean/bcommon_2d/A8
index c6c15fea14..88d222b172 100644
--- a/tests/boolean/bcommon_2d/A8
+++ b/tests/boolean/bcommon_2d/A8
@@ -1,5 +1,5 @@
-restore case_1_shell.brep a
-restore case_1_edge2.brep b
+restore [locate_data_file case_1_shell.brep] a
+restore [locate_data_file case_1_edge2.brep] b
 bcommon result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcommon_2d/A9 b/tests/boolean/bcommon_2d/A9
index dddf6daa24..26aee73fff 100644
--- a/tests/boolean/bcommon_2d/A9
+++ b/tests/boolean/bcommon_2d/A9
@@ -1,5 +1,5 @@
-restore case_1_shell.brep a
-restore case_1_edge4.brep b
+restore [locate_data_file case_1_shell.brep] a
+restore [locate_data_file case_1_edge4.brep] b
 bcommon result b a
 set length 471.239
 set nbsh_v 2
diff --git a/tests/boolean/bcommon_2d/B1 b/tests/boolean/bcommon_2d/B1
index dbaab84831..79df60b89b 100644
--- a/tests/boolean/bcommon_2d/B1
+++ b/tests/boolean/bcommon_2d/B1
@@ -1,5 +1,5 @@
-restore case_1_shell.brep a
-restore case_1_wire3.brep b
+restore [locate_data_file case_1_shell.brep] a
+restore [locate_data_file case_1_wire3.brep] b
 bcommon result b a
 set length 942.478
 set nbsh_v 2
diff --git a/tests/boolean/bcommon_2d/B2 b/tests/boolean/bcommon_2d/B2
index 57cb5cde25..3c84f3db56 100644
--- a/tests/boolean/bcommon_2d/B2
+++ b/tests/boolean/bcommon_2d/B2
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_edge1.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_edge1.brep] b
 bcommon result b a
 set length 847.007
 set nbsh_v 14
diff --git a/tests/boolean/bcommon_2d/B3 b/tests/boolean/bcommon_2d/B3
index ba0a6801fa..281a0ac168 100644
--- a/tests/boolean/bcommon_2d/B3
+++ b/tests/boolean/bcommon_2d/B3
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_edge2.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_edge2.brep] b
 bcommon result b a
 set length 847.007
 set nbsh_v 14
diff --git a/tests/boolean/bcommon_2d/B4 b/tests/boolean/bcommon_2d/B4
index 88e8c8907f..106e46b2be 100644
--- a/tests/boolean/bcommon_2d/B4
+++ b/tests/boolean/bcommon_2d/B4
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_edge3.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_edge3.brep] b
 bcommon result b a
 set length 753.315
 set nbsh_v 6
diff --git a/tests/boolean/bcommon_2d/B5 b/tests/boolean/bcommon_2d/B5
index 4f31b4d7ae..b650fae2e4 100644
--- a/tests/boolean/bcommon_2d/B5
+++ b/tests/boolean/bcommon_2d/B5
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_edge4.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_edge4.brep] b
 bcommon result b a
 set length 753.315
 set nbsh_v 6
diff --git a/tests/boolean/bcommon_2d/B6 b/tests/boolean/bcommon_2d/B6
index 9d184cd9a0..c3085448f2 100644
--- a/tests/boolean/bcommon_2d/B6
+++ b/tests/boolean/bcommon_2d/B6
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_wire1.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_wire1.brep] b
 bcommon result b a
 set length 874
 set nbsh_v 18
diff --git a/tests/boolean/bcommon_2d/B7 b/tests/boolean/bcommon_2d/B7
index 600511125b..7fdae1c55e 100644
--- a/tests/boolean/bcommon_2d/B7
+++ b/tests/boolean/bcommon_2d/B7
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_wire2.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_wire2.brep] b
 bcommon result b a
 set length 874
 set nbsh_v 18
diff --git a/tests/boolean/bcommon_2d/B8 b/tests/boolean/bcommon_2d/B8
index 48872a408c..36d3a90981 100644
--- a/tests/boolean/bcommon_2d/B8
+++ b/tests/boolean/bcommon_2d/B8
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_wire3.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_wire3.brep] b
 bcommon result b a
 set length 846.821
 set nbsh_v 9
diff --git a/tests/boolean/bcommon_2d/B9 b/tests/boolean/bcommon_2d/B9
index 1e940d692d..5f51185394 100644
--- a/tests/boolean/bcommon_2d/B9
+++ b/tests/boolean/bcommon_2d/B9
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_wire4.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_wire4.brep] b
 bcommon result b a
 set length 768.597
 set nbsh_v 9
diff --git a/tests/boolean/bcommon_2d/C1 b/tests/boolean/bcommon_2d/C1
index 3a38040f82..881313795b 100644
--- a/tests/boolean/bcommon_2d/C1
+++ b/tests/boolean/bcommon_2d/C1
@@ -1,5 +1,5 @@
-restore case_2_shell_r.brep a
-restore case_2_edge1.brep b
+restore [locate_data_file case_2_shell_r.brep] a
+restore [locate_data_file case_2_edge1.brep] b
 bcommon result b a
 set length 847.007
 set nbsh_v 14
diff --git a/tests/boolean/bcommon_2d/C2 b/tests/boolean/bcommon_2d/C2
index 6532f72890..04860d0f36 100644
--- a/tests/boolean/bcommon_2d/C2
+++ b/tests/boolean/bcommon_2d/C2
@@ -1,5 +1,5 @@
-restore case_2_shell_r.brep a
-restore case_2_edge2.brep b
+restore [locate_data_file case_2_shell_r.brep] a
+restore [locate_data_file case_2_edge2.brep] b
 bcommon result b a
 set length 847.007
 set nbsh_v 14
diff --git a/tests/boolean/bcommon_2d/C3 b/tests/boolean/bcommon_2d/C3
index 5bc4d6049e..1600b1bb35 100644
--- a/tests/boolean/bcommon_2d/C3
+++ b/tests/boolean/bcommon_2d/C3
@@ -1,5 +1,5 @@
-restore case_2_shell_r.brep a
-restore case_2_edge3.brep b
+restore [locate_data_file case_2_shell_r.brep] a
+restore [locate_data_file case_2_edge3.brep] b
 bcommon result b a
 set length 753.315
 set nbsh_v 6
diff --git a/tests/boolean/bcommon_2d/C4 b/tests/boolean/bcommon_2d/C4
index ce6d3dcffa..3cf7000d10 100644
--- a/tests/boolean/bcommon_2d/C4
+++ b/tests/boolean/bcommon_2d/C4
@@ -1,5 +1,5 @@
-restore case_2_shell_r.brep a
-restore case_2_wire1.brep b
+restore [locate_data_file case_2_shell_r.brep] a
+restore [locate_data_file case_2_wire1.brep] b
 bcommon result b a
 set length 874
 set nbsh_v 18
diff --git a/tests/boolean/bcommon_2d/C5 b/tests/boolean/bcommon_2d/C5
index 9597a53004..d957399ded 100644
--- a/tests/boolean/bcommon_2d/C5
+++ b/tests/boolean/bcommon_2d/C5
@@ -1,5 +1,5 @@
-restore case_2_shell_r.brep a
-restore case_2_wire2.brep b
+restore [locate_data_file case_2_shell_r.brep] a
+restore [locate_data_file case_2_wire2.brep] b
 bcommon result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcommon_2d/C6 b/tests/boolean/bcommon_2d/C6
index 08fe6c475c..f651d19908 100644
--- a/tests/boolean/bcommon_2d/C6
+++ b/tests/boolean/bcommon_2d/C6
@@ -1,5 +1,5 @@
-restore case_2_shell_r.brep a
-restore case_2_wire3.brep b
+restore [locate_data_file case_2_shell_r.brep] a
+restore [locate_data_file case_2_wire3.brep] b
 bcommon result b a
 set length 846.821
 set nbsh_v 9
diff --git a/tests/boolean/bcommon_2d/C7 b/tests/boolean/bcommon_2d/C7
index fd1494d66f..cc5ed330c6 100644
--- a/tests/boolean/bcommon_2d/C7
+++ b/tests/boolean/bcommon_2d/C7
@@ -1,5 +1,5 @@
-restore case_2_face_r.brep a
-restore case_2_edge1.brep b
+restore [locate_data_file case_2_face_r.brep] a
+restore [locate_data_file case_2_edge1.brep] b
 bcommon result b a
 set length 847.007
 set nbsh_v 14
diff --git a/tests/boolean/bcommon_2d/C8 b/tests/boolean/bcommon_2d/C8
index 9ea86ad3da..adeb437d1d 100644
--- a/tests/boolean/bcommon_2d/C8
+++ b/tests/boolean/bcommon_2d/C8
@@ -1,5 +1,5 @@
-restore case_2_face_r.brep a
-restore case_2_edge3.brep b
+restore [locate_data_file case_2_face_r.brep] a
+restore [locate_data_file case_2_edge3.brep] b
 bcommon result b a
 set length 753.315
 set nbsh_v 6
diff --git a/tests/boolean/bcommon_2d/C9 b/tests/boolean/bcommon_2d/C9
index 317938e93d..82d9d67633 100644
--- a/tests/boolean/bcommon_2d/C9
+++ b/tests/boolean/bcommon_2d/C9
@@ -1,5 +1,5 @@
-restore case_2_face_r.brep a
-restore case_2_wire1.brep b
+restore [locate_data_file case_2_face_r.brep] a
+restore [locate_data_file case_2_wire1.brep] b
 bcommon result b a
 set length 874
 set nbsh_v 18
diff --git a/tests/boolean/bcommon_2d/D1 b/tests/boolean/bcommon_2d/D1
index c8c8dd5ce7..06a191afd8 100644
--- a/tests/boolean/bcommon_2d/D1
+++ b/tests/boolean/bcommon_2d/D1
@@ -1,5 +1,5 @@
-restore case_2_face_r.brep a
-restore case_2_wire3.brep b
+restore [locate_data_file case_2_face_r.brep] a
+restore [locate_data_file case_2_wire3.brep] b
 bcommon result b a
 set length 846.821
 set nbsh_v 9
diff --git a/tests/boolean/bcommon_2d/D2 b/tests/boolean/bcommon_2d/D2
index 1d32ed7232..f49e591306 100644
--- a/tests/boolean/bcommon_2d/D2
+++ b/tests/boolean/bcommon_2d/D2
@@ -1,5 +1,5 @@
-restore case_3_solid.brep a
-restore case_3_edge1.brep b
+restore [locate_data_file case_3_solid.brep] a
+restore [locate_data_file case_3_edge1.brep] b
 bcommon result b a
 set length 345.975
 set nbsh_v 8
diff --git a/tests/boolean/bcommon_2d/D3 b/tests/boolean/bcommon_2d/D3
index 5f892700fd..224f4baf38 100644
--- a/tests/boolean/bcommon_2d/D3
+++ b/tests/boolean/bcommon_2d/D3
@@ -1,5 +1,5 @@
-restore case_3_solid.brep a
-restore case_3_edge2.brep b
+restore [locate_data_file case_3_solid.brep] a
+restore [locate_data_file case_3_edge2.brep] b
 bcommon result b a
 set length 345.975
 set nbsh_v 8
diff --git a/tests/boolean/bcommon_2d/D4 b/tests/boolean/bcommon_2d/D4
index 99f19efff7..d1037da00e 100644
--- a/tests/boolean/bcommon_2d/D4
+++ b/tests/boolean/bcommon_2d/D4
@@ -1,5 +1,5 @@
-restore case_3_solid.brep a
-restore case_3_wire1.brep b
+restore [locate_data_file case_3_solid.brep] a
+restore [locate_data_file case_3_wire1.brep] b
 bcommon result b a
 set length 345.975
 set nbsh_v 8
diff --git a/tests/boolean/bcommon_2d/D5 b/tests/boolean/bcommon_2d/D5
index 03a950ef70..f2eea3370c 100644
--- a/tests/boolean/bcommon_2d/D5
+++ b/tests/boolean/bcommon_2d/D5
@@ -1,5 +1,5 @@
-restore case_3_solid.brep a
-restore case_3_wire2.brep b
+restore [locate_data_file case_3_solid.brep] a
+restore [locate_data_file case_3_wire2.brep] b
 bcommon result b a
 set length 345.975
 set nbsh_v 14
diff --git a/tests/boolean/bcommon_2d/D6 b/tests/boolean/bcommon_2d/D6
index 388f47c253..3c1bb87117 100644
--- a/tests/boolean/bcommon_2d/D6
+++ b/tests/boolean/bcommon_2d/D6
@@ -1,5 +1,5 @@
-restore case_3_solid.brep a
-restore case_3_wire3.brep b
+restore [locate_data_file case_3_solid.brep] a
+restore [locate_data_file case_3_wire3.brep] b
 bcommon result b a
 set length 345.975
 set nbsh_v 8
diff --git a/tests/boolean/bcommon_2d/D7 b/tests/boolean/bcommon_2d/D7
index 4aad753782..a285470ec2 100644
--- a/tests/boolean/bcommon_2d/D7
+++ b/tests/boolean/bcommon_2d/D7
@@ -1,5 +1,5 @@
-restore case_3_solid.brep a
-restore case_3_wire4.brep b
+restore [locate_data_file case_3_solid.brep] a
+restore [locate_data_file case_3_wire4.brep] b
 bcommon result b a
 set length 345.975
 set nbsh_v 8
diff --git a/tests/boolean/bcommon_2d/D8 b/tests/boolean/bcommon_2d/D8
index a3419beaa2..68b3865d9a 100644
--- a/tests/boolean/bcommon_2d/D8
+++ b/tests/boolean/bcommon_2d/D8
@@ -1,5 +1,5 @@
-restore case_3_solid.brep a
-restore case_3_wire5.brep b
+restore [locate_data_file case_3_solid.brep] a
+restore [locate_data_file case_3_wire5.brep] b
 bcommon result b a
 set length 292.732
 set nbsh_v 4
diff --git a/tests/boolean/bcommon_2d/D9 b/tests/boolean/bcommon_2d/D9
index 0049f8d835..2de480a2bc 100644
--- a/tests/boolean/bcommon_2d/D9
+++ b/tests/boolean/bcommon_2d/D9
@@ -1,5 +1,5 @@
-restore case_3_shell.brep a
-restore case_3_edge1.brep b
+restore [locate_data_file case_3_shell.brep] a
+restore [locate_data_file case_3_edge1.brep] b
 bcommon result b a
 set length 345.975
 set nbsh_v 8
diff --git a/tests/boolean/bcommon_2d/E1 b/tests/boolean/bcommon_2d/E1
index 7ac4380a57..9a674c3579 100644
--- a/tests/boolean/bcommon_2d/E1
+++ b/tests/boolean/bcommon_2d/E1
@@ -1,5 +1,5 @@
-restore case_3_shell.brep a
-restore case_3_edge2.brep b
+restore [locate_data_file case_3_shell.brep] a
+restore [locate_data_file case_3_edge2.brep] b
 bcommon result b a
 set length 345.975
 set nbsh_v 8
diff --git a/tests/boolean/bcommon_2d/E2 b/tests/boolean/bcommon_2d/E2
index ded36c0795..141832c2b5 100644
--- a/tests/boolean/bcommon_2d/E2
+++ b/tests/boolean/bcommon_2d/E2
@@ -1,5 +1,5 @@
-restore case_3_shell.brep a
-restore case_3_wire1.brep b
+restore [locate_data_file case_3_shell.brep] a
+restore [locate_data_file case_3_wire1.brep] b
 bcommon result b a
 set length 345.975
 set nbsh_v 8
diff --git a/tests/boolean/bcommon_2d/E3 b/tests/boolean/bcommon_2d/E3
index e59382d5b0..6094574dc0 100644
--- a/tests/boolean/bcommon_2d/E3
+++ b/tests/boolean/bcommon_2d/E3
@@ -1,5 +1,5 @@
-restore case_3_shell.brep a
-restore case_3_wire2.brep b
+restore [locate_data_file case_3_shell.brep] a
+restore [locate_data_file case_3_wire2.brep] b
 bcommon result b a
 set length 345.975
 set nbsh_v 14
diff --git a/tests/boolean/bcommon_2d/E4 b/tests/boolean/bcommon_2d/E4
index 49524e35de..f67cc35bba 100644
--- a/tests/boolean/bcommon_2d/E4
+++ b/tests/boolean/bcommon_2d/E4
@@ -1,5 +1,5 @@
-restore case_3_shell.brep a
-restore case_3_wire3.brep b
+restore [locate_data_file case_3_shell.brep] a
+restore [locate_data_file case_3_wire3.brep] b
 bcommon result b a
 set length 345.975
 set nbsh_v 8
diff --git a/tests/boolean/bcommon_2d/E5 b/tests/boolean/bcommon_2d/E5
index f9a6a23b81..3804925f2f 100644
--- a/tests/boolean/bcommon_2d/E5
+++ b/tests/boolean/bcommon_2d/E5
@@ -1,5 +1,5 @@
-restore case_3_shell.brep a
-restore case_3_wire4.brep b
+restore [locate_data_file case_3_shell.brep] a
+restore [locate_data_file case_3_wire4.brep] b
 bcommon result b a
 set length 345.975
 set nbsh_v 8
diff --git a/tests/boolean/bcommon_2d/E6 b/tests/boolean/bcommon_2d/E6
index cb888980de..576beca7fc 100644
--- a/tests/boolean/bcommon_2d/E6
+++ b/tests/boolean/bcommon_2d/E6
@@ -1,5 +1,5 @@
-restore case_3_shell.brep a
-restore case_3_wire5.brep b
+restore [locate_data_file case_3_shell.brep] a
+restore [locate_data_file case_3_wire5.brep] b
 bcommon result b a
 set length 292.732
 set nbsh_v 4
diff --git a/tests/boolean/bcommon_2d/E7 b/tests/boolean/bcommon_2d/E7
index 170354cfb8..d1def9f8fb 100644
--- a/tests/boolean/bcommon_2d/E7
+++ b/tests/boolean/bcommon_2d/E7
@@ -1,5 +1,5 @@
-restore case_3_face.brep a
-restore case_3_edge1.brep b
+restore [locate_data_file case_3_face.brep] a
+restore [locate_data_file case_3_edge1.brep] b
 bcommon result b a
 set length 345.975
 set nbsh_v 8
diff --git a/tests/boolean/bcommon_2d/E8 b/tests/boolean/bcommon_2d/E8
index f57736e6b4..1b8e2447db 100644
--- a/tests/boolean/bcommon_2d/E8
+++ b/tests/boolean/bcommon_2d/E8
@@ -1,5 +1,5 @@
-restore case_3_face.brep a
-restore case_3_wire1.brep b
+restore [locate_data_file case_3_face.brep] a
+restore [locate_data_file case_3_wire1.brep] b
 bcommon result b a
 set length 345.975
 set nbsh_v 8
diff --git a/tests/boolean/bcommon_2d/E9 b/tests/boolean/bcommon_2d/E9
index 191f0d1895..f9fe9a5c56 100644
--- a/tests/boolean/bcommon_2d/E9
+++ b/tests/boolean/bcommon_2d/E9
@@ -1,5 +1,5 @@
-restore case_3_face.brep a
-restore case_3_wire2.brep b
+restore [locate_data_file case_3_face.brep] a
+restore [locate_data_file case_3_wire2.brep] b
 bcommon result b a
 set length 345.975
 set nbsh_v 14
diff --git a/tests/boolean/bcommon_2d/F1 b/tests/boolean/bcommon_2d/F1
index 9851f2dd5f..b10b5fa4f4 100644
--- a/tests/boolean/bcommon_2d/F1
+++ b/tests/boolean/bcommon_2d/F1
@@ -1,5 +1,5 @@
-restore case_3_face.brep a
-restore case_3_wire5.brep b
+restore [locate_data_file case_3_face.brep] a
+restore [locate_data_file case_3_wire5.brep] b
 bcommon result b a
 set length 66.3661
 set nbsh_v 2
diff --git a/tests/boolean/bcommon_2d/F2 b/tests/boolean/bcommon_2d/F2
index c29e92d69b..2f863297e0 100644
--- a/tests/boolean/bcommon_2d/F2
+++ b/tests/boolean/bcommon_2d/F2
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_edge1.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_edge1.brep] b
 bcommon result b a
 set length 345.975
 set nbsh_v 8
diff --git a/tests/boolean/bcommon_2d/F3 b/tests/boolean/bcommon_2d/F3
index bb2a91e2be..dfe15dcfe5 100644
--- a/tests/boolean/bcommon_2d/F3
+++ b/tests/boolean/bcommon_2d/F3
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_wire1.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_wire1.brep] b
 bcommon result b a
 set length 345.975
 set nbsh_v 8
diff --git a/tests/boolean/bcommon_2d/F4 b/tests/boolean/bcommon_2d/F4
index 6fe915964b..d8ea2cda51 100644
--- a/tests/boolean/bcommon_2d/F4
+++ b/tests/boolean/bcommon_2d/F4
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_wire2.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_wire2.brep] b
 bcommon result b a
 set length 345.975
 set nbsh_v 14
diff --git a/tests/boolean/bcommon_2d/F5 b/tests/boolean/bcommon_2d/F5
index 13df38363f..45d8133140 100644
--- a/tests/boolean/bcommon_2d/F5
+++ b/tests/boolean/bcommon_2d/F5
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_wire5.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_wire5.brep] b
 bcommon result b a
 set length 66.3661
 set nbsh_v 2
diff --git a/tests/boolean/bcommon_2d/F6 b/tests/boolean/bcommon_2d/F6
index fb3a0c132b..62d207bdf2 100644
--- a/tests/boolean/bcommon_2d/F6
+++ b/tests/boolean/bcommon_2d/F6
@@ -1,5 +1,5 @@
-restore case_4_solid.brep a
-restore case_4_edge1.brep b
+restore [locate_data_file case_4_solid.brep] a
+restore [locate_data_file case_4_edge1.brep] b
 bcommon result b a
 set length 1231.36
 set nbsh_v 2
diff --git a/tests/boolean/bcommon_2d/F7 b/tests/boolean/bcommon_2d/F7
index 37c97f29cd..78318e3876 100644
--- a/tests/boolean/bcommon_2d/F7
+++ b/tests/boolean/bcommon_2d/F7
@@ -1,5 +1,5 @@
-restore case_4_solid.brep a
-restore case_4_edge2.brep b
+restore [locate_data_file case_4_solid.brep] a
+restore [locate_data_file case_4_edge2.brep] b
 bcommon result b a
 set length 1231.36
 set nbsh_v 2
diff --git a/tests/boolean/bcommon_2d/F8 b/tests/boolean/bcommon_2d/F8
index 91a242c7c2..c2170ac2b6 100644
--- a/tests/boolean/bcommon_2d/F8
+++ b/tests/boolean/bcommon_2d/F8
@@ -1,5 +1,5 @@
-restore case_4_solid.brep a
-restore case_4_edge3.brep b
+restore [locate_data_file case_4_solid.brep] a
+restore [locate_data_file case_4_edge3.brep] b
 bcommon result b a
 set length 375.748
 set nbsh_v 2
diff --git a/tests/boolean/bcommon_2d/F9 b/tests/boolean/bcommon_2d/F9
index b25d63d468..760c8b5450 100644
--- a/tests/boolean/bcommon_2d/F9
+++ b/tests/boolean/bcommon_2d/F9
@@ -1,5 +1,5 @@
-restore case_4_solid.brep a
-restore case_4_wire1.brep b
+restore [locate_data_file case_4_solid.brep] a
+restore [locate_data_file case_4_wire1.brep] b
 bcommon result b a
 set length 2553.95
 set nbsh_v 3
diff --git a/tests/boolean/bcommon_2d/G1 b/tests/boolean/bcommon_2d/G1
index 7517f639a4..ef76ac79d2 100644
--- a/tests/boolean/bcommon_2d/G1
+++ b/tests/boolean/bcommon_2d/G1
@@ -1,5 +1,5 @@
-restore case_4_solid.brep a
-restore case_4_wire2.brep b
+restore [locate_data_file case_4_solid.brep] a
+restore [locate_data_file case_4_wire2.brep] b
 bcommon result b a
 set length 2553.95
 set nbsh_v 3
diff --git a/tests/boolean/bcommon_2d/G2 b/tests/boolean/bcommon_2d/G2
index 93bd7152da..096205c399 100644
--- a/tests/boolean/bcommon_2d/G2
+++ b/tests/boolean/bcommon_2d/G2
@@ -1,5 +1,5 @@
-restore case_4_solid.brep a
-restore case_4_wire3.brep b
+restore [locate_data_file case_4_solid.brep] a
+restore [locate_data_file case_4_wire3.brep] b
 bcommon result b a
 set length 633.071
 set nbsh_v 9
diff --git a/tests/boolean/bcommon_2d/G3 b/tests/boolean/bcommon_2d/G3
index a23d5c074d..a53c8995e9 100644
--- a/tests/boolean/bcommon_2d/G3
+++ b/tests/boolean/bcommon_2d/G3
@@ -1,5 +1,5 @@
-restore case_4_solid.brep a
-restore case_4_wire4.brep b
+restore [locate_data_file case_4_solid.brep] a
+restore [locate_data_file case_4_wire4.brep] b
 bcommon result b a
 set length 633.071
 set nbsh_v 9
diff --git a/tests/boolean/bcommon_2d/G4 b/tests/boolean/bcommon_2d/G4
index befc71e829..e556711174 100644
--- a/tests/boolean/bcommon_2d/G4
+++ b/tests/boolean/bcommon_2d/G4
@@ -1,5 +1,5 @@
-restore case_4_shell.brep a
-restore case_4_edge1.brep b
+restore [locate_data_file case_4_shell.brep] a
+restore [locate_data_file case_4_edge1.brep] b
 bcommon result b a
 set length 615.235
 set nbsh_v 6
diff --git a/tests/boolean/bcommon_2d/G5 b/tests/boolean/bcommon_2d/G5
index 9d1e1f3d7c..0f323b5dcb 100644
--- a/tests/boolean/bcommon_2d/G5
+++ b/tests/boolean/bcommon_2d/G5
@@ -1,5 +1,5 @@
-restore case_4_shell.brep a
-restore case_4_edge3.brep b
+restore [locate_data_file case_4_shell.brep] a
+restore [locate_data_file case_4_edge3.brep] b
 bcommon result b a
 set length 474.547
 set nbsh_v 4
diff --git a/tests/boolean/bcommon_2d/G6 b/tests/boolean/bcommon_2d/G6
index af5d64492c..314a74fb04 100644
--- a/tests/boolean/bcommon_2d/G6
+++ b/tests/boolean/bcommon_2d/G6
@@ -1,5 +1,5 @@
-restore case_4_shell.brep a
-restore case_4_wire1.brep b
+restore [locate_data_file case_4_shell.brep] a
+restore [locate_data_file case_4_wire1.brep] b
 bcommon result b a
 set length 1245.29
 set nbsh_v 10
diff --git a/tests/boolean/bcommon_2d/G7 b/tests/boolean/bcommon_2d/G7
index 3c4d713578..61fd878797 100644
--- a/tests/boolean/bcommon_2d/G7
+++ b/tests/boolean/bcommon_2d/G7
@@ -1,5 +1,5 @@
-restore case_4_shell.brep a
-restore case_4_wire3.brep b
+restore [locate_data_file case_4_shell.brep] a
+restore [locate_data_file case_4_wire3.brep] b
 bcommon result b a
 set length 1150.78
 set nbsh_v 15
diff --git a/tests/boolean/bcommon_2d/G8 b/tests/boolean/bcommon_2d/G8
index e1178629d0..73fc19c4c6 100644
--- a/tests/boolean/bcommon_2d/G8
+++ b/tests/boolean/bcommon_2d/G8
@@ -1,5 +1,5 @@
-restore case_4_face.brep a
-restore case_4_edge1.brep b
+restore [locate_data_file case_4_face.brep] a
+restore [locate_data_file case_4_edge1.brep] b
 bcommon result b a
 set length 615.235
 set nbsh_v 6
diff --git a/tests/boolean/bcommon_2d/G9 b/tests/boolean/bcommon_2d/G9
index 1d995ef0a7..1da570bc9f 100644
--- a/tests/boolean/bcommon_2d/G9
+++ b/tests/boolean/bcommon_2d/G9
@@ -1,5 +1,5 @@
-restore case_4_face.brep a
-restore case_4_edge3.brep b
+restore [locate_data_file case_4_face.brep] a
+restore [locate_data_file case_4_edge3.brep] b
 bcommon result b a
 set length 474.547
 set nbsh_v 4
diff --git a/tests/boolean/bcommon_2d/H1 b/tests/boolean/bcommon_2d/H1
index 56f29dd776..e0998d741e 100644
--- a/tests/boolean/bcommon_2d/H1
+++ b/tests/boolean/bcommon_2d/H1
@@ -1,5 +1,5 @@
-restore case_4_face.brep a
-restore case_4_wire1.brep b
+restore [locate_data_file case_4_face.brep] a
+restore [locate_data_file case_4_wire1.brep] b
 bcommon result b a
 set length 1245.29
 set nbsh_v 10
diff --git a/tests/boolean/bcommon_2d/H2 b/tests/boolean/bcommon_2d/H2
index ce0c460cbe..904175e708 100644
--- a/tests/boolean/bcommon_2d/H2
+++ b/tests/boolean/bcommon_2d/H2
@@ -1,5 +1,5 @@
-restore case_4_face.brep a
-restore case_4_wire3.brep b
+restore [locate_data_file case_4_face.brep] a
+restore [locate_data_file case_4_wire3.brep] b
 bcommon result b a
 set length 1150.78
 set nbsh_v 15
diff --git a/tests/boolean/bcommon_2d/H3 b/tests/boolean/bcommon_2d/H3
index 443443be78..d02bf76fb5 100644
--- a/tests/boolean/bcommon_2d/H3
+++ b/tests/boolean/bcommon_2d/H3
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_edge1.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_edge1.brep] b
 bcommon result b a
 set length 887.185
 set nbsh_v 2
diff --git a/tests/boolean/bcommon_2d/H4 b/tests/boolean/bcommon_2d/H4
index a3a216597a..5d511cbcfa 100644
--- a/tests/boolean/bcommon_2d/H4
+++ b/tests/boolean/bcommon_2d/H4
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_edge2.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_edge2.brep] b
 bcommon result b a
 set length 887.185
 set nbsh_v 2
diff --git a/tests/boolean/bcommon_2d/H5 b/tests/boolean/bcommon_2d/H5
index a4cc3c1d2b..cf1c4f3e8d 100644
--- a/tests/boolean/bcommon_2d/H5
+++ b/tests/boolean/bcommon_2d/H5
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_edge3.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_edge3.brep] b
 bcommon result b a
 set length 829.541
 set nbsh_v 2
diff --git a/tests/boolean/bcommon_2d/H6 b/tests/boolean/bcommon_2d/H6
index da4edc96f8..399cbca790 100644
--- a/tests/boolean/bcommon_2d/H6
+++ b/tests/boolean/bcommon_2d/H6
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_wire1.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_wire1.brep] b
 bcommon result b a
 set length 1747.73
 set nbsh_v 4
diff --git a/tests/boolean/bcommon_2d/H7 b/tests/boolean/bcommon_2d/H7
index d83d327fc9..e9e9a0dae8 100644
--- a/tests/boolean/bcommon_2d/H7
+++ b/tests/boolean/bcommon_2d/H7
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_wire2.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_wire2.brep] b
 bcommon result b a
 set length 1747.73
 set nbsh_v 4
diff --git a/tests/boolean/bcommon_2d/H8 b/tests/boolean/bcommon_2d/H8
index c1771317fd..a6b99c8903 100644
--- a/tests/boolean/bcommon_2d/H8
+++ b/tests/boolean/bcommon_2d/H8
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_wire3.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_wire3.brep] b
 bcommon result b a
 set length 1808.02
 set nbsh_v 12
diff --git a/tests/boolean/bcommon_2d/H9 b/tests/boolean/bcommon_2d/H9
index 6647eeac54..a6fb32f6cc 100644
--- a/tests/boolean/bcommon_2d/H9
+++ b/tests/boolean/bcommon_2d/H9
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_wire4.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_wire4.brep] b
 bcommon result b a
 set length 1808.02
 set nbsh_v 12
diff --git a/tests/boolean/bcommon_2d/I1 b/tests/boolean/bcommon_2d/I1
index f0bc66071c..6bfbc77c82 100644
--- a/tests/boolean/bcommon_2d/I1
+++ b/tests/boolean/bcommon_2d/I1
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_wire5.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_wire5.brep] b
 bcommon result b a
 set length 3000.52
 set nbsh_v 2
diff --git a/tests/boolean/bcommon_2d/I2 b/tests/boolean/bcommon_2d/I2
index 73a2e79957..c13a3baf2b 100644
--- a/tests/boolean/bcommon_2d/I2
+++ b/tests/boolean/bcommon_2d/I2
@@ -1,5 +1,5 @@
-restore case_5_shell.brep a
-restore case_5_edge1.brep b
+restore [locate_data_file case_5_shell.brep] a
+restore [locate_data_file case_5_edge1.brep] b
 bcommon result b a
 set length 887.185
 set nbsh_v 2
diff --git a/tests/boolean/bcommon_2d/I3 b/tests/boolean/bcommon_2d/I3
index c1de7bb161..ab8b0bc10d 100644
--- a/tests/boolean/bcommon_2d/I3
+++ b/tests/boolean/bcommon_2d/I3
@@ -1,5 +1,5 @@
-restore case_5_shell.brep a
-restore case_5_edge3.brep b
+restore [locate_data_file case_5_shell.brep] a
+restore [locate_data_file case_5_edge3.brep] b
 bcommon result b a
 set length 829.541
 set nbsh_v 2
diff --git a/tests/boolean/bcommon_2d/I4 b/tests/boolean/bcommon_2d/I4
index 5b94d0c042..d1883e5a0a 100644
--- a/tests/boolean/bcommon_2d/I4
+++ b/tests/boolean/bcommon_2d/I4
@@ -1,5 +1,5 @@
-restore case_5_shell.brep a
-restore case_5_wire1.brep b
+restore [locate_data_file case_5_shell.brep] a
+restore [locate_data_file case_5_wire1.brep] b
 bcommon result b a
 set length 1747.73
 set nbsh_v 4
diff --git a/tests/boolean/bcommon_2d/I5 b/tests/boolean/bcommon_2d/I5
index fba9f362c8..d1157a5b25 100644
--- a/tests/boolean/bcommon_2d/I5
+++ b/tests/boolean/bcommon_2d/I5
@@ -1,5 +1,5 @@
-restore case_5_shell.brep a
-restore case_5_wire3.brep b
+restore [locate_data_file case_5_shell.brep] a
+restore [locate_data_file case_5_wire3.brep] b
 bcommon result b a
 set length 1808.02
 set nbsh_v 12
diff --git a/tests/boolean/bcommon_2d/I6 b/tests/boolean/bcommon_2d/I6
index c41d463135..779f347f0f 100644
--- a/tests/boolean/bcommon_2d/I6
+++ b/tests/boolean/bcommon_2d/I6
@@ -1,5 +1,5 @@
-restore case_5_shell.brep a
-restore case_5_wire5.brep b
+restore [locate_data_file case_5_shell.brep] a
+restore [locate_data_file case_5_wire5.brep] b
 bcommon result b a
 set length 3000.52
 set nbsh_v 2
diff --git a/tests/boolean/bcommon_2d/I7 b/tests/boolean/bcommon_2d/I7
index 9265896f44..e89db95804 100644
--- a/tests/boolean/bcommon_2d/I7
+++ b/tests/boolean/bcommon_2d/I7
@@ -1,5 +1,5 @@
-restore case_5_face.brep a
-restore case_5_edge1.brep b
+restore [locate_data_file case_5_face.brep] a
+restore [locate_data_file case_5_edge1.brep] b
 bcommon result b a
 set length 887.185
 set nbsh_v 2
diff --git a/tests/boolean/bcommon_2d/I8 b/tests/boolean/bcommon_2d/I8
index 74cbae2930..ccba97203a 100644
--- a/tests/boolean/bcommon_2d/I8
+++ b/tests/boolean/bcommon_2d/I8
@@ -1,5 +1,5 @@
-restore case_5_face.brep a
-restore case_5_edge3.brep b
+restore [locate_data_file case_5_face.brep] a
+restore [locate_data_file case_5_edge3.brep] b
 bcommon result b a
 set length 829.541
 set nbsh_v 2
diff --git a/tests/boolean/bcommon_2d/I9 b/tests/boolean/bcommon_2d/I9
index cb58ecd4cf..5dfb0821ab 100644
--- a/tests/boolean/bcommon_2d/I9
+++ b/tests/boolean/bcommon_2d/I9
@@ -1,5 +1,5 @@
-restore case_5_face.brep a
-restore case_5_wire1.brep b
+restore [locate_data_file case_5_face.brep] a
+restore [locate_data_file case_5_wire1.brep] b
 bcommon result b a
 set length 1747.73
 set nbsh_v 4
diff --git a/tests/boolean/bcommon_2d/J1 b/tests/boolean/bcommon_2d/J1
index 3e4ec0b9eb..16f7acf9f7 100644
--- a/tests/boolean/bcommon_2d/J1
+++ b/tests/boolean/bcommon_2d/J1
@@ -1,5 +1,5 @@
-restore case_5_face.brep a
-restore case_5_wire3.brep b
+restore [locate_data_file case_5_face.brep] a
+restore [locate_data_file case_5_wire3.brep] b
 bcommon result b a
 set length 1808.02
 set nbsh_v 12
diff --git a/tests/boolean/bcommon_2d/J2 b/tests/boolean/bcommon_2d/J2
index 327affba7e..8403b9baff 100644
--- a/tests/boolean/bcommon_2d/J2
+++ b/tests/boolean/bcommon_2d/J2
@@ -1,5 +1,5 @@
-restore case_6_solid.brep a
-restore case_6_edge1.brep b
+restore [locate_data_file case_6_solid.brep] a
+restore [locate_data_file case_6_edge1.brep] b
 bcommon result b a
 set length 411.923
 set nbsh_v 6
diff --git a/tests/boolean/bcommon_2d/J3 b/tests/boolean/bcommon_2d/J3
index 4d26e18be4..3dc265708b 100644
--- a/tests/boolean/bcommon_2d/J3
+++ b/tests/boolean/bcommon_2d/J3
@@ -1,5 +1,5 @@
-restore case_6_solid.brep a
-restore case_6_edge2.brep b
+restore [locate_data_file case_6_solid.brep] a
+restore [locate_data_file case_6_edge2.brep] b
 bcommon result b a
 set length 615.235
 set nbsh_v 6
diff --git a/tests/boolean/bcommon_2d/J4 b/tests/boolean/bcommon_2d/J4
index 0009074e8e..224d76966b 100644
--- a/tests/boolean/bcommon_2d/J4
+++ b/tests/boolean/bcommon_2d/J4
@@ -1,5 +1,5 @@
-restore case_6_solid.brep a
-restore case_6_edge3.brep b
+restore [locate_data_file case_6_solid.brep] a
+restore [locate_data_file case_6_edge3.brep] b
 bcommon result b a
 set length 235.517
 set nbsh_v 4
diff --git a/tests/boolean/bcommon_2d/J5 b/tests/boolean/bcommon_2d/J5
index 438fdc27e1..26ce83c69c 100644
--- a/tests/boolean/bcommon_2d/J5
+++ b/tests/boolean/bcommon_2d/J5
@@ -1,5 +1,5 @@
-restore case_6_solid.brep a
-restore case_6_wire1.brep b
+restore [locate_data_file case_6_solid.brep] a
+restore [locate_data_file case_6_wire1.brep] b
 bcommon result b a
 set length 815.584
 set nbsh_v 10
diff --git a/tests/boolean/bcommon_2d/J6 b/tests/boolean/bcommon_2d/J6
index 44ab7930c6..ac303f42e0 100644
--- a/tests/boolean/bcommon_2d/J6
+++ b/tests/boolean/bcommon_2d/J6
@@ -1,5 +1,5 @@
-restore case_6_solid.brep a
-restore case_6_wire2.brep b
+restore [locate_data_file case_6_solid.brep] a
+restore [locate_data_file case_6_wire2.brep] b
 bcommon result b a
 set length 1245.29
 set nbsh_v 10
diff --git a/tests/boolean/bcommon_2d/J7 b/tests/boolean/bcommon_2d/J7
index d9a944f443..1a78313a49 100644
--- a/tests/boolean/bcommon_2d/J7
+++ b/tests/boolean/bcommon_2d/J7
@@ -1,5 +1,5 @@
-restore case_6_solid.brep a
-restore case_6_wire3.brep b
+restore [locate_data_file case_6_solid.brep] a
+restore [locate_data_file case_6_wire3.brep] b
 bcommon result b a
 set length 629.671
 set nbsh_v 14
diff --git a/tests/boolean/bcommon_2d/J8 b/tests/boolean/bcommon_2d/J8
index f55511d693..73675f4c71 100644
--- a/tests/boolean/bcommon_2d/J8
+++ b/tests/boolean/bcommon_2d/J8
@@ -1,5 +1,5 @@
-restore case_6_solid.brep a
-restore case_6_wire4.brep b
+restore [locate_data_file case_6_solid.brep] a
+restore [locate_data_file case_6_wire4.brep] b
 bcommon result b a
 set length 1150.78
 set nbsh_v 15
diff --git a/tests/boolean/bcommon_2d/J9 b/tests/boolean/bcommon_2d/J9
index e9b75a9bb6..2969942759 100644
--- a/tests/boolean/bcommon_2d/J9
+++ b/tests/boolean/bcommon_2d/J9
@@ -1,5 +1,5 @@
-restore case_6_shell.brep a
-restore case_6_edge1.brep b
+restore [locate_data_file case_6_shell.brep] a
+restore [locate_data_file case_6_edge1.brep] b
 bcommon result b a
 set length 411.923
 set nbsh_v 6
diff --git a/tests/boolean/bcommon_2d/K1 b/tests/boolean/bcommon_2d/K1
index d2e5eeff96..a95354009d 100644
--- a/tests/boolean/bcommon_2d/K1
+++ b/tests/boolean/bcommon_2d/K1
@@ -1,5 +1,5 @@
-restore case_6_shell.brep a
-restore case_6_edge3.brep b
+restore [locate_data_file case_6_shell.brep] a
+restore [locate_data_file case_6_edge3.brep] b
 bcommon result b a
 set length 235.517
 set nbsh_v 4
diff --git a/tests/boolean/bcommon_2d/K2 b/tests/boolean/bcommon_2d/K2
index 353faf0bea..c6a99cad16 100644
--- a/tests/boolean/bcommon_2d/K2
+++ b/tests/boolean/bcommon_2d/K2
@@ -1,5 +1,5 @@
-restore case_6_shell.brep a
-restore case_6_wire1.brep b
+restore [locate_data_file case_6_shell.brep] a
+restore [locate_data_file case_6_wire1.brep] b
 bcommon result b a
 set length 815.584
 set nbsh_v 10
diff --git a/tests/boolean/bcommon_2d/K3 b/tests/boolean/bcommon_2d/K3
index d88895ba6b..4890438a80 100644
--- a/tests/boolean/bcommon_2d/K3
+++ b/tests/boolean/bcommon_2d/K3
@@ -1,5 +1,5 @@
-restore case_6_shell.brep a
-restore case_6_wire3.brep b
+restore [locate_data_file case_6_shell.brep] a
+restore [locate_data_file case_6_wire3.brep] b
 bcommon result b a
 set length 629.671
 set nbsh_v 14
diff --git a/tests/boolean/bcommon_2d/K4 b/tests/boolean/bcommon_2d/K4
index 532933a24a..b93fe3c895 100644
--- a/tests/boolean/bcommon_2d/K4
+++ b/tests/boolean/bcommon_2d/K4
@@ -1,5 +1,5 @@
-restore case_6_face.brep a
-restore case_6_edge1.brep b
+restore [locate_data_file case_6_face.brep] a
+restore [locate_data_file case_6_edge1.brep] b
 bcommon result b a
 set length 411.923
 set nbsh_v 6
diff --git a/tests/boolean/bcommon_2d/K5 b/tests/boolean/bcommon_2d/K5
index ae531c21d2..acd518e633 100644
--- a/tests/boolean/bcommon_2d/K5
+++ b/tests/boolean/bcommon_2d/K5
@@ -1,5 +1,5 @@
-restore case_6_face.brep a
-restore case_6_edge3.brep b
+restore [locate_data_file case_6_face.brep] a
+restore [locate_data_file case_6_edge3.brep] b
 bcommon result b a
 set length 235.517
 set nbsh_v 4
diff --git a/tests/boolean/bcommon_2d/K6 b/tests/boolean/bcommon_2d/K6
index 742072decc..8d4e8259e7 100644
--- a/tests/boolean/bcommon_2d/K6
+++ b/tests/boolean/bcommon_2d/K6
@@ -1,5 +1,5 @@
-restore case_6_face.brep a
-restore case_6_wire1.brep b
+restore [locate_data_file case_6_face.brep] a
+restore [locate_data_file case_6_wire1.brep] b
 bcommon result b a
 set length 815.584
 set nbsh_v 10
diff --git a/tests/boolean/bcommon_2d/K7 b/tests/boolean/bcommon_2d/K7
index 04a0f42356..94f5e3ab0d 100644
--- a/tests/boolean/bcommon_2d/K7
+++ b/tests/boolean/bcommon_2d/K7
@@ -1,5 +1,5 @@
-restore case_6_face.brep a
-restore case_6_wire3.brep b
+restore [locate_data_file case_6_face.brep] a
+restore [locate_data_file case_6_wire3.brep] b
 bcommon result b a
 set length 629.671
 set nbsh_v 14
diff --git a/tests/boolean/bcommon_2d/K8 b/tests/boolean/bcommon_2d/K8
index 4d04d13efc..e88b0bfd86 100644
--- a/tests/boolean/bcommon_2d/K8
+++ b/tests/boolean/bcommon_2d/K8
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_edge1.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_edge1.brep] b
 bcommon result b a
 set length 482.392
 set nbsh_v 6
diff --git a/tests/boolean/bcommon_2d/K9 b/tests/boolean/bcommon_2d/K9
index 48b5c43503..584242876b 100644
--- a/tests/boolean/bcommon_2d/K9
+++ b/tests/boolean/bcommon_2d/K9
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_edge2.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_edge2.brep] b
 bcommon result b a
 set length 482.392
 set nbsh_v 6
diff --git a/tests/boolean/bcommon_2d/L1 b/tests/boolean/bcommon_2d/L1
index 2a20ac759d..c9c03516a9 100644
--- a/tests/boolean/bcommon_2d/L1
+++ b/tests/boolean/bcommon_2d/L1
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_edge3.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_edge3.brep] b
 bcommon result b a
 set length 520.393
 set nbsh_v 6
diff --git a/tests/boolean/bcommon_2d/L2 b/tests/boolean/bcommon_2d/L2
index 1f51da53c5..262ae749d7 100644
--- a/tests/boolean/bcommon_2d/L2
+++ b/tests/boolean/bcommon_2d/L2
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_edge4.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_edge4.brep] b
 bcommon result b a
 set length 520.393
 set nbsh_v 6
diff --git a/tests/boolean/bcommon_2d/L3 b/tests/boolean/bcommon_2d/L3
index 71fb43be40..e3c5340d66 100644
--- a/tests/boolean/bcommon_2d/L3
+++ b/tests/boolean/bcommon_2d/L3
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_wire1.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_wire1.brep] b
 bcommon result b a
 set length 482.392
 set nbsh_v 6
diff --git a/tests/boolean/bcommon_2d/L4 b/tests/boolean/bcommon_2d/L4
index 91f09c6830..c71094fb9b 100644
--- a/tests/boolean/bcommon_2d/L4
+++ b/tests/boolean/bcommon_2d/L4
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_wire2.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_wire2.brep] b
 bcommon result b a
 set length 482.392
 set nbsh_v 6
diff --git a/tests/boolean/bcommon_2d/L5 b/tests/boolean/bcommon_2d/L5
index de8f621cf4..4bafcc9379 100644
--- a/tests/boolean/bcommon_2d/L5
+++ b/tests/boolean/bcommon_2d/L5
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_wire3.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_wire3.brep] b
 bcommon result b a
 set length 520.393
 set nbsh_v 6
diff --git a/tests/boolean/bcommon_2d/L6 b/tests/boolean/bcommon_2d/L6
index 675ccde71c..7fe0596137 100644
--- a/tests/boolean/bcommon_2d/L6
+++ b/tests/boolean/bcommon_2d/L6
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_wire4.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_wire4.brep] b
 bcommon result b a
 set length 520.393
 set nbsh_v 6
diff --git a/tests/boolean/bcommon_2d/L7 b/tests/boolean/bcommon_2d/L7
index 0921b58c0f..b817677d39 100644
--- a/tests/boolean/bcommon_2d/L7
+++ b/tests/boolean/bcommon_2d/L7
@@ -1,5 +1,5 @@
-restore case_7_shell.brep a
-restore case_7_edge1.brep b
+restore [locate_data_file case_7_shell.brep] a
+restore [locate_data_file case_7_edge1.brep] b
 bcommon result b a
 set length 482.392
 set nbsh_v 6
diff --git a/tests/boolean/bcommon_2d/L8 b/tests/boolean/bcommon_2d/L8
index 4c0725669c..b1283e67f5 100644
--- a/tests/boolean/bcommon_2d/L8
+++ b/tests/boolean/bcommon_2d/L8
@@ -1,5 +1,5 @@
-restore case_7_shell.brep a
-restore case_7_edge3.brep b
+restore [locate_data_file case_7_shell.brep] a
+restore [locate_data_file case_7_edge3.brep] b
 bcommon result b a
 set length 520.393
 set nbsh_v 6
diff --git a/tests/boolean/bcommon_2d/L9 b/tests/boolean/bcommon_2d/L9
index fccc52db70..9112e964ce 100644
--- a/tests/boolean/bcommon_2d/L9
+++ b/tests/boolean/bcommon_2d/L9
@@ -1,5 +1,5 @@
-restore case_7_shell.brep a
-restore case_7_wire1.brep b
+restore [locate_data_file case_7_shell.brep] a
+restore [locate_data_file case_7_wire1.brep] b
 bcommon result b a
 set length 482.392
 set nbsh_v 6
diff --git a/tests/boolean/bcommon_2d/M1 b/tests/boolean/bcommon_2d/M1
index dbb3517af0..a9745ac2dc 100644
--- a/tests/boolean/bcommon_2d/M1
+++ b/tests/boolean/bcommon_2d/M1
@@ -1,5 +1,5 @@
-restore case_7_shell.brep a
-restore case_7_wire3.brep b
+restore [locate_data_file case_7_shell.brep] a
+restore [locate_data_file case_7_wire3.brep] b
 bcommon result b a
 set length 520.393
 set nbsh_v 6
diff --git a/tests/boolean/bcommon_2d/M2 b/tests/boolean/bcommon_2d/M2
index d4313f9751..69dbb9963e 100644
--- a/tests/boolean/bcommon_2d/M2
+++ b/tests/boolean/bcommon_2d/M2
@@ -1,5 +1,5 @@
-restore case_7_face.brep a
-restore case_7_edge1.brep b
+restore [locate_data_file case_7_face.brep] a
+restore [locate_data_file case_7_edge1.brep] b
 bcommon result b a
 set length 482.392
 set nbsh_v 6
diff --git a/tests/boolean/bcommon_2d/M3 b/tests/boolean/bcommon_2d/M3
index 8d57b91347..dfede552bf 100644
--- a/tests/boolean/bcommon_2d/M3
+++ b/tests/boolean/bcommon_2d/M3
@@ -1,5 +1,5 @@
-restore case_7_face.brep a
-restore case_7_edge3.brep b
+restore [locate_data_file case_7_face.brep] a
+restore [locate_data_file case_7_edge3.brep] b
 bcommon result b a
 set length 520.393
 set nbsh_v 6
diff --git a/tests/boolean/bcommon_2d/M4 b/tests/boolean/bcommon_2d/M4
index 745dbb7968..7d79c91497 100644
--- a/tests/boolean/bcommon_2d/M4
+++ b/tests/boolean/bcommon_2d/M4
@@ -1,5 +1,5 @@
-restore case_7_face.brep a
-restore case_7_wire1.brep b
+restore [locate_data_file case_7_face.brep] a
+restore [locate_data_file case_7_wire1.brep] b
 bcommon result b a
 set length 482.392
 set nbsh_v 6
diff --git a/tests/boolean/bcommon_2d/M5 b/tests/boolean/bcommon_2d/M5
index 6347460ba2..5ee2ab6c87 100644
--- a/tests/boolean/bcommon_2d/M5
+++ b/tests/boolean/bcommon_2d/M5
@@ -1,5 +1,5 @@
-restore case_7_face.brep a
-restore case_7_wire3.brep b
+restore [locate_data_file case_7_face.brep] a
+restore [locate_data_file case_7_wire3.brep] b
 bcommon result b a
 set length 520.393
 set nbsh_v 6
diff --git a/tests/boolean/bcommon_2d/M6 b/tests/boolean/bcommon_2d/M6
index c724e801ec..3f166fd857 100644
--- a/tests/boolean/bcommon_2d/M6
+++ b/tests/boolean/bcommon_2d/M6
@@ -1,5 +1,5 @@
-restore case_8_solid_repaired.brep a
-restore case_8_wire1.brep b
+restore [locate_data_file case_8_solid_repaired.brep] a
+restore [locate_data_file case_8_wire1.brep] b
 bcommon result b a
 set length 181.079
 set nbsh_v 3
diff --git a/tests/boolean/bcommon_2d/M7 b/tests/boolean/bcommon_2d/M7
index 7988dead6c..6a0d6b10a6 100644
--- a/tests/boolean/bcommon_2d/M7
+++ b/tests/boolean/bcommon_2d/M7
@@ -1,5 +1,5 @@
-restore case_8_solid_repaired.brep a
-restore case_8_wire2.brep b
+restore [locate_data_file case_8_solid_repaired.brep] a
+restore [locate_data_file case_8_wire2.brep] b
 bcommon result b a
 set length 49.966
 set nbsh_v 4
diff --git a/tests/boolean/bcommon_2d/M8 b/tests/boolean/bcommon_2d/M8
index f9f945e405..8621009c3f 100644
--- a/tests/boolean/bcommon_2d/M8
+++ b/tests/boolean/bcommon_2d/M8
@@ -1,5 +1,5 @@
-restore case_8_solid_repaired.brep a
-restore case_8_wire3.brep b
+restore [locate_data_file case_8_solid_repaired.brep] a
+restore [locate_data_file case_8_wire3.brep] b
 bcommon result b a
 set length 3.83899
 set nbsh_v 2
diff --git a/tests/boolean/bcommon_2d/M9 b/tests/boolean/bcommon_2d/M9
index 0b7f4c84f4..0022c5c237 100644
--- a/tests/boolean/bcommon_2d/M9
+++ b/tests/boolean/bcommon_2d/M9
@@ -1,5 +1,5 @@
-restore case_8_solid_repaired.brep a
-restore case_8_wire4.brep b
+restore [locate_data_file case_8_solid_repaired.brep] a
+restore [locate_data_file case_8_wire4.brep] b
 bcommon result b a
 set length 36.0874
 set nbsh_v 7
diff --git a/tests/boolean/bcommon_2d/N1 b/tests/boolean/bcommon_2d/N1
index 06edfcc3dd..85a731d083 100644
--- a/tests/boolean/bcommon_2d/N1
+++ b/tests/boolean/bcommon_2d/N1
@@ -1,5 +1,5 @@
-restore case_8_solid_repaired.brep a
-restore case_8_wire5.brep b
+restore [locate_data_file case_8_solid_repaired.brep] a
+restore [locate_data_file case_8_wire5.brep] b
 bcommon result b a
 set length 126.81
 set nbsh_v 6
diff --git a/tests/boolean/bcommon_2d/N2 b/tests/boolean/bcommon_2d/N2
index 1fc31e8190..277fb4f145 100644
--- a/tests/boolean/bcommon_2d/N2
+++ b/tests/boolean/bcommon_2d/N2
@@ -1,5 +1,5 @@
-restore case_8_solid_repaired.brep a
-restore case_8_wire6.brep b
+restore [locate_data_file case_8_solid_repaired.brep] a
+restore [locate_data_file case_8_wire6.brep] b
 bcommon result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcommon_2d/N3 b/tests/boolean/bcommon_2d/N3
index d8f272d120..b395dece3a 100644
--- a/tests/boolean/bcommon_2d/N3
+++ b/tests/boolean/bcommon_2d/N3
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge1.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge1.brep] b
 bcommon result b a
 set length 143.787
 set nbsh_v 2
diff --git a/tests/boolean/bcommon_2d/N4 b/tests/boolean/bcommon_2d/N4
index 586b6ae65b..0619468458 100644
--- a/tests/boolean/bcommon_2d/N4
+++ b/tests/boolean/bcommon_2d/N4
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge2.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge2.brep] b
 bcommon result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcommon_2d/N5 b/tests/boolean/bcommon_2d/N5
index 7de59687dd..72ba4dbaad 100644
--- a/tests/boolean/bcommon_2d/N5
+++ b/tests/boolean/bcommon_2d/N5
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge3.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge3.brep] b
 bcommon result b a
 set length 143.787
 set nbsh_v 2
diff --git a/tests/boolean/bcommon_2d/N6 b/tests/boolean/bcommon_2d/N6
index 9e25354c40..c28f9295c9 100644
--- a/tests/boolean/bcommon_2d/N6
+++ b/tests/boolean/bcommon_2d/N6
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge4.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge4.brep] b
 bcommon result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcommon_2d/N7 b/tests/boolean/bcommon_2d/N7
index 9b2185ddb5..21ec671f98 100644
--- a/tests/boolean/bcommon_2d/N7
+++ b/tests/boolean/bcommon_2d/N7
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge5.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge5.brep] b
 bcommon result b a
 set length 79.9002
 set nbsh_v 2
diff --git a/tests/boolean/bcommon_2d/N8 b/tests/boolean/bcommon_2d/N8
index 3faa0d5ab3..2a84d0fad4 100644
--- a/tests/boolean/bcommon_2d/N8
+++ b/tests/boolean/bcommon_2d/N8
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_wire1.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_wire1.brep] b
 bcommon result b a
 set length 143.787
 set nbsh_v 2
diff --git a/tests/boolean/bcommon_2d/N9 b/tests/boolean/bcommon_2d/N9
index a12c87c3b9..d32c10f592 100644
--- a/tests/boolean/bcommon_2d/N9
+++ b/tests/boolean/bcommon_2d/N9
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_wire2.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_wire2.brep] b
 bcommon result b a
 set length 143.787
 set nbsh_v 2
diff --git a/tests/boolean/bcommon_2d/O1 b/tests/boolean/bcommon_2d/O1
index e5297f546a..c500cb97ed 100644
--- a/tests/boolean/bcommon_2d/O1
+++ b/tests/boolean/bcommon_2d/O1
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_wire3.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_wire3.brep] b
 bcommon result b a
 set length 79.9002
 set nbsh_v 2
diff --git a/tests/boolean/bcommon_2d/O2 b/tests/boolean/bcommon_2d/O2
index 18bde5423e..e02a7a1584 100644
--- a/tests/boolean/bcommon_2d/O2
+++ b/tests/boolean/bcommon_2d/O2
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge1.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge1.brep] b
 bcommon result b a
 set length 143.787
 set nbsh_v 2
diff --git a/tests/boolean/bcommon_2d/O3 b/tests/boolean/bcommon_2d/O3
index 4698791cc4..50f7475752 100644
--- a/tests/boolean/bcommon_2d/O3
+++ b/tests/boolean/bcommon_2d/O3
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge2.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge2.brep] b
 bcommon result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcommon_2d/O4 b/tests/boolean/bcommon_2d/O4
index fb22a11127..7dca3119b0 100644
--- a/tests/boolean/bcommon_2d/O4
+++ b/tests/boolean/bcommon_2d/O4
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge3.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge3.brep] b
 bcommon result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcommon_2d/O5 b/tests/boolean/bcommon_2d/O5
index 39b6d5486c..166643e8dd 100644
--- a/tests/boolean/bcommon_2d/O5
+++ b/tests/boolean/bcommon_2d/O5
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge4.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge4.brep] b
 bcommon result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcommon_2d/O6 b/tests/boolean/bcommon_2d/O6
index 4f7cbf825d..a5c8a48f60 100644
--- a/tests/boolean/bcommon_2d/O6
+++ b/tests/boolean/bcommon_2d/O6
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge5.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge5.brep] b
 bcommon result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcommon_2d/O7 b/tests/boolean/bcommon_2d/O7
index 6110e2ed96..1b107ce3af 100644
--- a/tests/boolean/bcommon_2d/O7
+++ b/tests/boolean/bcommon_2d/O7
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_wire1.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_wire1.brep] b
 bcommon result b a
 set length 143.787
 set nbsh_v 2
diff --git a/tests/boolean/bcommon_2d/O8 b/tests/boolean/bcommon_2d/O8
index d66ceba06e..2a1387ed82 100644
--- a/tests/boolean/bcommon_2d/O8
+++ b/tests/boolean/bcommon_2d/O8
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_wire2.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_wire2.brep] b
 bcommon result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcommon_2d/O9 b/tests/boolean/bcommon_2d/O9
index 16d39cd227..1e2490ee1a 100644
--- a/tests/boolean/bcommon_2d/O9
+++ b/tests/boolean/bcommon_2d/O9
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_wire3.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_wire3.brep] b
 bcommon result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcommon_2d/P1 b/tests/boolean/bcommon_2d/P1
index bbe98563f5..a0064c9a6e 100644
--- a/tests/boolean/bcommon_2d/P1
+++ b/tests/boolean/bcommon_2d/P1
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge1.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge1.brep] b
 bcommon result b a
 set length 143.787
 set nbsh_v 2
diff --git a/tests/boolean/bcommon_2d/P2 b/tests/boolean/bcommon_2d/P2
index 5c1be08d4d..5e584c008f 100644
--- a/tests/boolean/bcommon_2d/P2
+++ b/tests/boolean/bcommon_2d/P2
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge2.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge2.brep] b
 bcommon result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcommon_2d/P3 b/tests/boolean/bcommon_2d/P3
index 13fd1398b3..021e99e9ad 100644
--- a/tests/boolean/bcommon_2d/P3
+++ b/tests/boolean/bcommon_2d/P3
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge3.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge3.brep] b
 bcommon result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcommon_2d/P4 b/tests/boolean/bcommon_2d/P4
index 316c7071ef..4b645484f5 100644
--- a/tests/boolean/bcommon_2d/P4
+++ b/tests/boolean/bcommon_2d/P4
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge4.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge4.brep] b
 bcommon result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcommon_2d/P5 b/tests/boolean/bcommon_2d/P5
index 2945f13427..fabaf57de6 100644
--- a/tests/boolean/bcommon_2d/P5
+++ b/tests/boolean/bcommon_2d/P5
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge5.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge5.brep] b
 bcommon result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcommon_2d/P6 b/tests/boolean/bcommon_2d/P6
index 48e2665ed8..854f59e0c9 100644
--- a/tests/boolean/bcommon_2d/P6
+++ b/tests/boolean/bcommon_2d/P6
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_wire1.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_wire1.brep] b
 bcommon result b a
 set length 143.787
 set nbsh_v 2
diff --git a/tests/boolean/bcommon_2d/P7 b/tests/boolean/bcommon_2d/P7
index 244f44f52a..a221ce80f4 100644
--- a/tests/boolean/bcommon_2d/P7
+++ b/tests/boolean/bcommon_2d/P7
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_wire2.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_wire2.brep] b
 bcommon result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcommon_2d/P8 b/tests/boolean/bcommon_2d/P8
index 77d7faf79d..b4166c4e64 100644
--- a/tests/boolean/bcommon_2d/P8
+++ b/tests/boolean/bcommon_2d/P8
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_wire3.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_wire3.brep] b
 bcommon result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcommon_complex/A1 b/tests/boolean/bcommon_complex/A1
index 88c4825442..cc99f10218 100644
--- a/tests/boolean/bcommon_complex/A1
+++ b/tests/boolean/bcommon_complex/A1
@@ -1,5 +1,5 @@
-restore f2 b1
-restore f6 b2
+restore [locate_data_file f2] b1
+restore [locate_data_file f6] b2
 
 bcommon result b1 b2
 
diff --git a/tests/boolean/bcommon_complex/A2 b/tests/boolean/bcommon_complex/A2
index bfc2f331c6..e748fef939 100644
--- a/tests/boolean/bcommon_complex/A2
+++ b/tests/boolean/bcommon_complex/A2
@@ -1,5 +1,5 @@
-restore f7 b1
-restore f3 b2
+restore [locate_data_file f7] b1
+restore [locate_data_file f3] b2
 
 bcommon result b1 b2
 
diff --git a/tests/boolean/bcommon_complex/A3 b/tests/boolean/bcommon_complex/A3
index 8ef9743c64..3bd2ca5623 100644
--- a/tests/boolean/bcommon_complex/A3
+++ b/tests/boolean/bcommon_complex/A3
@@ -1,5 +1,5 @@
-restore f2 b1
-restore f5 b2
+restore [locate_data_file f2] b1
+restore [locate_data_file f5] b2
 
 bcommon result b1 b2
 
diff --git a/tests/boolean/bcommon_complex/A4 b/tests/boolean/bcommon_complex/A4
index 1108f7a204..048e24acab 100644
--- a/tests/boolean/bcommon_complex/A4
+++ b/tests/boolean/bcommon_complex/A4
@@ -1,5 +1,5 @@
-restore f4 b1
-restore f5 b2
+restore [locate_data_file f4] b1
+restore [locate_data_file f5] b2
 
 bcommon result b1 b2
 
diff --git a/tests/boolean/bcommon_complex/A5 b/tests/boolean/bcommon_complex/A5
index 40d589d999..875c6bdb31 100644
--- a/tests/boolean/bcommon_complex/A5
+++ b/tests/boolean/bcommon_complex/A5
@@ -1,5 +1,5 @@
-restore f1 b1
-restore f5 b2
+restore [locate_data_file f1] b1
+restore [locate_data_file f5] b2
 
 bcommon result b1 b2
 
diff --git a/tests/boolean/bcommon_complex/A6 b/tests/boolean/bcommon_complex/A6
index 514055fbfe..dbff0449a3 100644
--- a/tests/boolean/bcommon_complex/A6
+++ b/tests/boolean/bcommon_complex/A6
@@ -1,5 +1,5 @@
-restore f1 b1
-restore f4 b2
+restore [locate_data_file f1] b1
+restore [locate_data_file f4] b2
 
 bcommon result b1 b2
 
diff --git a/tests/boolean/bcommon_complex/A7 b/tests/boolean/bcommon_complex/A7
index a49aeac042..44d92958ca 100644
--- a/tests/boolean/bcommon_complex/A7
+++ b/tests/boolean/bcommon_complex/A7
@@ -1,5 +1,5 @@
-restore f2 b1
-restore f3 b2
+restore [locate_data_file f2] b1
+restore [locate_data_file f3] b2
 
 bcommon result b1 b2
 
diff --git a/tests/boolean/bcommon_complex/A8 b/tests/boolean/bcommon_complex/A8
index e0bff1d71c..e4736cc0da 100644
--- a/tests/boolean/bcommon_complex/A8
+++ b/tests/boolean/bcommon_complex/A8
@@ -1,5 +1,5 @@
-restore f3 b1
-restore f4 b2
+restore [locate_data_file f3] b1
+restore [locate_data_file f4] b2
 
 bcommon result b1 b2
 
diff --git a/tests/boolean/bcommon_complex/A9 b/tests/boolean/bcommon_complex/A9
index b519c588ed..5b2554c2ed 100644
--- a/tests/boolean/bcommon_complex/A9
+++ b/tests/boolean/bcommon_complex/A9
@@ -1,5 +1,5 @@
-restore f3 b1
-restore f5 b2
+restore [locate_data_file f3] b1
+restore [locate_data_file f5] b2
 
 bcommon result b1 b2
 
diff --git a/tests/boolean/bcommon_complex/B1 b/tests/boolean/bcommon_complex/B1
index a3882165f9..a639e0f95a 100644
--- a/tests/boolean/bcommon_complex/B1
+++ b/tests/boolean/bcommon_complex/B1
@@ -1,5 +1,5 @@
-restore f1 b1
-restore f41 b2
+restore [locate_data_file f1] b1
+restore [locate_data_file f41] b2
 
 bcommon result b1 b2
 
diff --git a/tests/boolean/bcommon_complex/B2 b/tests/boolean/bcommon_complex/B2
index 0d4713277d..dddce6ac72 100644
--- a/tests/boolean/bcommon_complex/B2
+++ b/tests/boolean/bcommon_complex/B2
@@ -1,5 +1,5 @@
-restore so1 b1
-restore so4 b2
+restore [locate_data_file so1] b1
+restore [locate_data_file so4] b2
 
 bcommon result b1 b2
 
diff --git a/tests/boolean/bcommon_complex/B3 b/tests/boolean/bcommon_complex/B3
index 4efdec995d..67724e6cbd 100644
--- a/tests/boolean/bcommon_complex/B3
+++ b/tests/boolean/bcommon_complex/B3
@@ -1,5 +1,5 @@
-restore so1 b1
-restore so2 b2
+restore [locate_data_file so1] b1
+restore [locate_data_file so2] b2
 
 bcommon result b1 b2
 
diff --git a/tests/boolean/bcommon_complex/B4 b/tests/boolean/bcommon_complex/B4
index a8e0d40b3e..04792968f7 100644
--- a/tests/boolean/bcommon_complex/B4
+++ b/tests/boolean/bcommon_complex/B4
@@ -1,5 +1,5 @@
-restore so2 b1
-restore so3 b2
+restore [locate_data_file so2] b1
+restore [locate_data_file so3] b2
 
 bcommon result b1 b2
 
diff --git a/tests/boolean/bcommon_complex/B5 b/tests/boolean/bcommon_complex/B5
index d4c767c3dc..8e88e8cc50 100644
--- a/tests/boolean/bcommon_complex/B5
+++ b/tests/boolean/bcommon_complex/B5
@@ -1,5 +1,5 @@
-restore so4 b1
-restore so2 b2
+restore [locate_data_file so4] b1
+restore [locate_data_file so2] b2
 
 bcommon result b1 b2
 
diff --git a/tests/boolean/bcommon_complex/B6 b/tests/boolean/bcommon_complex/B6
index 20fbe0b33d..c2936730d9 100644
--- a/tests/boolean/bcommon_complex/B6
+++ b/tests/boolean/bcommon_complex/B6
@@ -1,5 +1,5 @@
-restore so5 b1
-restore so2 b2
+restore [locate_data_file so5] b1
+restore [locate_data_file so2] b2
 
 bcommon result b1 b2
 
diff --git a/tests/boolean/bcommon_complex/B7 b/tests/boolean/bcommon_complex/B7
index 181eb52e80..e34981b37f 100644
--- a/tests/boolean/bcommon_complex/B7
+++ b/tests/boolean/bcommon_complex/B7
@@ -1,5 +1,5 @@
-restore so3 b1
-restore so7 b2
+restore [locate_data_file so3] b1
+restore [locate_data_file so7] b2
 
 bcommon result b1 b2
 
diff --git a/tests/boolean/bcommon_complex/B8 b/tests/boolean/bcommon_complex/B8
index ecc37c238a..1a866e9ad2 100644
--- a/tests/boolean/bcommon_complex/B8
+++ b/tests/boolean/bcommon_complex/B8
@@ -1,5 +1,5 @@
-restore so2 b1
-restore so7 b2
+restore [locate_data_file so2] b1
+restore [locate_data_file so7] b2
 
 bcommon result b1 b2
 
diff --git a/tests/boolean/bcommon_complex/B9 b/tests/boolean/bcommon_complex/B9
index f837f69dd0..00f65d473d 100644
--- a/tests/boolean/bcommon_complex/B9
+++ b/tests/boolean/bcommon_complex/B9
@@ -1,5 +1,5 @@
-restore so2 b1
-restore so6 b2
+restore [locate_data_file so2] b1
+restore [locate_data_file so6] b2
 
 bcommon result b1 b2
 
diff --git a/tests/boolean/bcommon_complex/C1 b/tests/boolean/bcommon_complex/C1
index c1d07cdc46..1648842338 100644
--- a/tests/boolean/bcommon_complex/C1
+++ b/tests/boolean/bcommon_complex/C1
@@ -2,10 +2,10 @@
 # Date : 07mar97
 
 ## this saved revol shape has length of 1.2 Meter (1200 mm)
-restore pro6974.rle rev1
+restore [locate_data_file pro6974.rle] rev1
 
 ## this saved box is at the left of 'rev1', passing by the axis
-restore pro6974_box.rle box2
+restore [locate_data_file pro6974_box.rle] box2
 
 bcommon result rev1 box2
 
diff --git a/tests/boolean/bcommon_complex/C2 b/tests/boolean/bcommon_complex/C2
index a71fff563b..a47724f34d 100644
--- a/tests/boolean/bcommon_complex/C2
+++ b/tests/boolean/bcommon_complex/C2
@@ -2,8 +2,8 @@
 # Date : 15sept98
 
 
-restore cts21453a.rle a
-restore cts21453b.rle b
+restore [locate_data_file cts21453a.rle] a
+restore [locate_data_file cts21453b.rle] b
 
 bcommon result a b
 
diff --git a/tests/boolean/bcommon_complex/C3 b/tests/boolean/bcommon_complex/C3
index d513d1d33f..0628e7b1d2 100644
--- a/tests/boolean/bcommon_complex/C3
+++ b/tests/boolean/bcommon_complex/C3
@@ -4,8 +4,8 @@
 puts "TODO #22911 ALL: Faulty shapes in variables faulty_1 to faulty_4"
 puts "TODO #22911 ALL: Error : The square of result shape is"
 
-restore pro9373a.rle a
-restore pro9373b.rle b
+restore [locate_data_file pro9373a.rle] a
+restore [locate_data_file pro9373b.rle] b
 
 bcommon result a b
 
diff --git a/tests/boolean/bcommon_complex/C4 b/tests/boolean/bcommon_complex/C4
index dc1650b507..1cfb3d7b37 100644
--- a/tests/boolean/bcommon_complex/C4
+++ b/tests/boolean/bcommon_complex/C4
@@ -2,8 +2,8 @@
 # Date : 13Mai98
 # A8.gif
 
-restore cts20460a.rle a
-restore cts20460b.rle b
+restore [locate_data_file cts20460a.rle] a
+restore [locate_data_file cts20460b.rle] b
 
 bcommon result a b 
 
diff --git a/tests/boolean/bcommon_complex/C5 b/tests/boolean/bcommon_complex/C5
index ca20d489fd..6e161b9301 100644
--- a/tests/boolean/bcommon_complex/C5
+++ b/tests/boolean/bcommon_complex/C5
@@ -1,8 +1,8 @@
 # Original bug : cts20339
 # Date : 19Mai98
 
-restore cts20339a.rle a
-restore cts20339b.rle b
+restore [locate_data_file cts20339a.rle] a
+restore [locate_data_file cts20339b.rle] b
 
 bcommon result a b
 
diff --git a/tests/boolean/bcommon_complex/C6 b/tests/boolean/bcommon_complex/C6
index cb7e5185e6..91056d8932 100644
--- a/tests/boolean/bcommon_complex/C6
+++ b/tests/boolean/bcommon_complex/C6
@@ -1,8 +1,8 @@
 # Original bug : cts20527
 # Date : 19Mai98
 
-restore cts20527a.rle a
-restore cts20527b.rle b
+restore [locate_data_file cts20527a.rle] a
+restore [locate_data_file cts20527b.rle] b
 
 bcommon result a b
 
diff --git a/tests/boolean/bcommon_complex/C7 b/tests/boolean/bcommon_complex/C7
index 609e2844ac..198df2b332 100644
--- a/tests/boolean/bcommon_complex/C7
+++ b/tests/boolean/bcommon_complex/C7
@@ -1,7 +1,7 @@
 puts "BUC60290 (the same problem with cut and common)"
 
-restore buc60290a.rle sol1
-restore buc60290b.rle sol2
+restore [locate_data_file buc60290a.rle] sol1
+restore [locate_data_file buc60290b.rle] sol2
 
 bcommon result sol2 sol1
 
diff --git a/tests/boolean/bcut_2d/A1 b/tests/boolean/bcut_2d/A1
index e344c6e696..f4e7acbce0 100644
--- a/tests/boolean/bcut_2d/A1
+++ b/tests/boolean/bcut_2d/A1
@@ -1,5 +1,5 @@
-restore case_1_solid.brep a
-restore case_1_edge1.brep b
+restore [locate_data_file case_1_solid.brep] a
+restore [locate_data_file case_1_edge1.brep] b
 bcut result b a
 set length 292.229
 set nbsh_v 6
diff --git a/tests/boolean/bcut_2d/A2 b/tests/boolean/bcut_2d/A2
index 4c96d8abb1..76fac7aa06 100644
--- a/tests/boolean/bcut_2d/A2
+++ b/tests/boolean/bcut_2d/A2
@@ -1,5 +1,5 @@
-restore case_1_solid.brep a
-restore case_1_edge2.brep b
+restore [locate_data_file case_1_solid.brep] a
+restore [locate_data_file case_1_edge2.brep] b
 bcut result b a
 set length 392.231
 set nbsh_v 3
diff --git a/tests/boolean/bcut_2d/A3 b/tests/boolean/bcut_2d/A3
index 22a4c5b733..d488303111 100644
--- a/tests/boolean/bcut_2d/A3
+++ b/tests/boolean/bcut_2d/A3
@@ -1,5 +1,5 @@
-restore case_1_solid.brep a
-restore case_1_edge3.brep b
+restore [locate_data_file case_1_solid.brep] a
+restore [locate_data_file case_1_edge3.brep] b
 bcut result b a
 set length 46.1869
 set nbsh_v 2
diff --git a/tests/boolean/bcut_2d/A4 b/tests/boolean/bcut_2d/A4
index 47c08407e0..664f5c03bd 100644
--- a/tests/boolean/bcut_2d/A4
+++ b/tests/boolean/bcut_2d/A4
@@ -1,5 +1,5 @@
-restore case_1_solid.brep a
-restore case_1_edge4.brep b
+restore [locate_data_file case_1_solid.brep] a
+restore [locate_data_file case_1_edge4.brep] b
 bcut result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcut_2d/A5 b/tests/boolean/bcut_2d/A5
index a04d3b67c3..198841f822 100644
--- a/tests/boolean/bcut_2d/A5
+++ b/tests/boolean/bcut_2d/A5
@@ -1,5 +1,5 @@
-restore case_1_solid.brep a
-restore case_1_wire1.brep b
+restore [locate_data_file case_1_solid.brep] a
+restore [locate_data_file case_1_wire1.brep] b
 bcut result b a
 set length 984.459
 set nbsh_v 9
diff --git a/tests/boolean/bcut_2d/A6 b/tests/boolean/bcut_2d/A6
index 47a2ec9357..6fb3c3dc2c 100644
--- a/tests/boolean/bcut_2d/A6
+++ b/tests/boolean/bcut_2d/A6
@@ -1,5 +1,5 @@
-restore case_1_solid.brep a
-restore case_1_wire2.brep b
+restore [locate_data_file case_1_solid.brep] a
+restore [locate_data_file case_1_wire2.brep] b
 bcut result b a
 set length 926.59
 set nbsh_v 6
diff --git a/tests/boolean/bcut_2d/A7 b/tests/boolean/bcut_2d/A7
index c1dd6db392..cf8e2fda69 100644
--- a/tests/boolean/bcut_2d/A7
+++ b/tests/boolean/bcut_2d/A7
@@ -1,5 +1,5 @@
-restore case_1_solid.brep a
-restore case_1_wire3.brep b
+restore [locate_data_file case_1_solid.brep] a
+restore [locate_data_file case_1_wire3.brep] b
 bcut result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcut_2d/A8 b/tests/boolean/bcut_2d/A8
index 7146e9bd3c..c2f6e34ab4 100644
--- a/tests/boolean/bcut_2d/A8
+++ b/tests/boolean/bcut_2d/A8
@@ -1,5 +1,5 @@
-restore case_1_shell.brep a
-restore case_1_edge2.brep b
+restore [locate_data_file case_1_shell.brep] a
+restore [locate_data_file case_1_edge2.brep] b
 bcut result b a
 set length 392.231
 set nbsh_v 3
diff --git a/tests/boolean/bcut_2d/A9 b/tests/boolean/bcut_2d/A9
index 6814860ad9..2006a8e08a 100644
--- a/tests/boolean/bcut_2d/A9
+++ b/tests/boolean/bcut_2d/A9
@@ -1,5 +1,5 @@
-restore case_1_shell.brep a
-restore case_1_edge4.brep b
+restore [locate_data_file case_1_shell.brep] a
+restore [locate_data_file case_1_edge4.brep] b
 bcut result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcut_2d/B1 b/tests/boolean/bcut_2d/B1
index 86a471392e..d014bc75d2 100644
--- a/tests/boolean/bcut_2d/B1
+++ b/tests/boolean/bcut_2d/B1
@@ -1,5 +1,5 @@
-restore case_1_shell.brep a
-restore case_1_wire3.brep b
+restore [locate_data_file case_1_shell.brep] a
+restore [locate_data_file case_1_wire3.brep] b
 bcut result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcut_2d/B2 b/tests/boolean/bcut_2d/B2
index 9432306f08..00e32541a1 100644
--- a/tests/boolean/bcut_2d/B2
+++ b/tests/boolean/bcut_2d/B2
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_edge1.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_edge1.brep] b
 bcut result b a
 set length 1211.16
 set nbsh_v 14
diff --git a/tests/boolean/bcut_2d/B3 b/tests/boolean/bcut_2d/B3
index a6dcc19c56..2a5428466e 100644
--- a/tests/boolean/bcut_2d/B3
+++ b/tests/boolean/bcut_2d/B3
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_edge2.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_edge2.brep] b
 bcut result b a
 set length 1211.16
 set nbsh_v 14
diff --git a/tests/boolean/bcut_2d/B4 b/tests/boolean/bcut_2d/B4
index 2a5f9e86eb..25db9d6618 100644
--- a/tests/boolean/bcut_2d/B4
+++ b/tests/boolean/bcut_2d/B4
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_edge3.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_edge3.brep] b
 bcut result b a
 set length 1304.85
 set nbsh_v 6
diff --git a/tests/boolean/bcut_2d/B5 b/tests/boolean/bcut_2d/B5
index bf06ff5c4d..8943f6884b 100644
--- a/tests/boolean/bcut_2d/B5
+++ b/tests/boolean/bcut_2d/B5
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_edge4.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_edge4.brep] b
 bcut result b a
 set length 1304.85
 set nbsh_v 6
diff --git a/tests/boolean/bcut_2d/B6 b/tests/boolean/bcut_2d/B6
index 142499a909..3636d2b3f0 100644
--- a/tests/boolean/bcut_2d/B6
+++ b/tests/boolean/bcut_2d/B6
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_wire1.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_wire1.brep] b
 bcut result b a
 set length 2302.78
 set nbsh_v 18
diff --git a/tests/boolean/bcut_2d/B7 b/tests/boolean/bcut_2d/B7
index 5cd03a96c3..0a9d62345e 100644
--- a/tests/boolean/bcut_2d/B7
+++ b/tests/boolean/bcut_2d/B7
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_wire2.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_wire2.brep] b
 bcut result b a
 set length 2302.78
 set nbsh_v 18
diff --git a/tests/boolean/bcut_2d/B8 b/tests/boolean/bcut_2d/B8
index 9e5ecbf4d1..f541ad3c57 100644
--- a/tests/boolean/bcut_2d/B8
+++ b/tests/boolean/bcut_2d/B8
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_wire3.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_wire3.brep] b
 bcut result b a
 set length 2329.96
 set nbsh_v 11
diff --git a/tests/boolean/bcut_2d/B9 b/tests/boolean/bcut_2d/B9
index 380d640e29..646434810b 100644
--- a/tests/boolean/bcut_2d/B9
+++ b/tests/boolean/bcut_2d/B9
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_wire4.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_wire4.brep] b
 bcut result b a
 set length 2408.18
 set nbsh_v 11
diff --git a/tests/boolean/bcut_2d/C1 b/tests/boolean/bcut_2d/C1
index 80bdf5ff7b..a53b4f798f 100644
--- a/tests/boolean/bcut_2d/C1
+++ b/tests/boolean/bcut_2d/C1
@@ -1,5 +1,5 @@
-restore case_2_shell_r.brep a
-restore case_2_edge1.brep b
+restore [locate_data_file case_2_shell_r.brep] a
+restore [locate_data_file case_2_edge1.brep] b
 bcut result b a
 #set length 2058.17
 set length 1211.16
diff --git a/tests/boolean/bcut_2d/C2 b/tests/boolean/bcut_2d/C2
index 8a3f8e9c1d..dfa4accd7c 100644
--- a/tests/boolean/bcut_2d/C2
+++ b/tests/boolean/bcut_2d/C2
@@ -1,5 +1,5 @@
-restore case_2_shell_r.brep a
-restore case_2_edge2.brep b
+restore [locate_data_file case_2_shell_r.brep] a
+restore [locate_data_file case_2_edge2.brep] b
 bcut result b a
 #set length 2058.17
 set length 1211.16
diff --git a/tests/boolean/bcut_2d/C3 b/tests/boolean/bcut_2d/C3
index 28ec4863c5..82c6d5c6e3 100644
--- a/tests/boolean/bcut_2d/C3
+++ b/tests/boolean/bcut_2d/C3
@@ -1,5 +1,5 @@
-restore case_2_shell_r.brep a
-restore case_2_edge3.brep b
+restore [locate_data_file case_2_shell_r.brep] a
+restore [locate_data_file case_2_edge3.brep] b
 bcut result b a
 #set length 2058.17
 set length 1304.85
diff --git a/tests/boolean/bcut_2d/C4 b/tests/boolean/bcut_2d/C4
index 69d12862f4..d112928bf2 100644
--- a/tests/boolean/bcut_2d/C4
+++ b/tests/boolean/bcut_2d/C4
@@ -1,5 +1,5 @@
-restore case_2_shell_r.brep a
-restore case_2_wire1.brep b
+restore [locate_data_file case_2_shell_r.brep] a
+restore [locate_data_file case_2_wire1.brep] b
 bcut result b a
 #set length 3176.78
 set length 2302.78
diff --git a/tests/boolean/bcut_2d/C5 b/tests/boolean/bcut_2d/C5
index 8db659bbbc..1aeb337601 100644
--- a/tests/boolean/bcut_2d/C5
+++ b/tests/boolean/bcut_2d/C5
@@ -1,5 +1,5 @@
-restore case_2_shell_r.brep a
-restore case_2_wire2.brep b
+restore [locate_data_file case_2_shell_r.brep] a
+restore [locate_data_file case_2_wire2.brep] b
 bcut result b a
 set length 3176.78
 set nbsh_v 22
diff --git a/tests/boolean/bcut_2d/C6 b/tests/boolean/bcut_2d/C6
index 7734317adb..9a6c9c9d48 100644
--- a/tests/boolean/bcut_2d/C6
+++ b/tests/boolean/bcut_2d/C6
@@ -1,5 +1,5 @@
-restore case_2_shell_r.brep a
-restore case_2_wire3.brep b
+restore [locate_data_file case_2_shell_r.brep] a
+restore [locate_data_file case_2_wire3.brep] b
 bcut result b a
 #set length 3176.78
 set length 2329.96
diff --git a/tests/boolean/bcut_2d/C7 b/tests/boolean/bcut_2d/C7
index 4128cc4329..e4f58d13f5 100644
--- a/tests/boolean/bcut_2d/C7
+++ b/tests/boolean/bcut_2d/C7
@@ -1,5 +1,5 @@
-restore case_2_face_r.brep a
-restore case_2_edge1.brep b
+restore [locate_data_file case_2_face_r.brep] a
+restore [locate_data_file case_2_edge1.brep] b
 bcut result b a
 #set length 2058.17
 set length 1211.16
diff --git a/tests/boolean/bcut_2d/C8 b/tests/boolean/bcut_2d/C8
index 34d8562417..c8ae47480e 100644
--- a/tests/boolean/bcut_2d/C8
+++ b/tests/boolean/bcut_2d/C8
@@ -1,5 +1,5 @@
-restore case_2_face_r.brep a
-restore case_2_edge3.brep b
+restore [locate_data_file case_2_face_r.brep] a
+restore [locate_data_file case_2_edge3.brep] b
 bcut result b a
 #set length 2058.17
 set length 1304.85
diff --git a/tests/boolean/bcut_2d/C9 b/tests/boolean/bcut_2d/C9
index 1cdaf1d0b6..5bc025f81d 100644
--- a/tests/boolean/bcut_2d/C9
+++ b/tests/boolean/bcut_2d/C9
@@ -1,5 +1,5 @@
-restore case_2_face_r.brep a
-restore case_2_wire1.brep b
+restore [locate_data_file case_2_face_r.brep] a
+restore [locate_data_file case_2_wire1.brep] b
 bcut result b a
 #set length 3176.78
 set length 2302.78
diff --git a/tests/boolean/bcut_2d/D1 b/tests/boolean/bcut_2d/D1
index 9206b3e4cb..6287cb23fa 100644
--- a/tests/boolean/bcut_2d/D1
+++ b/tests/boolean/bcut_2d/D1
@@ -1,5 +1,5 @@
-restore case_2_face_r.brep a
-restore case_2_wire3.brep b
+restore [locate_data_file case_2_face_r.brep] a
+restore [locate_data_file case_2_wire3.brep] b
 bcut result b a
 #set length 3176.78
 set length 2329.96
diff --git a/tests/boolean/bcut_2d/D2 b/tests/boolean/bcut_2d/D2
index 3da0a61e1b..6a555d45a4 100644
--- a/tests/boolean/bcut_2d/D2
+++ b/tests/boolean/bcut_2d/D2
@@ -1,5 +1,5 @@
-restore case_3_solid.brep a
-restore case_3_edge1.brep b
+restore [locate_data_file case_3_solid.brep] a
+restore [locate_data_file case_3_edge1.brep] b
 bcut result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcut_2d/D3 b/tests/boolean/bcut_2d/D3
index 8ba08c761f..38b997eb4d 100644
--- a/tests/boolean/bcut_2d/D3
+++ b/tests/boolean/bcut_2d/D3
@@ -1,5 +1,5 @@
-restore case_3_solid.brep a
-restore case_3_edge2.brep b
+restore [locate_data_file case_3_solid.brep] a
+restore [locate_data_file case_3_edge2.brep] b
 bcut result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcut_2d/D4 b/tests/boolean/bcut_2d/D4
index 13d9849a5d..11a748b84c 100644
--- a/tests/boolean/bcut_2d/D4
+++ b/tests/boolean/bcut_2d/D4
@@ -1,5 +1,5 @@
-restore case_3_solid.brep a
-restore case_3_wire1.brep b
+restore [locate_data_file case_3_solid.brep] a
+restore [locate_data_file case_3_wire1.brep] b
 bcut result b a
 set length 103.485
 set nbsh_v 4
diff --git a/tests/boolean/bcut_2d/D5 b/tests/boolean/bcut_2d/D5
index a3d080c715..928855af82 100644
--- a/tests/boolean/bcut_2d/D5
+++ b/tests/boolean/bcut_2d/D5
@@ -1,5 +1,5 @@
-restore case_3_solid.brep a
-restore case_3_wire2.brep b
+restore [locate_data_file case_3_solid.brep] a
+restore [locate_data_file case_3_wire2.brep] b
 bcut result b a
 set length 103.485
 set nbsh_v 4
diff --git a/tests/boolean/bcut_2d/D6 b/tests/boolean/bcut_2d/D6
index 834f36691d..7f3515dcc8 100644
--- a/tests/boolean/bcut_2d/D6
+++ b/tests/boolean/bcut_2d/D6
@@ -1,5 +1,5 @@
-restore case_3_solid.brep a
-restore case_3_wire3.brep b
+restore [locate_data_file case_3_solid.brep] a
+restore [locate_data_file case_3_wire3.brep] b
 bcut result b a
 set length 234.903
 set nbsh_v 4
diff --git a/tests/boolean/bcut_2d/D7 b/tests/boolean/bcut_2d/D7
index 1e43053e97..2d5f1e97e2 100644
--- a/tests/boolean/bcut_2d/D7
+++ b/tests/boolean/bcut_2d/D7
@@ -1,5 +1,5 @@
-restore case_3_solid.brep a
-restore case_3_wire4.brep b
+restore [locate_data_file case_3_solid.brep] a
+restore [locate_data_file case_3_wire4.brep] b
 bcut result b a
 set length 234.903
 set nbsh_v 4
diff --git a/tests/boolean/bcut_2d/D8 b/tests/boolean/bcut_2d/D8
index 2602086bca..f0949e26d6 100644
--- a/tests/boolean/bcut_2d/D8
+++ b/tests/boolean/bcut_2d/D8
@@ -1,5 +1,5 @@
-restore case_3_solid.brep a
-restore case_3_wire5.brep b
+restore [locate_data_file case_3_solid.brep] a
+restore [locate_data_file case_3_wire5.brep] b
 bcut result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcut_2d/D9 b/tests/boolean/bcut_2d/D9
index 4909da9c91..8ee66c2f14 100644
--- a/tests/boolean/bcut_2d/D9
+++ b/tests/boolean/bcut_2d/D9
@@ -1,5 +1,5 @@
-restore case_3_shell.brep a
-restore case_3_edge1.brep b
+restore [locate_data_file case_3_shell.brep] a
+restore [locate_data_file case_3_edge1.brep] b
 bcut result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcut_2d/E1 b/tests/boolean/bcut_2d/E1
index 99aaf3e6dc..0f1ef6e95a 100644
--- a/tests/boolean/bcut_2d/E1
+++ b/tests/boolean/bcut_2d/E1
@@ -1,5 +1,5 @@
-restore case_3_shell.brep a
-restore case_3_edge2.brep b
+restore [locate_data_file case_3_shell.brep] a
+restore [locate_data_file case_3_edge2.brep] b
 bcut result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcut_2d/E2 b/tests/boolean/bcut_2d/E2
index 2da8368c44..a6edb86cdc 100644
--- a/tests/boolean/bcut_2d/E2
+++ b/tests/boolean/bcut_2d/E2
@@ -1,5 +1,5 @@
-restore case_3_shell.brep a
-restore case_3_wire1.brep b
+restore [locate_data_file case_3_shell.brep] a
+restore [locate_data_file case_3_wire1.brep] b
 bcut result b a
 set length 103.485
 set nbsh_v 4
diff --git a/tests/boolean/bcut_2d/E3 b/tests/boolean/bcut_2d/E3
index 2f55e27875..82f0940c97 100644
--- a/tests/boolean/bcut_2d/E3
+++ b/tests/boolean/bcut_2d/E3
@@ -1,5 +1,5 @@
-restore case_3_shell.brep a
-restore case_3_wire2.brep b
+restore [locate_data_file case_3_shell.brep] a
+restore [locate_data_file case_3_wire2.brep] b
 bcut result b a
 set length 103.485
 set nbsh_v 4
diff --git a/tests/boolean/bcut_2d/E4 b/tests/boolean/bcut_2d/E4
index 13c7c10940..af3a6bb61c 100644
--- a/tests/boolean/bcut_2d/E4
+++ b/tests/boolean/bcut_2d/E4
@@ -1,5 +1,5 @@
-restore case_3_shell.brep a
-restore case_3_wire3.brep b
+restore [locate_data_file case_3_shell.brep] a
+restore [locate_data_file case_3_wire3.brep] b
 bcut result b a
 set length 234.903
 set nbsh_v 4
diff --git a/tests/boolean/bcut_2d/E5 b/tests/boolean/bcut_2d/E5
index 48b9f9eeab..d3fdc5d185 100644
--- a/tests/boolean/bcut_2d/E5
+++ b/tests/boolean/bcut_2d/E5
@@ -1,5 +1,5 @@
-restore case_3_shell.brep a
-restore case_3_wire4.brep b
+restore [locate_data_file case_3_shell.brep] a
+restore [locate_data_file case_3_wire4.brep] b
 bcut result b a
 set length 234.903
 set nbsh_v 4
diff --git a/tests/boolean/bcut_2d/E6 b/tests/boolean/bcut_2d/E6
index a8f391f396..baa561673b 100644
--- a/tests/boolean/bcut_2d/E6
+++ b/tests/boolean/bcut_2d/E6
@@ -1,5 +1,5 @@
-restore case_3_shell.brep a
-restore case_3_wire5.brep b
+restore [locate_data_file case_3_shell.brep] a
+restore [locate_data_file case_3_wire5.brep] b
 bcut result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcut_2d/E7 b/tests/boolean/bcut_2d/E7
index 061e3595bd..1852e15219 100644
--- a/tests/boolean/bcut_2d/E7
+++ b/tests/boolean/bcut_2d/E7
@@ -1,5 +1,5 @@
-restore case_3_face.brep a
-restore case_3_edge1.brep b
+restore [locate_data_file case_3_face.brep] a
+restore [locate_data_file case_3_edge1.brep] b
 bcut result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcut_2d/E8 b/tests/boolean/bcut_2d/E8
index c00126056e..fe0e76ec5d 100644
--- a/tests/boolean/bcut_2d/E8
+++ b/tests/boolean/bcut_2d/E8
@@ -1,5 +1,5 @@
-restore case_3_face.brep a
-restore case_3_wire1.brep b
+restore [locate_data_file case_3_face.brep] a
+restore [locate_data_file case_3_wire1.brep] b
 bcut result b a
 set length 103.485
 set nbsh_v 4
diff --git a/tests/boolean/bcut_2d/E9 b/tests/boolean/bcut_2d/E9
index 59ae074fda..0066fa0551 100644
--- a/tests/boolean/bcut_2d/E9
+++ b/tests/boolean/bcut_2d/E9
@@ -1,5 +1,5 @@
-restore case_3_face.brep a
-restore case_3_wire2.brep b
+restore [locate_data_file case_3_face.brep] a
+restore [locate_data_file case_3_wire2.brep] b
 bcut result b a
 set length 103.485
 set nbsh_v 4
diff --git a/tests/boolean/bcut_2d/F1 b/tests/boolean/bcut_2d/F1
index cc17a93e73..627dfa49b4 100644
--- a/tests/boolean/bcut_2d/F1
+++ b/tests/boolean/bcut_2d/F1
@@ -1,5 +1,5 @@
-restore case_3_face.brep a
-restore case_3_wire5.brep b
+restore [locate_data_file case_3_face.brep] a
+restore [locate_data_file case_3_wire5.brep] b
 bcut result b a
 set length 226.366
 set nbsh_v 4
diff --git a/tests/boolean/bcut_2d/F2 b/tests/boolean/bcut_2d/F2
index 94ef41e09c..0bba64f0b9 100644
--- a/tests/boolean/bcut_2d/F2
+++ b/tests/boolean/bcut_2d/F2
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_edge1.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_edge1.brep] b
 bcut result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcut_2d/F3 b/tests/boolean/bcut_2d/F3
index 042a98d16f..a103bf7720 100644
--- a/tests/boolean/bcut_2d/F3
+++ b/tests/boolean/bcut_2d/F3
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_edge1.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_edge1.brep] b
 bcut result a b
 set length 289.851
 set nbsh_v 6
diff --git a/tests/boolean/bcut_2d/F4 b/tests/boolean/bcut_2d/F4
index 118026efa2..763482b5c1 100644
--- a/tests/boolean/bcut_2d/F4
+++ b/tests/boolean/bcut_2d/F4
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_wire1.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_wire1.brep] b
 bcut result b a
 set length 103.485
 set nbsh_v 4
diff --git a/tests/boolean/bcut_2d/F5 b/tests/boolean/bcut_2d/F5
index bccd366635..3689d0cc72 100644
--- a/tests/boolean/bcut_2d/F5
+++ b/tests/boolean/bcut_2d/F5
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_wire1.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_wire1.brep] b
 bcut result a b
 set length 289.851
 set nbsh_v 6
diff --git a/tests/boolean/bcut_2d/F6 b/tests/boolean/bcut_2d/F6
index 596d57d059..e6e1b0ebed 100644
--- a/tests/boolean/bcut_2d/F6
+++ b/tests/boolean/bcut_2d/F6
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_wire2.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_wire2.brep] b
 bcut result b a
 set length 103.485
 set nbsh_v 4
diff --git a/tests/boolean/bcut_2d/F7 b/tests/boolean/bcut_2d/F7
index d57e5fc9bc..028395e6a1 100644
--- a/tests/boolean/bcut_2d/F7
+++ b/tests/boolean/bcut_2d/F7
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_wire2.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_wire2.brep] b
 bcut result a b
 set length 289.851
 set nbsh_v 6
diff --git a/tests/boolean/bcut_2d/F8 b/tests/boolean/bcut_2d/F8
index 1a90d9aad7..f7a25c9358 100644
--- a/tests/boolean/bcut_2d/F8
+++ b/tests/boolean/bcut_2d/F8
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_wire5.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_wire5.brep] b
 bcut result b a
 set length 226.366
 set nbsh_v 4
diff --git a/tests/boolean/bcut_2d/F9 b/tests/boolean/bcut_2d/F9
index 8ad4e83cab..51215be61a 100644
--- a/tests/boolean/bcut_2d/F9
+++ b/tests/boolean/bcut_2d/F9
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_wire5.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_wire5.brep] b
 bcut result a b
 set length 569.46
 set nbsh_v 10
diff --git a/tests/boolean/bcut_2d/G1 b/tests/boolean/bcut_2d/G1
index 1e462d0d4e..389dfd6da9 100644
--- a/tests/boolean/bcut_2d/G1
+++ b/tests/boolean/bcut_2d/G1
@@ -1,5 +1,5 @@
-restore case_4_solid.brep a
-restore case_4_edge1.brep b
+restore [locate_data_file case_4_solid.brep] a
+restore [locate_data_file case_4_edge1.brep] b
 bcut result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcut_2d/G2 b/tests/boolean/bcut_2d/G2
index 4b55fae33b..3e3d24e869 100644
--- a/tests/boolean/bcut_2d/G2
+++ b/tests/boolean/bcut_2d/G2
@@ -1,5 +1,5 @@
-restore case_4_solid.brep a
-restore case_4_edge2.brep b
+restore [locate_data_file case_4_solid.brep] a
+restore [locate_data_file case_4_edge2.brep] b
 bcut result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcut_2d/G3 b/tests/boolean/bcut_2d/G3
index 8e03ee7675..4723f727e3 100644
--- a/tests/boolean/bcut_2d/G3
+++ b/tests/boolean/bcut_2d/G3
@@ -1,5 +1,5 @@
-restore case_4_solid.brep a
-restore case_4_edge3.brep b
+restore [locate_data_file case_4_solid.brep] a
+restore [locate_data_file case_4_edge3.brep] b
 bcut result b a
 set length 589.551
 set nbsh_v 4
diff --git a/tests/boolean/bcut_2d/G4 b/tests/boolean/bcut_2d/G4
index cfbb7c679f..ca5051c57f 100644
--- a/tests/boolean/bcut_2d/G4
+++ b/tests/boolean/bcut_2d/G4
@@ -1,5 +1,5 @@
-restore case_4_solid.brep a
-restore case_4_wire1.brep b
+restore [locate_data_file case_4_solid.brep] a
+restore [locate_data_file case_4_wire1.brep] b
 bcut result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcut_2d/G5 b/tests/boolean/bcut_2d/G5
index 8fab963b0e..4da8d358ac 100644
--- a/tests/boolean/bcut_2d/G5
+++ b/tests/boolean/bcut_2d/G5
@@ -1,5 +1,5 @@
-restore case_4_solid.brep a
-restore case_4_wire2.brep b
+restore [locate_data_file case_4_solid.brep] a
+restore [locate_data_file case_4_wire2.brep] b
 bcut result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcut_2d/G6 b/tests/boolean/bcut_2d/G6
index 9dbc82eed8..bed9cb8364 100644
--- a/tests/boolean/bcut_2d/G6
+++ b/tests/boolean/bcut_2d/G6
@@ -1,5 +1,5 @@
-restore case_4_solid.brep a
-restore case_4_wire3.brep b
+restore [locate_data_file case_4_solid.brep] a
+restore [locate_data_file case_4_wire3.brep] b
 bcut result b a
 set length 1446.99
 set nbsh_v 10
diff --git a/tests/boolean/bcut_2d/G7 b/tests/boolean/bcut_2d/G7
index 04ac609c33..85aefdd9cd 100644
--- a/tests/boolean/bcut_2d/G7
+++ b/tests/boolean/bcut_2d/G7
@@ -1,5 +1,5 @@
-restore case_4_solid.brep a
-restore case_4_wire4.brep b
+restore [locate_data_file case_4_solid.brep] a
+restore [locate_data_file case_4_wire4.brep] b
 bcut result b a
 set length 1446.99
 set nbsh_v 10
diff --git a/tests/boolean/bcut_2d/G8 b/tests/boolean/bcut_2d/G8
index f3f9e16ed6..d453a44798 100644
--- a/tests/boolean/bcut_2d/G8
+++ b/tests/boolean/bcut_2d/G8
@@ -1,5 +1,5 @@
-restore case_4_shell.brep a
-restore case_4_edge1.brep b
+restore [locate_data_file case_4_shell.brep] a
+restore [locate_data_file case_4_edge1.brep] b
 bcut result b a
 set length 616.124
 set nbsh_v 8
diff --git a/tests/boolean/bcut_2d/G9 b/tests/boolean/bcut_2d/G9
index 4f68acc5d9..05b70822b2 100644
--- a/tests/boolean/bcut_2d/G9
+++ b/tests/boolean/bcut_2d/G9
@@ -1,5 +1,5 @@
-restore case_4_shell.brep a
-restore case_4_edge3.brep b
+restore [locate_data_file case_4_shell.brep] a
+restore [locate_data_file case_4_edge3.brep] b
 bcut result b a
 set length 490.752
 set nbsh_v 6
diff --git a/tests/boolean/bcut_2d/H1 b/tests/boolean/bcut_2d/H1
index b6a68f4d5a..c7e1756a64 100644
--- a/tests/boolean/bcut_2d/H1
+++ b/tests/boolean/bcut_2d/H1
@@ -1,5 +1,5 @@
-restore case_4_shell.brep a
-restore case_4_wire1.brep b
+restore [locate_data_file case_4_shell.brep] a
+restore [locate_data_file case_4_wire1.brep] b
 bcut result b a
 set length 1308.66
 set nbsh_v 13
diff --git a/tests/boolean/bcut_2d/H2 b/tests/boolean/bcut_2d/H2
index e9bdbd3ec2..08daf929b1 100644
--- a/tests/boolean/bcut_2d/H2
+++ b/tests/boolean/bcut_2d/H2
@@ -1,5 +1,5 @@
-restore case_4_shell.brep a
-restore case_4_wire3.brep b
+restore [locate_data_file case_4_shell.brep] a
+restore [locate_data_file case_4_wire3.brep] b
 bcut result b a
 set length 929.278
 set nbsh_v 16
diff --git a/tests/boolean/bcut_2d/H3 b/tests/boolean/bcut_2d/H3
index 63e772eb2c..2d7e2bfca9 100644
--- a/tests/boolean/bcut_2d/H3
+++ b/tests/boolean/bcut_2d/H3
@@ -1,5 +1,5 @@
-restore case_4_face.brep a
-restore case_4_edge1.brep b
+restore [locate_data_file case_4_face.brep] a
+restore [locate_data_file case_4_edge1.brep] b
 bcut result b a
 set length 616.124
 set nbsh_v 8
diff --git a/tests/boolean/bcut_2d/H4 b/tests/boolean/bcut_2d/H4
index cc0b88a7e6..f6bdd6b034 100644
--- a/tests/boolean/bcut_2d/H4
+++ b/tests/boolean/bcut_2d/H4
@@ -1,5 +1,5 @@
-restore case_4_face.brep a
-restore case_4_edge3.brep b
+restore [locate_data_file case_4_face.brep] a
+restore [locate_data_file case_4_edge3.brep] b
 bcut result b a
 set length 490.752
 set nbsh_v 6
diff --git a/tests/boolean/bcut_2d/H5 b/tests/boolean/bcut_2d/H5
index 13c6a36b6c..36621ff828 100644
--- a/tests/boolean/bcut_2d/H5
+++ b/tests/boolean/bcut_2d/H5
@@ -1,5 +1,5 @@
-restore case_4_face.brep a
-restore case_4_wire1.brep b
+restore [locate_data_file case_4_face.brep] a
+restore [locate_data_file case_4_wire1.brep] b
 bcut result b a
 set length 1308.66
 set nbsh_v 13
diff --git a/tests/boolean/bcut_2d/H6 b/tests/boolean/bcut_2d/H6
index 3974fedfa0..c971774263 100644
--- a/tests/boolean/bcut_2d/H6
+++ b/tests/boolean/bcut_2d/H6
@@ -1,5 +1,5 @@
-restore case_4_face.brep a
-restore case_4_wire3.brep b
+restore [locate_data_file case_4_face.brep] a
+restore [locate_data_file case_4_wire3.brep] b
 bcut result b a
 set length 929.278
 set nbsh_v 16
diff --git a/tests/boolean/bcut_2d/H7 b/tests/boolean/bcut_2d/H7
index 4c5dc4c30a..8fb8a2886e 100644
--- a/tests/boolean/bcut_2d/H7
+++ b/tests/boolean/bcut_2d/H7
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_edge1.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_edge1.brep] b
 bcut result b a
 set length 344.173
 set nbsh_v 4
diff --git a/tests/boolean/bcut_2d/H8 b/tests/boolean/bcut_2d/H8
index 2ce1e264e5..4068f07b75 100644
--- a/tests/boolean/bcut_2d/H8
+++ b/tests/boolean/bcut_2d/H8
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_edge2.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_edge2.brep] b
 bcut result b a
 set length 344.173
 set nbsh_v 4
diff --git a/tests/boolean/bcut_2d/H9 b/tests/boolean/bcut_2d/H9
index 34860eb9d5..7fa07d1e07 100644
--- a/tests/boolean/bcut_2d/H9
+++ b/tests/boolean/bcut_2d/H9
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_edge3.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_edge3.brep] b
 bcut result b a
 set length 135.758
 set nbsh_v 2
diff --git a/tests/boolean/bcut_2d/I1 b/tests/boolean/bcut_2d/I1
index 58d302dd30..ec361841f2 100644
--- a/tests/boolean/bcut_2d/I1
+++ b/tests/boolean/bcut_2d/I1
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_wire1.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_wire1.brep] b
 bcut result b a
 set length 806.219
 set nbsh_v 7
diff --git a/tests/boolean/bcut_2d/I2 b/tests/boolean/bcut_2d/I2
index ac6a735126..fad9dc7061 100644
--- a/tests/boolean/bcut_2d/I2
+++ b/tests/boolean/bcut_2d/I2
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_wire2.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_wire2.brep] b
 bcut result b a
 set length 806.219
 set nbsh_v 7
diff --git a/tests/boolean/bcut_2d/I3 b/tests/boolean/bcut_2d/I3
index ff95cf2175..9f1e62b285 100644
--- a/tests/boolean/bcut_2d/I3
+++ b/tests/boolean/bcut_2d/I3
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_wire3.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_wire3.brep] b
 bcut result b a
 set length 272.04
 set nbsh_v 3
diff --git a/tests/boolean/bcut_2d/I4 b/tests/boolean/bcut_2d/I4
index 7adbf4b848..0a192eab9c 100644
--- a/tests/boolean/bcut_2d/I4
+++ b/tests/boolean/bcut_2d/I4
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_wire4.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_wire4.brep] b
 bcut result b a
 set length 272.04
 set nbsh_v 3
diff --git a/tests/boolean/bcut_2d/I5 b/tests/boolean/bcut_2d/I5
index 0f9e5b552c..f810709795 100644
--- a/tests/boolean/bcut_2d/I5
+++ b/tests/boolean/bcut_2d/I5
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_wire5.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_wire5.brep] b
 bcut result b a
 set length 2800.52
 set nbsh_v 2
diff --git a/tests/boolean/bcut_2d/I6 b/tests/boolean/bcut_2d/I6
index 1ef23b1235..6b233c02fc 100644
--- a/tests/boolean/bcut_2d/I6
+++ b/tests/boolean/bcut_2d/I6
@@ -1,5 +1,5 @@
-restore case_5_shell.brep a
-restore case_5_edge1.brep b
+restore [locate_data_file case_5_shell.brep] a
+restore [locate_data_file case_5_edge1.brep] b
 bcut result b a
 set length 344.173
 set nbsh_v 4
diff --git a/tests/boolean/bcut_2d/I7 b/tests/boolean/bcut_2d/I7
index f8ae4bf013..38ebb8ce2d 100644
--- a/tests/boolean/bcut_2d/I7
+++ b/tests/boolean/bcut_2d/I7
@@ -1,5 +1,5 @@
-restore case_5_shell.brep a
-restore case_5_edge3.brep b
+restore [locate_data_file case_5_shell.brep] a
+restore [locate_data_file case_5_edge3.brep] b
 bcut result b a
 set length 135.758
 set nbsh_v 2
diff --git a/tests/boolean/bcut_2d/I8 b/tests/boolean/bcut_2d/I8
index 32130ba4bb..86140e316e 100644
--- a/tests/boolean/bcut_2d/I8
+++ b/tests/boolean/bcut_2d/I8
@@ -1,5 +1,5 @@
-restore case_5_shell.brep a
-restore case_5_wire1.brep b
+restore [locate_data_file case_5_shell.brep] a
+restore [locate_data_file case_5_wire1.brep] b
 bcut result b a
 set length 806.219
 set nbsh_v 7
diff --git a/tests/boolean/bcut_2d/I9 b/tests/boolean/bcut_2d/I9
index 1cc87164a9..d5f819b848 100644
--- a/tests/boolean/bcut_2d/I9
+++ b/tests/boolean/bcut_2d/I9
@@ -1,5 +1,5 @@
-restore case_5_shell.brep a
-restore case_5_wire3.brep b
+restore [locate_data_file case_5_shell.brep] a
+restore [locate_data_file case_5_wire3.brep] b
 bcut result b a
 set length 272.04
 set nbsh_v 3
diff --git a/tests/boolean/bcut_2d/J1 b/tests/boolean/bcut_2d/J1
index ce56359eb8..d6b0c327f6 100644
--- a/tests/boolean/bcut_2d/J1
+++ b/tests/boolean/bcut_2d/J1
@@ -1,5 +1,5 @@
-restore case_5_shell.brep a
-restore case_5_wire5.brep b
+restore [locate_data_file case_5_shell.brep] a
+restore [locate_data_file case_5_wire5.brep] b
 bcut result b a
 set length 2800.52
 set nbsh_v 2
diff --git a/tests/boolean/bcut_2d/J2 b/tests/boolean/bcut_2d/J2
index 6f10ee7269..2dbb59fbb0 100644
--- a/tests/boolean/bcut_2d/J2
+++ b/tests/boolean/bcut_2d/J2
@@ -1,5 +1,5 @@
-restore case_5_face.brep a
-restore case_5_edge1.brep b
+restore [locate_data_file case_5_face.brep] a
+restore [locate_data_file case_5_edge1.brep] b
 bcut result b a
 set length 344.173
 set nbsh_v 4
diff --git a/tests/boolean/bcut_2d/J3 b/tests/boolean/bcut_2d/J3
index 8464e5935b..c8395b5f51 100644
--- a/tests/boolean/bcut_2d/J3
+++ b/tests/boolean/bcut_2d/J3
@@ -1,5 +1,5 @@
-restore case_5_face.brep a
-restore case_5_edge3.brep b
+restore [locate_data_file case_5_face.brep] a
+restore [locate_data_file case_5_edge3.brep] b
 bcut result b a
 set length 135.758
 set nbsh_v 2
diff --git a/tests/boolean/bcut_2d/J4 b/tests/boolean/bcut_2d/J4
index 55b69ced19..f10ea9d463 100644
--- a/tests/boolean/bcut_2d/J4
+++ b/tests/boolean/bcut_2d/J4
@@ -1,5 +1,5 @@
-restore case_5_face.brep a
-restore case_5_wire1.brep b
+restore [locate_data_file case_5_face.brep] a
+restore [locate_data_file case_5_wire1.brep] b
 bcut result b a
 set length 806.219
 set nbsh_v 7
diff --git a/tests/boolean/bcut_2d/J5 b/tests/boolean/bcut_2d/J5
index 5a78fdb51b..31872f2777 100644
--- a/tests/boolean/bcut_2d/J5
+++ b/tests/boolean/bcut_2d/J5
@@ -1,5 +1,5 @@
-restore case_5_face.brep a
-restore case_5_wire3.brep b
+restore [locate_data_file case_5_face.brep] a
+restore [locate_data_file case_5_wire3.brep] b
 bcut result b a
 set length 272.04
 set nbsh_v 3
diff --git a/tests/boolean/bcut_2d/J6 b/tests/boolean/bcut_2d/J6
index 970c37eefa..d1b9ab2862 100644
--- a/tests/boolean/bcut_2d/J6
+++ b/tests/boolean/bcut_2d/J6
@@ -1,5 +1,5 @@
-restore case_6_solid.brep a
-restore case_6_edge1.brep b
+restore [locate_data_file case_6_solid.brep] a
+restore [locate_data_file case_6_edge1.brep] b
 bcut result b a
 set length 819.435
 set nbsh_v 8
diff --git a/tests/boolean/bcut_2d/J7 b/tests/boolean/bcut_2d/J7
index cc5451b208..108b9a6dd5 100644
--- a/tests/boolean/bcut_2d/J7
+++ b/tests/boolean/bcut_2d/J7
@@ -1,5 +1,5 @@
-restore case_6_solid.brep a
-restore case_6_edge2.brep b
+restore [locate_data_file case_6_solid.brep] a
+restore [locate_data_file case_6_edge2.brep] b
 bcut result b a
 set length 616.124
 set nbsh_v 8
diff --git a/tests/boolean/bcut_2d/J8 b/tests/boolean/bcut_2d/J8
index 07969cb7e4..67e1945dbd 100644
--- a/tests/boolean/bcut_2d/J8
+++ b/tests/boolean/bcut_2d/J8
@@ -1,5 +1,5 @@
-restore case_6_solid.brep a
-restore case_6_edge3.brep b
+restore [locate_data_file case_6_solid.brep] a
+restore [locate_data_file case_6_edge3.brep] b
 bcut result b a
 set length 729.781
 set nbsh_v 6
diff --git a/tests/boolean/bcut_2d/J9 b/tests/boolean/bcut_2d/J9
index f31e75b44e..8c00037da8 100644
--- a/tests/boolean/bcut_2d/J9
+++ b/tests/boolean/bcut_2d/J9
@@ -1,5 +1,5 @@
-restore case_6_solid.brep a
-restore case_6_wire1.brep b
+restore [locate_data_file case_6_solid.brep] a
+restore [locate_data_file case_6_wire1.brep] b
 bcut result b a
 set length 1738.37
 set nbsh_v 13
diff --git a/tests/boolean/bcut_2d/K1 b/tests/boolean/bcut_2d/K1
index f7fd5b4a0d..915ebb6d6c 100644
--- a/tests/boolean/bcut_2d/K1
+++ b/tests/boolean/bcut_2d/K1
@@ -1,5 +1,5 @@
-restore case_6_solid.brep a
-restore case_6_wire2.brep b
+restore [locate_data_file case_6_solid.brep] a
+restore [locate_data_file case_6_wire2.brep] b
 bcut result b a
 set length 1308.66
 set nbsh_v 13
diff --git a/tests/boolean/bcut_2d/K2 b/tests/boolean/bcut_2d/K2
index 362f70f444..1cc056bab4 100644
--- a/tests/boolean/bcut_2d/K2
+++ b/tests/boolean/bcut_2d/K2
@@ -1,5 +1,5 @@
-restore case_6_solid.brep a
-restore case_6_wire3.brep b
+restore [locate_data_file case_6_solid.brep] a
+restore [locate_data_file case_6_wire3.brep] b
 bcut result b a
 set length 1450.39
 set nbsh_v 17
diff --git a/tests/boolean/bcut_2d/K3 b/tests/boolean/bcut_2d/K3
index 5a3934f09a..49f6a5f087 100644
--- a/tests/boolean/bcut_2d/K3
+++ b/tests/boolean/bcut_2d/K3
@@ -1,5 +1,5 @@
-restore case_6_solid.brep a
-restore case_6_wire4.brep b
+restore [locate_data_file case_6_solid.brep] a
+restore [locate_data_file case_6_wire4.brep] b
 bcut result b a
 set length 929.278
 set nbsh_v 16
diff --git a/tests/boolean/bcut_2d/K4 b/tests/boolean/bcut_2d/K4
index a8961f70dc..a1fe59ba9b 100644
--- a/tests/boolean/bcut_2d/K4
+++ b/tests/boolean/bcut_2d/K4
@@ -1,5 +1,5 @@
-restore case_6_shell.brep a
-restore case_6_edge1.brep b
+restore [locate_data_file case_6_shell.brep] a
+restore [locate_data_file case_6_edge1.brep] b
 bcut result b a
 set length 819.435
 set nbsh_v 8
diff --git a/tests/boolean/bcut_2d/K5 b/tests/boolean/bcut_2d/K5
index 71bcb1e59e..b4b45fb734 100644
--- a/tests/boolean/bcut_2d/K5
+++ b/tests/boolean/bcut_2d/K5
@@ -1,5 +1,5 @@
-restore case_6_shell.brep a
-restore case_6_edge3.brep b
+restore [locate_data_file case_6_shell.brep] a
+restore [locate_data_file case_6_edge3.brep] b
 bcut result b a
 set length 729.781
 set nbsh_v 6
diff --git a/tests/boolean/bcut_2d/K6 b/tests/boolean/bcut_2d/K6
index 12645a72c2..4997f8416e 100644
--- a/tests/boolean/bcut_2d/K6
+++ b/tests/boolean/bcut_2d/K6
@@ -1,5 +1,5 @@
-restore case_6_shell.brep a
-restore case_6_wire1.brep b
+restore [locate_data_file case_6_shell.brep] a
+restore [locate_data_file case_6_wire1.brep] b
 bcut result b a
 set length 1738.37
 set nbsh_v 13
diff --git a/tests/boolean/bcut_2d/K7 b/tests/boolean/bcut_2d/K7
index 4533473b44..39be5782fb 100644
--- a/tests/boolean/bcut_2d/K7
+++ b/tests/boolean/bcut_2d/K7
@@ -1,5 +1,5 @@
-restore case_6_shell.brep a
-restore case_6_wire3.brep b
+restore [locate_data_file case_6_shell.brep] a
+restore [locate_data_file case_6_wire3.brep] b
 bcut result b a
 set length 1450.39
 set nbsh_v 17
diff --git a/tests/boolean/bcut_2d/K8 b/tests/boolean/bcut_2d/K8
index 4fc33834d1..2e7a5d566d 100644
--- a/tests/boolean/bcut_2d/K8
+++ b/tests/boolean/bcut_2d/K8
@@ -1,5 +1,5 @@
-restore case_6_face.brep a
-restore case_6_edge1.brep b
+restore [locate_data_file case_6_face.brep] a
+restore [locate_data_file case_6_edge1.brep] b
 bcut result b a
 set length 819.435
 set nbsh_v 8
diff --git a/tests/boolean/bcut_2d/K9 b/tests/boolean/bcut_2d/K9
index c4f39d5ba6..c8fbbf69fb 100644
--- a/tests/boolean/bcut_2d/K9
+++ b/tests/boolean/bcut_2d/K9
@@ -1,5 +1,5 @@
-restore case_6_face.brep a
-restore case_6_edge3.brep b
+restore [locate_data_file case_6_face.brep] a
+restore [locate_data_file case_6_edge3.brep] b
 bcut result b a
 set length 729.781
 set nbsh_v 6
diff --git a/tests/boolean/bcut_2d/L1 b/tests/boolean/bcut_2d/L1
index afc6aabd88..3bd8b1ba6d 100644
--- a/tests/boolean/bcut_2d/L1
+++ b/tests/boolean/bcut_2d/L1
@@ -1,5 +1,5 @@
-restore case_6_face.brep a
-restore case_6_wire1.brep b
+restore [locate_data_file case_6_face.brep] a
+restore [locate_data_file case_6_wire1.brep] b
 bcut result b a
 set length 1738.37
 set nbsh_v 13
diff --git a/tests/boolean/bcut_2d/L2 b/tests/boolean/bcut_2d/L2
index 99264fc791..7d75e9625a 100644
--- a/tests/boolean/bcut_2d/L2
+++ b/tests/boolean/bcut_2d/L2
@@ -1,5 +1,5 @@
-restore case_6_face.brep a
-restore case_6_wire3.brep b
+restore [locate_data_file case_6_face.brep] a
+restore [locate_data_file case_6_wire3.brep] b
 bcut result b a
 set length 1450.39
 set nbsh_v 17
diff --git a/tests/boolean/bcut_2d/L3 b/tests/boolean/bcut_2d/L3
index 921ec7217a..b4a9a28c08 100644
--- a/tests/boolean/bcut_2d/L3
+++ b/tests/boolean/bcut_2d/L3
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_edge1.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_edge1.brep] b
 bcut result b a
 set length 632.537
 set nbsh_v 8
diff --git a/tests/boolean/bcut_2d/L4 b/tests/boolean/bcut_2d/L4
index 828e1500f8..c3a88a5b6d 100644
--- a/tests/boolean/bcut_2d/L4
+++ b/tests/boolean/bcut_2d/L4
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_edge2.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_edge2.brep] b
 bcut result b a
 set length 632.537
 set nbsh_v 8
diff --git a/tests/boolean/bcut_2d/L5 b/tests/boolean/bcut_2d/L5
index ff32b3ea5c..6422caf564 100644
--- a/tests/boolean/bcut_2d/L5
+++ b/tests/boolean/bcut_2d/L5
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_edge3.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_edge3.brep] b
 bcut result b a
 set length 710.965
 set nbsh_v 8
diff --git a/tests/boolean/bcut_2d/L6 b/tests/boolean/bcut_2d/L6
index b33b61d318..f72c86f6d5 100644
--- a/tests/boolean/bcut_2d/L6
+++ b/tests/boolean/bcut_2d/L6
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_edge4.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_edge4.brep] b
 bcut result b a
 set length 710.965
 set nbsh_v 8
diff --git a/tests/boolean/bcut_2d/L7 b/tests/boolean/bcut_2d/L7
index f4fa43376b..b478225f44 100644
--- a/tests/boolean/bcut_2d/L7
+++ b/tests/boolean/bcut_2d/L7
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_wire1.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_wire1.brep] b
 bcut result b a
 set length 2498.39
 set nbsh_v 10
diff --git a/tests/boolean/bcut_2d/L8 b/tests/boolean/bcut_2d/L8
index 0c94ca4c3d..cfc8590c36 100644
--- a/tests/boolean/bcut_2d/L8
+++ b/tests/boolean/bcut_2d/L8
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_wire2.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_wire2.brep] b
 bcut result b a
 set length 2498.39
 set nbsh_v 10
diff --git a/tests/boolean/bcut_2d/L9 b/tests/boolean/bcut_2d/L9
index 032ee69a5b..dca6cf8d62 100644
--- a/tests/boolean/bcut_2d/L9
+++ b/tests/boolean/bcut_2d/L9
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_wire3.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_wire3.brep] b
 bcut result b a
 set length 2033.56
 set nbsh_v 9
diff --git a/tests/boolean/bcut_2d/M1 b/tests/boolean/bcut_2d/M1
index 7a5c5e28c2..19e4225ed5 100644
--- a/tests/boolean/bcut_2d/M1
+++ b/tests/boolean/bcut_2d/M1
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_wire4.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_wire4.brep] b
 bcut result b a
 set length 2033.56
 set nbsh_v 9
diff --git a/tests/boolean/bcut_2d/M2 b/tests/boolean/bcut_2d/M2
index bfd0919ce7..9dc04a4e77 100644
--- a/tests/boolean/bcut_2d/M2
+++ b/tests/boolean/bcut_2d/M2
@@ -1,5 +1,5 @@
-restore case_7_shell.brep a
-restore case_7_edge1.brep b
+restore [locate_data_file case_7_shell.brep] a
+restore [locate_data_file case_7_edge1.brep] b
 bcut result b a
 set length 632.537
 set nbsh_v 8
diff --git a/tests/boolean/bcut_2d/M3 b/tests/boolean/bcut_2d/M3
index 64eaf77764..f067614cd5 100644
--- a/tests/boolean/bcut_2d/M3
+++ b/tests/boolean/bcut_2d/M3
@@ -1,5 +1,5 @@
-restore case_7_shell.brep a
-restore case_7_edge3.brep b
+restore [locate_data_file case_7_shell.brep] a
+restore [locate_data_file case_7_edge3.brep] b
 bcut result b a
 set length 710.965
 set nbsh_v 8
diff --git a/tests/boolean/bcut_2d/M4 b/tests/boolean/bcut_2d/M4
index ffc5495d72..d80c996913 100644
--- a/tests/boolean/bcut_2d/M4
+++ b/tests/boolean/bcut_2d/M4
@@ -1,5 +1,5 @@
-restore case_7_shell.brep a
-restore case_7_wire1.brep b
+restore [locate_data_file case_7_shell.brep] a
+restore [locate_data_file case_7_wire1.brep] b
 bcut result b a
 set length 2498.39
 set nbsh_v 10
diff --git a/tests/boolean/bcut_2d/M5 b/tests/boolean/bcut_2d/M5
index 13ba2a49ef..3b30f29871 100644
--- a/tests/boolean/bcut_2d/M5
+++ b/tests/boolean/bcut_2d/M5
@@ -1,5 +1,5 @@
-restore case_7_shell.brep a
-restore case_7_wire3.brep b
+restore [locate_data_file case_7_shell.brep] a
+restore [locate_data_file case_7_wire3.brep] b
 bcut result b a
 set length 2033.56
 set nbsh_v 9
diff --git a/tests/boolean/bcut_2d/M6 b/tests/boolean/bcut_2d/M6
index afe910a8f9..c19ca32f47 100644
--- a/tests/boolean/bcut_2d/M6
+++ b/tests/boolean/bcut_2d/M6
@@ -1,5 +1,5 @@
-restore case_7_face.brep a
-restore case_7_edge1.brep b
+restore [locate_data_file case_7_face.brep] a
+restore [locate_data_file case_7_edge1.brep] b
 bcut result b a
 set length 632.537
 set nbsh_v 8
diff --git a/tests/boolean/bcut_2d/M7 b/tests/boolean/bcut_2d/M7
index e0bac0b59b..521fda7264 100644
--- a/tests/boolean/bcut_2d/M7
+++ b/tests/boolean/bcut_2d/M7
@@ -1,5 +1,5 @@
-restore case_7_face.brep a
-restore case_7_edge3.brep b
+restore [locate_data_file case_7_face.brep] a
+restore [locate_data_file case_7_edge3.brep] b
 bcut result b a
 set length 710.965
 set nbsh_v 8
diff --git a/tests/boolean/bcut_2d/M8 b/tests/boolean/bcut_2d/M8
index ca70a132ec..4b1b77dea3 100644
--- a/tests/boolean/bcut_2d/M8
+++ b/tests/boolean/bcut_2d/M8
@@ -1,5 +1,5 @@
-restore case_7_face.brep a
-restore case_7_wire1.brep b
+restore [locate_data_file case_7_face.brep] a
+restore [locate_data_file case_7_wire1.brep] b
 bcut result b a
 set length 2498.39
 set nbsh_v 10
diff --git a/tests/boolean/bcut_2d/M9 b/tests/boolean/bcut_2d/M9
index eb2a41d077..1ab872a6ff 100644
--- a/tests/boolean/bcut_2d/M9
+++ b/tests/boolean/bcut_2d/M9
@@ -1,5 +1,5 @@
-restore case_7_face.brep a
-restore case_7_wire3.brep b
+restore [locate_data_file case_7_face.brep] a
+restore [locate_data_file case_7_wire3.brep] b
 bcut result b a
 set length 2033.56
 set nbsh_v 9
diff --git a/tests/boolean/bcut_2d/N1 b/tests/boolean/bcut_2d/N1
index f50e417998..ccbcd044e2 100644
--- a/tests/boolean/bcut_2d/N1
+++ b/tests/boolean/bcut_2d/N1
@@ -1,5 +1,5 @@
-restore case_8_solid_repaired.brep a
-restore case_8_wire1.brep b
+restore [locate_data_file case_8_solid_repaired.brep] a
+restore [locate_data_file case_8_wire1.brep] b
 bcut result b a
 set length 393.479
 set nbsh_v 5
diff --git a/tests/boolean/bcut_2d/N2 b/tests/boolean/bcut_2d/N2
index a13caeb133..8672f5ac12 100644
--- a/tests/boolean/bcut_2d/N2
+++ b/tests/boolean/bcut_2d/N2
@@ -1,5 +1,5 @@
-restore case_8_solid_repaired.brep a
-restore case_8_wire2.brep b
+restore [locate_data_file case_8_solid_repaired.brep] a
+restore [locate_data_file case_8_wire2.brep] b
 bcut result b a
 set length 472.684
 set nbsh_v 8
diff --git a/tests/boolean/bcut_2d/N3 b/tests/boolean/bcut_2d/N3
index c91650f97c..8795ebcdba 100644
--- a/tests/boolean/bcut_2d/N3
+++ b/tests/boolean/bcut_2d/N3
@@ -1,5 +1,5 @@
-restore case_8_solid_repaired.brep a
-restore case_8_wire4.brep b
+restore [locate_data_file case_8_solid_repaired.brep] a
+restore [locate_data_file case_8_wire4.brep] b
 bcut result b a
 set length 517.136
 set nbsh_v 9
diff --git a/tests/boolean/bcut_2d/N4 b/tests/boolean/bcut_2d/N4
index 4924b1d478..a27c2b127b 100644
--- a/tests/boolean/bcut_2d/N4
+++ b/tests/boolean/bcut_2d/N4
@@ -1,5 +1,5 @@
-restore case_8_solid_repaired.brep a
-restore case_8_wire5.brep b
+restore [locate_data_file case_8_solid_repaired.brep] a
+restore [locate_data_file case_8_wire5.brep] b
 bcut result b a
 set length 1349.4
 set nbsh_v 9
diff --git a/tests/boolean/bcut_2d/N5 b/tests/boolean/bcut_2d/N5
index b8f37fafd9..d505635fa5 100644
--- a/tests/boolean/bcut_2d/N5
+++ b/tests/boolean/bcut_2d/N5
@@ -1,5 +1,5 @@
-restore case_8_solid_repaired.brep a
-restore case_8_wire6.brep b
+restore [locate_data_file case_8_solid_repaired.brep] a
+restore [locate_data_file case_8_wire6.brep] b
 bcut result b a
 set length 1476.21
 set nbsh_v 8
diff --git a/tests/boolean/bcut_2d/N6 b/tests/boolean/bcut_2d/N6
index d13dac2ea3..137408bd22 100644
--- a/tests/boolean/bcut_2d/N6
+++ b/tests/boolean/bcut_2d/N6
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge1.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge1.brep] b
 bcut result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcut_2d/N7 b/tests/boolean/bcut_2d/N7
index a7aecdb085..d018496593 100644
--- a/tests/boolean/bcut_2d/N7
+++ b/tests/boolean/bcut_2d/N7
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge1.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge1.brep] b
 bcut result a b
 set length 902.162
 set nbsh_v 5
diff --git a/tests/boolean/bcut_2d/N8 b/tests/boolean/bcut_2d/N8
index d11960f137..d62ee650f7 100644
--- a/tests/boolean/bcut_2d/N8
+++ b/tests/boolean/bcut_2d/N8
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge2.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge2.brep] b
 bcut result b a
 set length 111.749
 set nbsh_v 2
diff --git a/tests/boolean/bcut_2d/N9 b/tests/boolean/bcut_2d/N9
index 05ece90ac9..3f797f2e47 100644
--- a/tests/boolean/bcut_2d/N9
+++ b/tests/boolean/bcut_2d/N9
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge2.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge2.brep] b
 bcut result a b
 set length 1045.95
 set nbsh_v 5
diff --git a/tests/boolean/bcut_2d/O1 b/tests/boolean/bcut_2d/O1
index ca97c99ad0..2602737237 100644
--- a/tests/boolean/bcut_2d/O1
+++ b/tests/boolean/bcut_2d/O1
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge3.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge3.brep] b
 bcut result b a
 set length 206.213
 set nbsh_v 4
diff --git a/tests/boolean/bcut_2d/O2 b/tests/boolean/bcut_2d/O2
index 30874a57cd..f87888a4ad 100644
--- a/tests/boolean/bcut_2d/O2
+++ b/tests/boolean/bcut_2d/O2
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge3.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge3.brep] b
 bcut result a b
 set length 902.162
 set nbsh_v 5
diff --git a/tests/boolean/bcut_2d/O3 b/tests/boolean/bcut_2d/O3
index 6642484d22..9532a766bf 100644
--- a/tests/boolean/bcut_2d/O3
+++ b/tests/boolean/bcut_2d/O3
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge4.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge4.brep] b
 bcut result b a
 set length 81.6175
 set nbsh_v 2
diff --git a/tests/boolean/bcut_2d/O4 b/tests/boolean/bcut_2d/O4
index 0ed2214a26..40e3494bd0 100644
--- a/tests/boolean/bcut_2d/O4
+++ b/tests/boolean/bcut_2d/O4
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge4.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge4.brep] b
 bcut result a b
 set length 1045.95
 set nbsh_v 6
diff --git a/tests/boolean/bcut_2d/O5 b/tests/boolean/bcut_2d/O5
index d503d11d96..57acd25a96 100644
--- a/tests/boolean/bcut_2d/O5
+++ b/tests/boolean/bcut_2d/O5
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge5.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge5.brep] b
 bcut result b a
 set length 270.1
 set nbsh_v 2
diff --git a/tests/boolean/bcut_2d/O6 b/tests/boolean/bcut_2d/O6
index 90993744a8..32578036ff 100644
--- a/tests/boolean/bcut_2d/O6
+++ b/tests/boolean/bcut_2d/O6
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge5.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge5.brep] b
 bcut result a b
 set length 966.049
 set nbsh_v 6
diff --git a/tests/boolean/bcut_2d/O7 b/tests/boolean/bcut_2d/O7
index 09d767480f..a7acc8c19e 100644
--- a/tests/boolean/bcut_2d/O7
+++ b/tests/boolean/bcut_2d/O7
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_wire1.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_wire1.brep] b
 bcut result b a
 set length 763.834
 set nbsh_v 5
diff --git a/tests/boolean/bcut_2d/O8 b/tests/boolean/bcut_2d/O8
index b9560ff3e5..c391c7ae4c 100644
--- a/tests/boolean/bcut_2d/O8
+++ b/tests/boolean/bcut_2d/O8
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_wire1.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_wire1.brep] b
 bcut result a b
 set length 902.162
 set nbsh_v 5
diff --git a/tests/boolean/bcut_2d/O9 b/tests/boolean/bcut_2d/O9
index b822c1908d..54e2dbe910 100644
--- a/tests/boolean/bcut_2d/O9
+++ b/tests/boolean/bcut_2d/O9
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_wire2.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_wire2.brep] b
 bcut result b a
 set length 936.857
 set nbsh_v 7
diff --git a/tests/boolean/bcut_2d/P1 b/tests/boolean/bcut_2d/P1
index b9bf61bdde..fe2ecb2bde 100644
--- a/tests/boolean/bcut_2d/P1
+++ b/tests/boolean/bcut_2d/P1
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_wire2.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_wire2.brep] b
 bcut result a b
 set length 902.162
 set nbsh_v 5
diff --git a/tests/boolean/bcut_2d/P2 b/tests/boolean/bcut_2d/P2
index f6c0941b22..d3980b71ad 100644
--- a/tests/boolean/bcut_2d/P2
+++ b/tests/boolean/bcut_2d/P2
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_wire3.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_wire3.brep] b
 bcut result b a
 set length 1000.74
 set nbsh_v 6
diff --git a/tests/boolean/bcut_2d/P3 b/tests/boolean/bcut_2d/P3
index 92449c346f..c743481648 100644
--- a/tests/boolean/bcut_2d/P3
+++ b/tests/boolean/bcut_2d/P3
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_wire3.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_wire3.brep] b
 bcut result a b
 set length 966.049
 set nbsh_v 6
diff --git a/tests/boolean/bcut_2d/P4 b/tests/boolean/bcut_2d/P4
index 6bfc75243a..5cb6a94dbc 100644
--- a/tests/boolean/bcut_2d/P4
+++ b/tests/boolean/bcut_2d/P4
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge1.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge1.brep] b
 bcut result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcut_2d/P5 b/tests/boolean/bcut_2d/P5
index 3bff338030..0e3d0d4284 100644
--- a/tests/boolean/bcut_2d/P5
+++ b/tests/boolean/bcut_2d/P5
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge1.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge1.brep] b
 bcut result a b
 set length 469.89
 set nbsh_v 4
diff --git a/tests/boolean/bcut_2d/P6 b/tests/boolean/bcut_2d/P6
index 7fcb580a3b..20048b99d6 100644
--- a/tests/boolean/bcut_2d/P6
+++ b/tests/boolean/bcut_2d/P6
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge2.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge2.brep] b
 bcut result b a
 set length 111.749
 set nbsh_v 2
diff --git a/tests/boolean/bcut_2d/P7 b/tests/boolean/bcut_2d/P7
index 419df115f5..4be31a4d9e 100644
--- a/tests/boolean/bcut_2d/P7
+++ b/tests/boolean/bcut_2d/P7
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge2.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge2.brep] b
 bcut result a b
 set length 613.678
 set nbsh_v 3
diff --git a/tests/boolean/bcut_2d/P8 b/tests/boolean/bcut_2d/P8
index fbdf6b48f5..623bbbcce8 100644
--- a/tests/boolean/bcut_2d/P8
+++ b/tests/boolean/bcut_2d/P8
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge3.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge3.brep] b
 bcut result b a
 set length 350
 set nbsh_v 3
diff --git a/tests/boolean/bcut_2d/P9 b/tests/boolean/bcut_2d/P9
index 74f91e6c18..1a5ebc61f6 100644
--- a/tests/boolean/bcut_2d/P9
+++ b/tests/boolean/bcut_2d/P9
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge3.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge3.brep] b
 bcut result a b
 set length 613.678
 set nbsh_v 3
diff --git a/tests/boolean/bcut_2d/Q1 b/tests/boolean/bcut_2d/Q1
index 186f6845b9..87e573b89c 100644
--- a/tests/boolean/bcut_2d/Q1
+++ b/tests/boolean/bcut_2d/Q1
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge4.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge4.brep] b
 bcut result b a
 set length 81.6175
 set nbsh_v 2
diff --git a/tests/boolean/bcut_2d/Q2 b/tests/boolean/bcut_2d/Q2
index 8dc1fe039e..2764e5fc35 100644
--- a/tests/boolean/bcut_2d/Q2
+++ b/tests/boolean/bcut_2d/Q2
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge4.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge4.brep] b
 bcut result a b
 set length 613.678
 set nbsh_v 3
diff --git a/tests/boolean/bcut_2d/Q3 b/tests/boolean/bcut_2d/Q3
index 98556be5ca..29d76f19e5 100644
--- a/tests/boolean/bcut_2d/Q3
+++ b/tests/boolean/bcut_2d/Q3
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge5.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge5.brep] b
 bcut result b a
 set length 350
 set nbsh_v 2
diff --git a/tests/boolean/bcut_2d/Q4 b/tests/boolean/bcut_2d/Q4
index 7a05b57ae2..2a2280e93c 100644
--- a/tests/boolean/bcut_2d/Q4
+++ b/tests/boolean/bcut_2d/Q4
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge5.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge5.brep] b
 bcut result a b
 set length 613.678
 set nbsh_v 3
diff --git a/tests/boolean/bcut_2d/Q5 b/tests/boolean/bcut_2d/Q5
index 0e9ef18d60..138c1f1b58 100644
--- a/tests/boolean/bcut_2d/Q5
+++ b/tests/boolean/bcut_2d/Q5
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_wire1.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_wire1.brep] b
 bcut result b a
 set length 763.834
 set nbsh_v 5
diff --git a/tests/boolean/bcut_2d/Q6 b/tests/boolean/bcut_2d/Q6
index cdd2bac41d..a0ab283271 100644
--- a/tests/boolean/bcut_2d/Q6
+++ b/tests/boolean/bcut_2d/Q6
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_wire1.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_wire1.brep] b
 bcut result a b
 set length 469.89
 set nbsh_v 4
diff --git a/tests/boolean/bcut_2d/Q7 b/tests/boolean/bcut_2d/Q7
index 064d91a1a9..690f5b1861 100644
--- a/tests/boolean/bcut_2d/Q7
+++ b/tests/boolean/bcut_2d/Q7
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_wire2.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_wire2.brep] b
 bcut result b a
 set length 1080.64
 set nbsh_v 6
diff --git a/tests/boolean/bcut_2d/Q8 b/tests/boolean/bcut_2d/Q8
index 56729c4a1f..0ab7868125 100644
--- a/tests/boolean/bcut_2d/Q8
+++ b/tests/boolean/bcut_2d/Q8
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_wire2.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_wire2.brep] b
 bcut result a b
 set length 613.678
 set nbsh_v 3
diff --git a/tests/boolean/bcut_2d/Q9 b/tests/boolean/bcut_2d/Q9
index f63d7dfa34..49490e48dd 100644
--- a/tests/boolean/bcut_2d/Q9
+++ b/tests/boolean/bcut_2d/Q9
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_wire3.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_wire3.brep] b
 bcut result b a
 set length 1080.64
 set nbsh_v 5
diff --git a/tests/boolean/bcut_2d/R1 b/tests/boolean/bcut_2d/R1
index 6d68eff168..db621e98f1 100644
--- a/tests/boolean/bcut_2d/R1
+++ b/tests/boolean/bcut_2d/R1
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_wire3.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_wire3.brep] b
 bcut result a b
 set length 613.678
 set nbsh_v 3
diff --git a/tests/boolean/bcut_2d/R2 b/tests/boolean/bcut_2d/R2
index 3bb1c7ec52..3741205142 100644
--- a/tests/boolean/bcut_2d/R2
+++ b/tests/boolean/bcut_2d/R2
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge1.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge1.brep] b
 bcut result b a
 set length empty
 set nbsh_v 0
diff --git a/tests/boolean/bcut_2d/R3 b/tests/boolean/bcut_2d/R3
index 8509e45c64..44c193f3c8 100644
--- a/tests/boolean/bcut_2d/R3
+++ b/tests/boolean/bcut_2d/R3
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge1.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge1.brep] b
 bcut result a b
 set length 469.89
 set nbsh_v 4
diff --git a/tests/boolean/bcut_2d/R4 b/tests/boolean/bcut_2d/R4
index 958d1a9f44..b1cf1556e2 100644
--- a/tests/boolean/bcut_2d/R4
+++ b/tests/boolean/bcut_2d/R4
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge2.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge2.brep] b
 bcut result b a
 set length 111.749
 set nbsh_v 2
diff --git a/tests/boolean/bcut_2d/R5 b/tests/boolean/bcut_2d/R5
index f2f57ad836..65c5c531f0 100644
--- a/tests/boolean/bcut_2d/R5
+++ b/tests/boolean/bcut_2d/R5
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge2.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge2.brep] b
 bcut result a b
 set length 613.678
 set nbsh_v 3
diff --git a/tests/boolean/bcut_2d/R6 b/tests/boolean/bcut_2d/R6
index 8cbdb4e08b..75e01f2094 100644
--- a/tests/boolean/bcut_2d/R6
+++ b/tests/boolean/bcut_2d/R6
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge3.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge3.brep] b
 bcut result b a
 set length 350
 set nbsh_v 3
diff --git a/tests/boolean/bcut_2d/R7 b/tests/boolean/bcut_2d/R7
index 75992d32ab..d492ae66da 100644
--- a/tests/boolean/bcut_2d/R7
+++ b/tests/boolean/bcut_2d/R7
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge3.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge3.brep] b
 bcut result a b
 set length 613.678
 set nbsh_v 3
diff --git a/tests/boolean/bcut_2d/R8 b/tests/boolean/bcut_2d/R8
index 641dddebc5..3e3efbc2c8 100644
--- a/tests/boolean/bcut_2d/R8
+++ b/tests/boolean/bcut_2d/R8
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge4.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge4.brep] b
 bcut result b a
 set length 81.6175
 set nbsh_v 2
diff --git a/tests/boolean/bcut_2d/R9 b/tests/boolean/bcut_2d/R9
index c4c6b4577d..2dc23609fe 100644
--- a/tests/boolean/bcut_2d/R9
+++ b/tests/boolean/bcut_2d/R9
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge4.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge4.brep] b
 bcut result a b
 set length 613.678
 set nbsh_v 3
diff --git a/tests/boolean/bcut_2d/S1 b/tests/boolean/bcut_2d/S1
index 5561c21315..a857b9545f 100644
--- a/tests/boolean/bcut_2d/S1
+++ b/tests/boolean/bcut_2d/S1
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge5.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge5.brep] b
 bcut result b a
 set length 350
 set nbsh_v 2
diff --git a/tests/boolean/bcut_2d/S2 b/tests/boolean/bcut_2d/S2
index 3e750170b0..23fbd3c484 100644
--- a/tests/boolean/bcut_2d/S2
+++ b/tests/boolean/bcut_2d/S2
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge5.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge5.brep] b
 bcut result a b
 set length 613.678
 set nbsh_v 3
diff --git a/tests/boolean/bcut_2d/S3 b/tests/boolean/bcut_2d/S3
index e172b654be..7c423f3034 100644
--- a/tests/boolean/bcut_2d/S3
+++ b/tests/boolean/bcut_2d/S3
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_wire1.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_wire1.brep] b
 bcut result b a
 set length 763.834
 set nbsh_v 5
diff --git a/tests/boolean/bcut_2d/S4 b/tests/boolean/bcut_2d/S4
index 33f05ac22d..a0a5e70b5b 100644
--- a/tests/boolean/bcut_2d/S4
+++ b/tests/boolean/bcut_2d/S4
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_wire1.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_wire1.brep] b
 bcut result a b
 set length 469.89
 set nbsh_v 4
diff --git a/tests/boolean/bcut_2d/S5 b/tests/boolean/bcut_2d/S5
index ba8a15904f..1a93bde709 100644
--- a/tests/boolean/bcut_2d/S5
+++ b/tests/boolean/bcut_2d/S5
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_wire2.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_wire2.brep] b
 bcut result b a
 set length 1080.64
 set nbsh_v 6
diff --git a/tests/boolean/bcut_2d/S6 b/tests/boolean/bcut_2d/S6
index fa8a3754b2..808ad2d149 100644
--- a/tests/boolean/bcut_2d/S6
+++ b/tests/boolean/bcut_2d/S6
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_wire2.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_wire2.brep] b
 bcut result a b
 set length 613.678
 set nbsh_v 3
diff --git a/tests/boolean/bcut_2d/S7 b/tests/boolean/bcut_2d/S7
index 4938b606c3..058cdba42d 100644
--- a/tests/boolean/bcut_2d/S7
+++ b/tests/boolean/bcut_2d/S7
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_wire3.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_wire3.brep] b
 bcut result b a
 set length 1080.64
 set nbsh_v 5
diff --git a/tests/boolean/bcut_2d/S8 b/tests/boolean/bcut_2d/S8
index 89ff9f9ce6..b929d75b03 100644
--- a/tests/boolean/bcut_2d/S8
+++ b/tests/boolean/bcut_2d/S8
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_wire3.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_wire3.brep] b
 bcut result a b
 set length 613.678
 set nbsh_v 3
diff --git a/tests/boolean/bcut_complex/A1 b/tests/boolean/bcut_complex/A1
old mode 100755
new mode 100644
index 91d339b3a1..850b8e785b
--- a/tests/boolean/bcut_complex/A1
+++ b/tests/boolean/bcut_complex/A1
@@ -1,6 +1,6 @@
-restore cts20355a.rle a
-restore cts20355b.rle b
-restore cts20355c.rle c
+restore [locate_data_file cts20355a.rle] a
+restore [locate_data_file cts20355b.rle] b
+restore [locate_data_file cts20355c.rle] c
 
 bcut rab a b
 
diff --git a/tests/boolean/bcut_complex/A2 b/tests/boolean/bcut_complex/A2
index d20ffebae2..0a3b9e80f2 100644
--- a/tests/boolean/bcut_complex/A2
+++ b/tests/boolean/bcut_complex/A2
@@ -1,5 +1,5 @@
-restore cts21302a.rle a
-restore cts21302b.rle b
+restore [locate_data_file cts21302a.rle] a
+restore [locate_data_file cts21302b.rle] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/A3 b/tests/boolean/bcut_complex/A3
index 9efcd30a18..cb7c762f44 100644
--- a/tests/boolean/bcut_complex/A3
+++ b/tests/boolean/bcut_complex/A3
@@ -1,5 +1,5 @@
-restore f2 b1
-restore f6 b2
+restore [locate_data_file f2] b1
+restore [locate_data_file f6] b2
 
 bcut result b1 b2
 
diff --git a/tests/boolean/bcut_complex/A4 b/tests/boolean/bcut_complex/A4
index 3c3fe78b6d..e1a7320ae2 100644
--- a/tests/boolean/bcut_complex/A4
+++ b/tests/boolean/bcut_complex/A4
@@ -1,5 +1,5 @@
-restore f2 b1
-restore f6 b2
+restore [locate_data_file f2] b1
+restore [locate_data_file f6] b2
 
 bcut result b2 b1
 
diff --git a/tests/boolean/bcut_complex/A5 b/tests/boolean/bcut_complex/A5
index d8d620c8f9..8aabc554ba 100644
--- a/tests/boolean/bcut_complex/A5
+++ b/tests/boolean/bcut_complex/A5
@@ -1,5 +1,5 @@
-restore f7 b1
-restore f3 b2
+restore [locate_data_file f7] b1
+restore [locate_data_file f3] b2
 
 bcut result b1 b2
 
diff --git a/tests/boolean/bcut_complex/A6 b/tests/boolean/bcut_complex/A6
index bd4afb8f63..61d2bafa12 100644
--- a/tests/boolean/bcut_complex/A6
+++ b/tests/boolean/bcut_complex/A6
@@ -1,5 +1,5 @@
-restore f7 b1
-restore f3 b2
+restore [locate_data_file f7] b1
+restore [locate_data_file f3] b2
 
 bcut result b2 b1
 
diff --git a/tests/boolean/bcut_complex/A7 b/tests/boolean/bcut_complex/A7
index c0f745777a..b6ef9f02ba 100644
--- a/tests/boolean/bcut_complex/A7
+++ b/tests/boolean/bcut_complex/A7
@@ -1,5 +1,5 @@
-restore f2 b1
-restore f5 b2
+restore [locate_data_file f2] b1
+restore [locate_data_file f5] b2
 
 bcut result b1 b2
 
diff --git a/tests/boolean/bcut_complex/A8 b/tests/boolean/bcut_complex/A8
index 77ae9f2c4f..23b1fa110d 100644
--- a/tests/boolean/bcut_complex/A8
+++ b/tests/boolean/bcut_complex/A8
@@ -1,5 +1,5 @@
-restore f2 b1
-restore f5 b2
+restore [locate_data_file f2] b1
+restore [locate_data_file f5] b2
 
 bcut result b2 b1
 
diff --git a/tests/boolean/bcut_complex/A9 b/tests/boolean/bcut_complex/A9
index 2e6b2818e1..41efd4f230 100644
--- a/tests/boolean/bcut_complex/A9
+++ b/tests/boolean/bcut_complex/A9
@@ -1,5 +1,5 @@
-restore f4 b1
-restore f5 b2
+restore [locate_data_file f4] b1
+restore [locate_data_file f5] b2
 
 bcut result b1 b2
 
diff --git a/tests/boolean/bcut_complex/B1 b/tests/boolean/bcut_complex/B1
index a313233972..5def7fa14d 100644
--- a/tests/boolean/bcut_complex/B1
+++ b/tests/boolean/bcut_complex/B1
@@ -1,7 +1,7 @@
 puts "TODO #22911 ALL: Error : The bcut is not valid. The square is 0"
 
-restore f4 b1
-restore f5 b2
+restore [locate_data_file f4] b1
+restore [locate_data_file f5] b2
 
 bcut result b2 b1
 
diff --git a/tests/boolean/bcut_complex/B2 b/tests/boolean/bcut_complex/B2
index 53eab7e1cc..18a9a5c6e1 100644
--- a/tests/boolean/bcut_complex/B2
+++ b/tests/boolean/bcut_complex/B2
@@ -1,5 +1,5 @@
-restore f1 b1
-restore f5 b2
+restore [locate_data_file f1] b1
+restore [locate_data_file f5] b2
 
 bcut result b1 b2
 
diff --git a/tests/boolean/bcut_complex/B3 b/tests/boolean/bcut_complex/B3
index 63abd89c49..7dcbc51766 100644
--- a/tests/boolean/bcut_complex/B3
+++ b/tests/boolean/bcut_complex/B3
@@ -1,7 +1,7 @@
 puts "TODO #22911 ALL: Error : The bcut is not valid. The square is 0"
 
-restore f1 b1
-restore f5 b2
+restore [locate_data_file f1] b1
+restore [locate_data_file f5] b2
 
 bcut result b2 b1
 
diff --git a/tests/boolean/bcut_complex/B4 b/tests/boolean/bcut_complex/B4
index 7e0b9d9849..dff9a0f78a 100644
--- a/tests/boolean/bcut_complex/B4
+++ b/tests/boolean/bcut_complex/B4
@@ -1,5 +1,5 @@
-restore f1 b1
-restore f4 b2
+restore [locate_data_file f1] b1
+restore [locate_data_file f4] b2
 
 bcut result b1 b2
 
diff --git a/tests/boolean/bcut_complex/B5 b/tests/boolean/bcut_complex/B5
index 041e25909a..10132b12b4 100644
--- a/tests/boolean/bcut_complex/B5
+++ b/tests/boolean/bcut_complex/B5
@@ -1,7 +1,7 @@
 puts "TODO #22911 ALL: Error : The bcut is not valid. The square is 0"
 
-restore f1 b1
-restore f4 b2
+restore [locate_data_file f1] b1
+restore [locate_data_file f4] b2
 
 bcut result b2 b1
 
diff --git a/tests/boolean/bcut_complex/B6 b/tests/boolean/bcut_complex/B6
index b14bae789c..fb3a3ab425 100644
--- a/tests/boolean/bcut_complex/B6
+++ b/tests/boolean/bcut_complex/B6
@@ -1,5 +1,5 @@
-restore f2 b1
-restore f3 b2
+restore [locate_data_file f2] b1
+restore [locate_data_file f3] b2
 
 bcut result b1 b2
 
diff --git a/tests/boolean/bcut_complex/B7 b/tests/boolean/bcut_complex/B7
index e39183fd1a..a3bb543f70 100644
--- a/tests/boolean/bcut_complex/B7
+++ b/tests/boolean/bcut_complex/B7
@@ -1,5 +1,5 @@
-restore f2 b1
-restore f3 b2
+restore [locate_data_file f2] b1
+restore [locate_data_file f3] b2
 
 bcut result b2 b1
 
diff --git a/tests/boolean/bcut_complex/B8 b/tests/boolean/bcut_complex/B8
index fa8041c126..22cf7de3f8 100644
--- a/tests/boolean/bcut_complex/B8
+++ b/tests/boolean/bcut_complex/B8
@@ -1,5 +1,5 @@
-restore f3 b1
-restore f4 b2
+restore [locate_data_file f3] b1
+restore [locate_data_file f4] b2
 
 bcut result b1 b2
 
diff --git a/tests/boolean/bcut_complex/B9 b/tests/boolean/bcut_complex/B9
index 1a825c6ab4..3e6d7d58ab 100644
--- a/tests/boolean/bcut_complex/B9
+++ b/tests/boolean/bcut_complex/B9
@@ -1,5 +1,5 @@
-restore f3 b1
-restore f4 b2
+restore [locate_data_file f3] b1
+restore [locate_data_file f4] b2
 
 bcut result b2 b1
 
diff --git a/tests/boolean/bcut_complex/C1 b/tests/boolean/bcut_complex/C1
index a0afd86110..908e91fa4a 100644
--- a/tests/boolean/bcut_complex/C1
+++ b/tests/boolean/bcut_complex/C1
@@ -1,5 +1,5 @@
-restore f3 b1
-restore f5 b2
+restore [locate_data_file f3] b1
+restore [locate_data_file f5] b2
 
 bcut result b1 b2
 
diff --git a/tests/boolean/bcut_complex/C2 b/tests/boolean/bcut_complex/C2
index 1a9ff4e165..4374f98103 100644
--- a/tests/boolean/bcut_complex/C2
+++ b/tests/boolean/bcut_complex/C2
@@ -1,7 +1,7 @@
 puts "TODO #22911 ALL: Error : The bcut is not valid. The square is 0"
 
-restore f3 b1
-restore f5 b2
+restore [locate_data_file f3] b1
+restore [locate_data_file f5] b2
 
 bcut result b2 b1
 
diff --git a/tests/boolean/bcut_complex/C3 b/tests/boolean/bcut_complex/C3
index bf67594972..ad86369a3d 100644
--- a/tests/boolean/bcut_complex/C3
+++ b/tests/boolean/bcut_complex/C3
@@ -1,5 +1,5 @@
-restore f1 b1
-restore f41 b2
+restore [locate_data_file f1] b1
+restore [locate_data_file f41] b2
 
 bcut result b1 b2
 
diff --git a/tests/boolean/bcut_complex/C4 b/tests/boolean/bcut_complex/C4
index 0d0e2d8290..697751a88b 100644
--- a/tests/boolean/bcut_complex/C4
+++ b/tests/boolean/bcut_complex/C4
@@ -1,7 +1,7 @@
 puts "TODO #22911 ALL: Error : The bcut is not valid. The square is 0"
 
-restore f1 b1
-restore f41 b2
+restore [locate_data_file f1] b1
+restore [locate_data_file f41] b2
 
 bcut result b2 b1
 
diff --git a/tests/boolean/bcut_complex/C5 b/tests/boolean/bcut_complex/C5
index 005dae648e..b4abc33892 100644
--- a/tests/boolean/bcut_complex/C5
+++ b/tests/boolean/bcut_complex/C5
@@ -1,5 +1,5 @@
-restore so1 b1
-restore so4 b2
+restore [locate_data_file so1] b1
+restore [locate_data_file so4] b2
 
 bcut result b1 b2
 
diff --git a/tests/boolean/bcut_complex/C6 b/tests/boolean/bcut_complex/C6
index 1849c3e84a..5b61a20629 100644
--- a/tests/boolean/bcut_complex/C6
+++ b/tests/boolean/bcut_complex/C6
@@ -1,7 +1,7 @@
 puts "TODO #22911 ALL: Error : The bcut is not valid. The square is 0"
 
-restore so1 b1
-restore so4 b2
+restore [locate_data_file so1] b1
+restore [locate_data_file so4] b2
 
 bcut result b2 b1
 
diff --git a/tests/boolean/bcut_complex/C7 b/tests/boolean/bcut_complex/C7
index 94697fe204..45c4d2b915 100644
--- a/tests/boolean/bcut_complex/C7
+++ b/tests/boolean/bcut_complex/C7
@@ -1,5 +1,5 @@
-restore so1 b1
-restore so2 b2
+restore [locate_data_file so1] b1
+restore [locate_data_file so2] b2
 
 bcut result b1 b2
 
diff --git a/tests/boolean/bcut_complex/C8 b/tests/boolean/bcut_complex/C8
index 7026d537f2..20fb4ae908 100644
--- a/tests/boolean/bcut_complex/C8
+++ b/tests/boolean/bcut_complex/C8
@@ -1,7 +1,7 @@
 puts "TODO #22911 ALL: Error : The bcut is not valid. The square is 0"
 
-restore so1 b1
-restore so2 b2
+restore [locate_data_file so1] b1
+restore [locate_data_file so2] b2
 
 bcut result b2 b1
 
diff --git a/tests/boolean/bcut_complex/C9 b/tests/boolean/bcut_complex/C9
index ef2bde9f3d..22e97cfae3 100644
--- a/tests/boolean/bcut_complex/C9
+++ b/tests/boolean/bcut_complex/C9
@@ -1,5 +1,5 @@
-restore so2 b1
-restore so3 b2
+restore [locate_data_file so2] b1
+restore [locate_data_file so3] b2
 
 bcut result b1 b2
 
diff --git a/tests/boolean/bcut_complex/D1 b/tests/boolean/bcut_complex/D1
index 22669ee13f..a058b6efeb 100644
--- a/tests/boolean/bcut_complex/D1
+++ b/tests/boolean/bcut_complex/D1
@@ -1,5 +1,5 @@
-restore so2 b1
-restore so3 b2
+restore [locate_data_file so2] b1
+restore [locate_data_file so3] b2
 
 bcut result b2 b1
 
diff --git a/tests/boolean/bcut_complex/D2 b/tests/boolean/bcut_complex/D2
index b40d71856f..086674ac10 100644
--- a/tests/boolean/bcut_complex/D2
+++ b/tests/boolean/bcut_complex/D2
@@ -1,5 +1,5 @@
-restore so4 b1
-restore so2 b2
+restore [locate_data_file so4] b1
+restore [locate_data_file so2] b2
 
 bcut result b1 b2
 
diff --git a/tests/boolean/bcut_complex/D3 b/tests/boolean/bcut_complex/D3
index 611cf5eb49..c544772ac9 100644
--- a/tests/boolean/bcut_complex/D3
+++ b/tests/boolean/bcut_complex/D3
@@ -1,5 +1,5 @@
-restore so4 b1
-restore so2 b2
+restore [locate_data_file so4] b1
+restore [locate_data_file so2] b2
 
 bcut result b2 b1
 
diff --git a/tests/boolean/bcut_complex/D4 b/tests/boolean/bcut_complex/D4
index 22b0c4aaf5..d4668d0315 100644
--- a/tests/boolean/bcut_complex/D4
+++ b/tests/boolean/bcut_complex/D4
@@ -1,5 +1,5 @@
-restore so5 b1
-restore so2 b2
+restore [locate_data_file so5] b1
+restore [locate_data_file so2] b2
 
 bcut result b1 b2
 
diff --git a/tests/boolean/bcut_complex/D5 b/tests/boolean/bcut_complex/D5
index 23cfdd0461..a16a0b1793 100644
--- a/tests/boolean/bcut_complex/D5
+++ b/tests/boolean/bcut_complex/D5
@@ -1,5 +1,5 @@
-restore so5 b1
-restore so2 b2
+restore [locate_data_file so5] b1
+restore [locate_data_file so2] b2
 
 bcut result b2 b1
 
diff --git a/tests/boolean/bcut_complex/D6 b/tests/boolean/bcut_complex/D6
index 91cdcceab2..1e5f0af5a9 100644
--- a/tests/boolean/bcut_complex/D6
+++ b/tests/boolean/bcut_complex/D6
@@ -1,5 +1,5 @@
-restore so3 b1
-restore so7 b2
+restore [locate_data_file so3] b1
+restore [locate_data_file so7] b2
 
 bcut result b1 b2
 
diff --git a/tests/boolean/bcut_complex/D7 b/tests/boolean/bcut_complex/D7
index 40eb09b2af..df1d987d75 100644
--- a/tests/boolean/bcut_complex/D7
+++ b/tests/boolean/bcut_complex/D7
@@ -1,5 +1,5 @@
-restore so3 b1
-restore so7 b2
+restore [locate_data_file so3] b1
+restore [locate_data_file so7] b2
 
 bcut result b2 b1
 
diff --git a/tests/boolean/bcut_complex/D8 b/tests/boolean/bcut_complex/D8
index 5596eacaa9..9e1322f833 100644
--- a/tests/boolean/bcut_complex/D8
+++ b/tests/boolean/bcut_complex/D8
@@ -1,5 +1,5 @@
-restore so2 b1
-restore so7 b2
+restore [locate_data_file so2] b1
+restore [locate_data_file so7] b2
 
 bcut result b1 b2
 
diff --git a/tests/boolean/bcut_complex/D9 b/tests/boolean/bcut_complex/D9
index a9552702ed..fa07e2bad1 100644
--- a/tests/boolean/bcut_complex/D9
+++ b/tests/boolean/bcut_complex/D9
@@ -1,5 +1,5 @@
-restore so2 b1
-restore so7 b2
+restore [locate_data_file so2] b1
+restore [locate_data_file so7] b2
 
 bcut result b2 b1
 
diff --git a/tests/boolean/bcut_complex/E1 b/tests/boolean/bcut_complex/E1
index 741d864067..ba7dec1630 100644
--- a/tests/boolean/bcut_complex/E1
+++ b/tests/boolean/bcut_complex/E1
@@ -1,5 +1,5 @@
-restore so2 b1
-restore so6 b2
+restore [locate_data_file so2] b1
+restore [locate_data_file so6] b2
 
 bcut result b1 b2
 
diff --git a/tests/boolean/bcut_complex/E2 b/tests/boolean/bcut_complex/E2
index 9a0716fb36..ae5ed21d87 100644
--- a/tests/boolean/bcut_complex/E2
+++ b/tests/boolean/bcut_complex/E2
@@ -1,5 +1,5 @@
-restore so2 b1
-restore so6 b2
+restore [locate_data_file so2] b1
+restore [locate_data_file so6] b2
 
 bcut result b2 b1
 
diff --git a/tests/boolean/bcut_complex/E3 b/tests/boolean/bcut_complex/E3
index 0600874391..90c99cf43f 100644
--- a/tests/boolean/bcut_complex/E3
+++ b/tests/boolean/bcut_complex/E3
@@ -1,8 +1,8 @@
 # Original bug : pro5557
 # Date : 10mar97
 
-restore pro5557_revol.shape revol1
-restore pro5557_bsurf.shape bsurf2
+restore [locate_data_file pro5557_revol.shape] revol1
+restore [locate_data_file pro5557_bsurf.shape] bsurf2
 #normals bsurf2 0.27
 point pnt1 0 -0.3 0
 halfspace space2 bsurf2 0 -0.3 0
diff --git a/tests/boolean/bcut_complex/E4 b/tests/boolean/bcut_complex/E4
index 4ec9611ea2..2a34024b5d 100644
--- a/tests/boolean/bcut_complex/E4
+++ b/tests/boolean/bcut_complex/E4
@@ -2,8 +2,8 @@
 # Date : 07mar97
 
 ## this saved protusion has length of 0.3 Meter (300 mm)
-restore pro6066a.shape prot1
-restore pro6066b.shape box2
+restore [locate_data_file pro6066a.shape] prot1
+restore [locate_data_file pro6066b.shape] box2
 
 bcut result prot1 box2
 
diff --git a/tests/boolean/bcut_complex/E5 b/tests/boolean/bcut_complex/E5
index 9696d646e8..50b552bc91 100644
--- a/tests/boolean/bcut_complex/E5
+++ b/tests/boolean/bcut_complex/E5
@@ -1,8 +1,8 @@
 # Original bug : ger60040
 # Date : 11mar98 
 
-restore ger60040-part.rle part
-restore ger60040-tool.rle tool
+restore [locate_data_file ger60040-part.rle] part
+restore [locate_data_file ger60040-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/E6 b/tests/boolean/bcut_complex/E6
index 3dda041399..aa76de1c46 100644
--- a/tests/boolean/bcut_complex/E6
+++ b/tests/boolean/bcut_complex/E6
@@ -1,8 +1,8 @@
 # Original bug : ger60043
 # Date : 11mar98
 
-restore ger60043-part.rle part 
-restore ger60043-tool.rle tool
+restore [locate_data_file ger60043-part.rle] part 
+restore [locate_data_file ger60043-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/E7 b/tests/boolean/bcut_complex/E7
index 815ca0fc2f..4bf62b046b 100644
--- a/tests/boolean/bcut_complex/E7
+++ b/tests/boolean/bcut_complex/E7
@@ -1,8 +1,8 @@
 # Original bug : ger60065
 # Date : 11mar98
 
-restore ger60065-part.rle part
-restore ger60065-tool.rle tool
+restore [locate_data_file ger60065-part.rle] part
+restore [locate_data_file ger60065-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/E8 b/tests/boolean/bcut_complex/E8
index ccc3bb1535..d5bf81a9e5 100644
--- a/tests/boolean/bcut_complex/E8
+++ b/tests/boolean/bcut_complex/E8
@@ -1,8 +1,8 @@
 # Original bug : jap60038
 # Date : 11mar98
 
-restore jap60038-part.rle part
-restore jap60038-tool.rle tool
+restore [locate_data_file jap60038-part.rle] part
+restore [locate_data_file jap60038-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/E9 b/tests/boolean/bcut_complex/E9
index 217325426e..fafad99876 100644
--- a/tests/boolean/bcut_complex/E9
+++ b/tests/boolean/bcut_complex/E9
@@ -1,8 +1,8 @@
 # Original bug : pro6066
 # Date : 11mar98
 
-restore pro6066-part.rle part
-restore pro6066-tool.rle tool
+restore [locate_data_file pro6066-part.rle] part
+restore [locate_data_file pro6066-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/F1 b/tests/boolean/bcut_complex/F1
index 3ec76ddbfd..33a0ebd422 100644
--- a/tests/boolean/bcut_complex/F1
+++ b/tests/boolean/bcut_complex/F1
@@ -1,8 +1,8 @@
 # Original bug : cts17785
 # Date : 18mar98
 
-restore cts17785-part.rle part
-restore cts17785-tool.rle tool
+restore [locate_data_file cts17785-part.rle] part
+restore [locate_data_file cts17785-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/F2 b/tests/boolean/bcut_complex/F2
index 176f1fd598..018ec8b9be 100644
--- a/tests/boolean/bcut_complex/F2
+++ b/tests/boolean/bcut_complex/F2
@@ -4,8 +4,8 @@
 puts "TODO #22911 ALL: Faulty shapes in variables faulty_1 to faulty_"
 puts "TODO #22911 ALL: Error : The square of result shape is"
 
-restore buc60127-part.rle part
-restore buc60127-tool.rle tool
+restore [locate_data_file buc60127-part.rle] part
+restore [locate_data_file buc60127-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/F3 b/tests/boolean/bcut_complex/F3
index 6ea9df2dbe..4af292c798 100644
--- a/tests/boolean/bcut_complex/F3
+++ b/tests/boolean/bcut_complex/F3
@@ -1,8 +1,8 @@
 # Original bug : cts18140
 # Date : 18mar98
 
-restore cts18140-part.rle part
-restore cts18140-tool.rle tool
+restore [locate_data_file cts18140-part.rle] part
+restore [locate_data_file cts18140-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/F4 b/tests/boolean/bcut_complex/F4
index 27f1c6c56a..53d58070c9 100644
--- a/tests/boolean/bcut_complex/F4
+++ b/tests/boolean/bcut_complex/F4
@@ -1,8 +1,8 @@
 # Original bug : pro11730
 # Date : 19mar98
 
-restore pro11730_part.rle part
-restore pro11730_tool.rle tool
+restore [locate_data_file pro11730_part.rle] part
+restore [locate_data_file pro11730_tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/F5 b/tests/boolean/bcut_complex/F5
index 2c56dd9331..2b1a5ff90c 100644
--- a/tests/boolean/bcut_complex/F5
+++ b/tests/boolean/bcut_complex/F5
@@ -1,8 +1,8 @@
 # Original bug : cts19485
 # Date : 19mar98
 
-restore cts19485-part.rle part
-restore cts19485-tool.rle tool
+restore [locate_data_file cts19485-part.rle] part
+restore [locate_data_file cts19485-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/F6 b/tests/boolean/bcut_complex/F6
index 1eaa940ec1..991b18400c 100644
--- a/tests/boolean/bcut_complex/F6
+++ b/tests/boolean/bcut_complex/F6
@@ -1,8 +1,8 @@
 # Original bug : pro11828
 # Date : 
 
-restore pro11828-part.rle part
-restore pro11828-tool.rle tool
+restore [locate_data_file pro11828-part.rle] part
+restore [locate_data_file pro11828-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/F7 b/tests/boolean/bcut_complex/F7
index bfd7e38d5f..94db55007e 100644
--- a/tests/boolean/bcut_complex/F7
+++ b/tests/boolean/bcut_complex/F7
@@ -1,8 +1,8 @@
 # Original bug : buc60219
 # Date : 15 Sept 98
 
-restore buc60219a.rle a
-restore buc60219b.rle b
+restore [locate_data_file buc60219a.rle] a
+restore [locate_data_file buc60219b.rle] b
 
 #pkv
 breducetolerance a
diff --git a/tests/boolean/bcut_complex/F8 b/tests/boolean/bcut_complex/F8
index e516edaf1f..561a539a14 100644
--- a/tests/boolean/bcut_complex/F8
+++ b/tests/boolean/bcut_complex/F8
@@ -1,8 +1,8 @@
 # Original bug : pro8951
 # Date : 17sept98
 
-restore pro8951c.rle base
-restore pro8951d.rle prism
+restore [locate_data_file pro8951c.rle] base
+restore [locate_data_file pro8951d.rle] prism
 
 bcut result base prism
 
diff --git a/tests/boolean/bcut_complex/F9 b/tests/boolean/bcut_complex/F9
index 3a72d05dd7..09940fc9e0 100644
--- a/tests/boolean/bcut_complex/F9
+++ b/tests/boolean/bcut_complex/F9
@@ -1,8 +1,8 @@
 # Original bug : fra60656
 # Date : 23mar98
 
-restore fra60656-part.rle part
-restore fra60656-tool.rle tool
+restore [locate_data_file fra60656-part.rle] part
+restore [locate_data_file fra60656-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/G1 b/tests/boolean/bcut_complex/G1
index d51f4156b2..2859eee632 100644
--- a/tests/boolean/bcut_complex/G1
+++ b/tests/boolean/bcut_complex/G1
@@ -1,8 +1,8 @@
 # Original bug : hkg60163
 # Date : 18sept98
 
-restore hkg60163c.rle base
-restore hkg60163d.rle prism
+restore [locate_data_file hkg60163c.rle] base
+restore [locate_data_file hkg60163d.rle] prism
 
 bcut result base prism
 
diff --git a/tests/boolean/bcut_complex/G2 b/tests/boolean/bcut_complex/G2
index d826e981aa..008f70c11f 100644
--- a/tests/boolean/bcut_complex/G2
+++ b/tests/boolean/bcut_complex/G2
@@ -1,8 +1,8 @@
 # Original bug : pro12663
 # Date : 24mar98
 
-restore pro12663-part.rle part
-restore pro12663-tool.rle tool
+restore [locate_data_file pro12663-part.rle] part
+restore [locate_data_file pro12663-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/G3 b/tests/boolean/bcut_complex/G3
index 66c56edcf6..bb9a4e5ddf 100644
--- a/tests/boolean/bcut_complex/G3
+++ b/tests/boolean/bcut_complex/G3
@@ -1,14 +1,14 @@
 # Original bug : cts18078
 # Date : 24mar98
 
-restore cts18078-part.rle part
+restore [locate_data_file cts18078-part.rle] part
 
 ## Note that shape 'part' needed 
 ## to be reparametrised
 fsameparameter part
 ## Seems no longer to be necessary
 
-restore cts18078-tool.rle tool
+restore [locate_data_file cts18078-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/G4 b/tests/boolean/bcut_complex/G4
index bbf0386f5f..eab4966156 100644
--- a/tests/boolean/bcut_complex/G4
+++ b/tests/boolean/bcut_complex/G4
@@ -1,8 +1,8 @@
 # Original bug : fra50089
 # Date : 24mar98
 
-restore fra50089-part.rle part
-restore fra50089-tool.rle tool
+restore [locate_data_file fra50089-part.rle] part
+restore [locate_data_file fra50089-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/G5 b/tests/boolean/bcut_complex/G5
index ddf100148a..a09abf6303 100644
--- a/tests/boolean/bcut_complex/G5
+++ b/tests/boolean/bcut_complex/G5
@@ -1,8 +1,8 @@
 # Original bug : pro8320
 # Date : 24mar98
 
-restore pro8320-part.rle part
-restore pro8320-tool.rle tool
+restore [locate_data_file pro8320-part.rle] part
+restore [locate_data_file pro8320-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/G6 b/tests/boolean/bcut_complex/G6
index 9f37998d47..9ab2702efb 100644
--- a/tests/boolean/bcut_complex/G6
+++ b/tests/boolean/bcut_complex/G6
@@ -1,8 +1,8 @@
 # Original bug : cts19305
 # Date : 30mar98
 
-restore cts19305-part.rle part
-restore cts19305-tool.rle tool
+restore [locate_data_file cts19305-part.rle] part
+restore [locate_data_file cts19305-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/G7 b/tests/boolean/bcut_complex/G7
index b0c6f1d816..fc851d9c54 100644
--- a/tests/boolean/bcut_complex/G7
+++ b/tests/boolean/bcut_complex/G7
@@ -1,8 +1,8 @@
 # Original bug : fra60810
 # Date : 30mar98
 
-restore fra60810-part.rle part
-restore fra60810-tool.rle tool
+restore [locate_data_file fra60810-part.rle] part
+restore [locate_data_file fra60810-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/G8 b/tests/boolean/bcut_complex/G8
index a23369dc31..af649e6465 100644
--- a/tests/boolean/bcut_complex/G8
+++ b/tests/boolean/bcut_complex/G8
@@ -1,8 +1,8 @@
 # Original bug : ger60598
 # Date : 18Sept98
 
-restore ger60598c.rle base
-restore ger60598d.rle prism
+restore [locate_data_file ger60598c.rle] base
+restore [locate_data_file ger60598d.rle] prism
 
 fsameparameter base
 
diff --git a/tests/boolean/bcut_complex/G9 b/tests/boolean/bcut_complex/G9
index dd09d81954..5687c04601 100644
--- a/tests/boolean/bcut_complex/G9
+++ b/tests/boolean/bcut_complex/G9
@@ -1,8 +1,8 @@
 # Original bug : cts21128
 # Date : 21 Sept 98
 
-restore cts21128c.rle c
-restore cts21128d.rle d
+restore [locate_data_file cts21128c.rle] c
+restore [locate_data_file cts21128d.rle] d
 
 bcut result c d
 
diff --git a/tests/boolean/bcut_complex/H1 b/tests/boolean/bcut_complex/H1
index 6626fc4270..8011467d4a 100644
--- a/tests/boolean/bcut_complex/H1
+++ b/tests/boolean/bcut_complex/H1
@@ -1,8 +1,8 @@
 # Original bug : ger60224
 # Date :
 
-restore ger60224c.rle base
-restore ger60224d.rle prism
+restore [locate_data_file ger60224c.rle] base
+restore [locate_data_file ger60224d.rle] prism
 
 bcut result base prism
 
diff --git a/tests/boolean/bcut_complex/H2 b/tests/boolean/bcut_complex/H2
index 3c74863223..1ea79a35be 100644
--- a/tests/boolean/bcut_complex/H2
+++ b/tests/boolean/bcut_complex/H2
@@ -1,8 +1,8 @@
 # Original bug : cts20212
 # Date : 24mar98
 
-restore cts20212-part.rle part
-restore cts20212-tool.rle tool
+restore [locate_data_file cts20212-part.rle] part
+restore [locate_data_file cts20212-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/H3 b/tests/boolean/bcut_complex/H3
index a8487f6a2e..0405bf2415 100644
--- a/tests/boolean/bcut_complex/H3
+++ b/tests/boolean/bcut_complex/H3
@@ -1,8 +1,8 @@
 # Original bug : cts20374
 # Date : 24mar98
 
-restore cts20374-part.rle part
-restore cts20374-tool.rle tool
+restore [locate_data_file cts20374-part.rle] part
+restore [locate_data_file cts20374-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/H4 b/tests/boolean/bcut_complex/H4
index d5bf6b8c58..2b9db58557 100644
--- a/tests/boolean/bcut_complex/H4
+++ b/tests/boolean/bcut_complex/H4
@@ -1,8 +1,8 @@
 # Original bug : pro12953
 # Date :  4mai98
 
-restore pro12953-part.rle part
-restore pro12953-tool.rle tool
+restore [locate_data_file pro12953-part.rle] part
+restore [locate_data_file pro12953-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/H5 b/tests/boolean/bcut_complex/H5
index e9c09d9da7..952e3861a7 100644
--- a/tests/boolean/bcut_complex/H5
+++ b/tests/boolean/bcut_complex/H5
@@ -1,8 +1,8 @@
 # Original bug : pro15323
 # Date : 21Sept98
 
-restore pro15323c.rle part
-restore pro15323d.rle tool
+restore [locate_data_file pro15323c.rle] part
+restore [locate_data_file pro15323d.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/H6 b/tests/boolean/bcut_complex/H6
index b0682e4742..4ef07e8e32 100644
--- a/tests/boolean/bcut_complex/H6
+++ b/tests/boolean/bcut_complex/H6
@@ -1,8 +1,8 @@
 # Original bug : pro12880
 # Date : 21 Sept 98
 
-restore pro12880c.rle part
-restore pro12880d.rle tool
+restore [locate_data_file pro12880c.rle] part
+restore [locate_data_file pro12880d.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/H7 b/tests/boolean/bcut_complex/H7
index 6afa5f82e8..33cb403e37 100644
--- a/tests/boolean/bcut_complex/H7
+++ b/tests/boolean/bcut_complex/H7
@@ -1,8 +1,8 @@
 # Original bug : pro14240
 # Date : 21 Sept 98
 
-restore pro14240c.rle part
-restore pro14240d.rle tool
+restore [locate_data_file pro14240c.rle] part
+restore [locate_data_file pro14240d.rle] tool
 btolx tool
 
 bcut result part tool
diff --git a/tests/boolean/bcut_complex/H8 b/tests/boolean/bcut_complex/H8
index 0a5fa9ef76..a11dfebda8 100644
--- a/tests/boolean/bcut_complex/H8
+++ b/tests/boolean/bcut_complex/H8
@@ -1,8 +1,8 @@
 # Original bug : cts20736
 # Date : 28Sept97
 
-restore cts20736a.rle part
-restore cts20736b.rle aface
+restore [locate_data_file cts20736a.rle] part
+restore [locate_data_file cts20736b.rle] aface
 
 btolx part
 btolx aface
diff --git a/tests/boolean/bcut_complex/H9 b/tests/boolean/bcut_complex/H9
index 0cf16e3b49..d1f2436725 100644
--- a/tests/boolean/bcut_complex/H9
+++ b/tests/boolean/bcut_complex/H9
@@ -1,8 +1,8 @@
 # Original bug : ger50084
 # Date : 21 Sept 98
 
-restore ger50084c.rle prism
-restore ger50084d.rle base
+restore [locate_data_file ger50084c.rle] prism
+restore [locate_data_file ger50084d.rle] base
 
 bcut result prism base
 
diff --git a/tests/boolean/bcut_complex/I1 b/tests/boolean/bcut_complex/I1
index ec5d0ab25f..fec5e82fea 100644
--- a/tests/boolean/bcut_complex/I1
+++ b/tests/boolean/bcut_complex/I1
@@ -1,8 +1,8 @@
 # Original bug : cts20203
 # Date : 13Mai98
  
-restore  cts20203_base  base
-restore  cts20203_outil  outil
+restore [locate_data_file cts20203_base]  base
+restore [locate_data_file cts20203_outil]  outil
 
 bcut result base outil
 
diff --git a/tests/boolean/bcut_complex/I2 b/tests/boolean/bcut_complex/I2
index 2e6c07dd0b..ec9aaa5f2b 100644
--- a/tests/boolean/bcut_complex/I2
+++ b/tests/boolean/bcut_complex/I2
@@ -1,8 +1,8 @@
 # Original bug : cts20138
 # Date : 13Mai98
 
-restore  cts20138_base  base
-restore  cts20138_outil  outil
+restore [locate_data_file cts20138_base]  base
+restore [locate_data_file cts20138_outil]  outil
 
 bcut result base outil
 
diff --git a/tests/boolean/bcut_complex/I3 b/tests/boolean/bcut_complex/I3
index 27960a24b2..101c1c1c77 100644
--- a/tests/boolean/bcut_complex/I3
+++ b/tests/boolean/bcut_complex/I3
@@ -1,8 +1,8 @@
 # Original bug : cts20150
 # Date : 13Mai98
 
-restore  cts20150_base.rle  base
-restore  cts20150_outil.rle  outil
+restore [locate_data_file cts20150_base.rle]  base
+restore [locate_data_file cts20150_outil.rle]  outil
 
 bcut result base outil
 
diff --git a/tests/boolean/bcut_complex/I4 b/tests/boolean/bcut_complex/I4
index de3ddac618..955bd7c10b 100644
--- a/tests/boolean/bcut_complex/I4
+++ b/tests/boolean/bcut_complex/I4
@@ -1,8 +1,8 @@
 # Original bug : cts20456
 # Date : 13Mai98
 
-restore cts20456a.rle a
-restore cts20456b.rle b
+restore [locate_data_file cts20456a.rle] a
+restore [locate_data_file cts20456b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bcut_complex/I5 b/tests/boolean/bcut_complex/I5
index bb25deb066..699e7e067b 100644
--- a/tests/boolean/bcut_complex/I5
+++ b/tests/boolean/bcut_complex/I5
@@ -2,8 +2,8 @@
 # Date : 13Mai98
 # A5.gif
 
-restore cts20462-part.rle part
-restore cts20462-tool.rle tool
+restore [locate_data_file cts20462-part.rle] part
+restore [locate_data_file cts20462-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/I6 b/tests/boolean/bcut_complex/I6
index 01129bd846..4daa940d0e 100644
--- a/tests/boolean/bcut_complex/I6
+++ b/tests/boolean/bcut_complex/I6
@@ -2,8 +2,8 @@
 # Date : 13Mai98
 # A6.gif
 
-restore cts20455-part.rle part
-restore cts20455-tool.rle tool
+restore [locate_data_file cts20455-part.rle] part
+restore [locate_data_file cts20455-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/I7 b/tests/boolean/bcut_complex/I7
index f054e3f0a6..1fe909f3a0 100644
--- a/tests/boolean/bcut_complex/I7
+++ b/tests/boolean/bcut_complex/I7
@@ -2,8 +2,8 @@
 # Date : 13Mai98
 # A7.gif
 
-restore cts20459-part.rle part
-restore cts20459-tool.rle tool
+restore [locate_data_file cts20459-part.rle] part
+restore [locate_data_file cts20459-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/I8 b/tests/boolean/bcut_complex/I8
index 872dcf7df1..db175c777c 100644
--- a/tests/boolean/bcut_complex/I8
+++ b/tests/boolean/bcut_complex/I8
@@ -2,8 +2,8 @@
 # Date : 13Mai98
 # B2.gif
 
-restore cts19485-part.rle part
-restore cts19485-tool.rle tool
+restore [locate_data_file cts19485-part.rle] part
+restore [locate_data_file cts19485-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/I9 b/tests/boolean/bcut_complex/I9
index adfa7629b8..2284a99e0c 100644
--- a/tests/boolean/bcut_complex/I9
+++ b/tests/boolean/bcut_complex/I9
@@ -2,8 +2,8 @@
 # Date : 13Mai98
 # B4
 
-restore cts20483-part.rle part
-restore cts20483-tool.rle tool
+restore [locate_data_file cts20483-part.rle] part
+restore [locate_data_file cts20483-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/J1 b/tests/boolean/bcut_complex/J1
index 3094a56176..ee9f983943 100644
--- a/tests/boolean/bcut_complex/J1
+++ b/tests/boolean/bcut_complex/J1
@@ -2,8 +2,8 @@
 # Date : 13Mai98
 # B8.gif
 
-restore cts20503-part.rle part
-restore cts20503-tool.rle tool
+restore [locate_data_file cts20503-part.rle] part
+restore [locate_data_file cts20503-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/J2 b/tests/boolean/bcut_complex/J2
index 659d75532d..d85d7f2cc0 100644
--- a/tests/boolean/bcut_complex/J2
+++ b/tests/boolean/bcut_complex/J2
@@ -2,8 +2,8 @@
 # Date : 13Mai98
 # B9.gif
 
-restore cts20504-part.rle part
-restore cts20504-tool.rle tool
+restore [locate_data_file cts20504-part.rle] part
+restore [locate_data_file cts20504-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/J3 b/tests/boolean/bcut_complex/J3
index 5d9eeccc8f..63f7cb2f33 100644
--- a/tests/boolean/bcut_complex/J3
+++ b/tests/boolean/bcut_complex/J3
@@ -2,8 +2,8 @@
 # Date : 13Mai98
 # C1
 
-restore cts20505-part.rle part
-restore cts20505-tool.rle tool
+restore [locate_data_file cts20505-part.rle] part
+restore [locate_data_file cts20505-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/J4 b/tests/boolean/bcut_complex/J4
index 79238205a2..7097f700a6 100644
--- a/tests/boolean/bcut_complex/J4
+++ b/tests/boolean/bcut_complex/J4
@@ -2,8 +2,8 @@
 # Date : 13Mai98
 # C7
 
-restore cts20498-part.rle part
-restore cts20498-tool.rle tool
+restore [locate_data_file cts20498-part.rle] part
+restore [locate_data_file cts20498-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/J5 b/tests/boolean/bcut_complex/J5
index d4e8de0ad4..2598be9b05 100644
--- a/tests/boolean/bcut_complex/J5
+++ b/tests/boolean/bcut_complex/J5
@@ -2,8 +2,8 @@
 # Date : 13Mai98
 # C8
 
-restore cts20489-part.rle part
-restore cts20489-tool.rle tool
+restore [locate_data_file cts20489-part.rle] part
+restore [locate_data_file cts20489-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/J6 b/tests/boolean/bcut_complex/J6
index 4b978d52d6..508311a627 100644
--- a/tests/boolean/bcut_complex/J6
+++ b/tests/boolean/bcut_complex/J6
@@ -2,8 +2,8 @@
 # Date : 13Mai98
 # C9
 
-restore cts20496-part.rle part
-restore cts20496-tool.rle tool
+restore [locate_data_file cts20496-part.rle] part
+restore [locate_data_file cts20496-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/J7 b/tests/boolean/bcut_complex/J7
index 54bf696627..d0647105eb 100644
--- a/tests/boolean/bcut_complex/J7
+++ b/tests/boolean/bcut_complex/J7
@@ -2,8 +2,8 @@
 # Date : 13Mai98
 # D3
 
-restore cts20537-part.rle part
-restore cts20537-tool.rle tool
+restore [locate_data_file cts20537-part.rle] part
+restore [locate_data_file cts20537-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/J8 b/tests/boolean/bcut_complex/J8
index 65ff6197ac..3a27b0ae34 100644
--- a/tests/boolean/bcut_complex/J8
+++ b/tests/boolean/bcut_complex/J8
@@ -2,8 +2,8 @@
 # Date : 11June98
 # D6
 
-restore pro14235a.rle a
-restore pro14235b.rle b
+restore [locate_data_file pro14235a.rle] a
+restore [locate_data_file pro14235b.rle] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/J9 b/tests/boolean/bcut_complex/J9
index a7b469e0ae..39ac2f7b31 100644
--- a/tests/boolean/bcut_complex/J9
+++ b/tests/boolean/bcut_complex/J9
@@ -2,8 +2,8 @@
 # Date : 25sept98
 # D7
 
-restore cts20456c.rle c
-restore cts20456d.rle d
+restore [locate_data_file cts20456c.rle] c
+restore [locate_data_file cts20456d.rle] d
 
 bcut result c d
 
diff --git a/tests/boolean/bcut_complex/K1 b/tests/boolean/bcut_complex/K1
index 19e68dfe0a..f139176a2c 100644
--- a/tests/boolean/bcut_complex/K1
+++ b/tests/boolean/bcut_complex/K1
@@ -2,8 +2,8 @@
 # Date : 13Mai98
 # D8
 
-restore cts20496c.rle part
-restore cts20496d.rle tool
+restore [locate_data_file cts20496c.rle] part
+restore [locate_data_file cts20496d.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/K2 b/tests/boolean/bcut_complex/K2
index 4e9fa8eec4..873455fcb4 100644
--- a/tests/boolean/bcut_complex/K2
+++ b/tests/boolean/bcut_complex/K2
@@ -2,8 +2,8 @@
 # Date : 11June98
 # D9
 
-restore pro14235c.rle c
-restore pro14235d.rle d
+restore [locate_data_file pro14235c.rle] c
+restore [locate_data_file pro14235d.rle] d
 
 bcut result c d
 
diff --git a/tests/boolean/bcut_complex/K3 b/tests/boolean/bcut_complex/K3
index ddf5173ad0..a7e2ccee9a 100644
--- a/tests/boolean/bcut_complex/K3
+++ b/tests/boolean/bcut_complex/K3
@@ -1,8 +1,8 @@
 # Original bug : cts20354
 # Date : 19Mai98
 
-restore cts20339-part.rle part
-restore cts20339-tool.rle tool
+restore [locate_data_file cts20339-part.rle] part
+restore [locate_data_file cts20339-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/K4 b/tests/boolean/bcut_complex/K4
index 642e1611d0..cbfad9931a 100644
--- a/tests/boolean/bcut_complex/K4
+++ b/tests/boolean/bcut_complex/K4
@@ -1,8 +1,8 @@
 # Original bug : cts20366
 # Date : 19Mai98
 
-restore cts20366-part.rle part
-restore cts20366-tool.rle tool
+restore [locate_data_file cts20366-part.rle] part
+restore [locate_data_file cts20366-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/K5 b/tests/boolean/bcut_complex/K5
index 3be35be944..619e3d3fd9 100644
--- a/tests/boolean/bcut_complex/K5
+++ b/tests/boolean/bcut_complex/K5
@@ -1,8 +1,8 @@
 # Original bug : cts20370
 # Date : 19Mai98
 
-restore cts20370-part.rle part
-restore cts20370-tool.rle tool
+restore [locate_data_file cts20370-part.rle] part
+restore [locate_data_file cts20370-tool.rle] tool
 
 bsection sec part tool
 checkshape -top sec
diff --git a/tests/boolean/bcut_complex/K6 b/tests/boolean/bcut_complex/K6
index bf39a7feb0..94d3dc617e 100644
--- a/tests/boolean/bcut_complex/K6
+++ b/tests/boolean/bcut_complex/K6
@@ -1,8 +1,8 @@
 # Original bug : cts20397
 # Date : 19Mai98
 
-restore cts20397-part.rle part
-restore cts20397-tool.rle tool
+restore [locate_data_file cts20397-part.rle] part
+restore [locate_data_file cts20397-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/K7 b/tests/boolean/bcut_complex/K7
index 1ee591c781..20258dfa42 100644
--- a/tests/boolean/bcut_complex/K7
+++ b/tests/boolean/bcut_complex/K7
@@ -1,8 +1,8 @@
 # Original bug : spo0139
 # Date : 19Mai98
 
-restore spo0139a.rle a
-restore spo0139b.rle b
+restore [locate_data_file spo0139a.rle] a
+restore [locate_data_file spo0139b.rle] b
 
 ttranslate a a 0 -60 0
 prism abox a 0 240 0
diff --git a/tests/boolean/bcut_complex/K8 b/tests/boolean/bcut_complex/K8
index 68c159c863..d6e423fe7c 100644
--- a/tests/boolean/bcut_complex/K8
+++ b/tests/boolean/bcut_complex/K8
@@ -1,8 +1,8 @@
 # Original bug : cts20551
 # Date : 4June98
 
-restore cts20551-part.rle a
-restore cts20551-tool.rle b
+restore [locate_data_file cts20551-part.rle] a
+restore [locate_data_file cts20551-tool.rle] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/K9 b/tests/boolean/bcut_complex/K9
index a43101cedd..73527be3aa 100644
--- a/tests/boolean/bcut_complex/K9
+++ b/tests/boolean/bcut_complex/K9
@@ -1,8 +1,8 @@
 # Original bug : cts20552
 # Date : 4June98
 
-restore cts20552-part.rle a
-restore cts20552-tool.rle b
+restore [locate_data_file cts20552-part.rle] a
+restore [locate_data_file cts20552-tool.rle] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/L1 b/tests/boolean/bcut_complex/L1
index cf87a2fbf6..181ca02004 100644
--- a/tests/boolean/bcut_complex/L1
+++ b/tests/boolean/bcut_complex/L1
@@ -1,8 +1,8 @@
 # Original bug : cts20767
 # Date : 4June98
 
-restore cts20767-part.rle a
-restore cts20767-tool.rle b
+restore [locate_data_file cts20767-part.rle] a
+restore [locate_data_file cts20767-tool.rle] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/L2 b/tests/boolean/bcut_complex/L2
index f33738a128..439fc28294 100644
--- a/tests/boolean/bcut_complex/L2
+++ b/tests/boolean/bcut_complex/L2
@@ -1,8 +1,8 @@
 # Original bug : cts20867
 # Date : 4June98
 
-restore cts20867-part.rle a
-restore cts20867-tool.rle b
+restore [locate_data_file cts20867-part.rle] a
+restore [locate_data_file cts20867-tool.rle] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/L3 b/tests/boolean/bcut_complex/L3
index 03969f5036..26c31c6665 100644
--- a/tests/boolean/bcut_complex/L3
+++ b/tests/boolean/bcut_complex/L3
@@ -1,8 +1,8 @@
 # Original bug : cts20869
 # Date : 4June98
 
-restore cts20869-part.rle a
-restore cts20869-tool.rle b
+restore [locate_data_file cts20869-part.rle] a
+restore [locate_data_file cts20869-tool.rle] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/L4 b/tests/boolean/bcut_complex/L4
index 2246b508ab..1917080758 100644
--- a/tests/boolean/bcut_complex/L4
+++ b/tests/boolean/bcut_complex/L4
@@ -1,8 +1,8 @@
 # Original bug : cts20366
 # Date : 4June98
 
-restore cts20366-part.rle a
-restore cts20366-tool.rle b
+restore [locate_data_file cts20366-part.rle] a
+restore [locate_data_file cts20366-tool.rle] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/L5 b/tests/boolean/bcut_complex/L5
index 65b837e9f7..76b785cd8d 100644
--- a/tests/boolean/bcut_complex/L5
+++ b/tests/boolean/bcut_complex/L5
@@ -1,8 +1,8 @@
 # Original bug : fra60977
 # Date : 4June98
 
-restore fra60977a.rle a 
-restore fra60977b.rle b
+restore [locate_data_file fra60977a.rle] a 
+restore [locate_data_file fra60977b.rle] b
 
 prism b b 0 0 -50
 
diff --git a/tests/boolean/bcut_complex/L6 b/tests/boolean/bcut_complex/L6
index d9a56c89f0..2759842f50 100644
--- a/tests/boolean/bcut_complex/L6
+++ b/tests/boolean/bcut_complex/L6
@@ -1,8 +1,8 @@
 # Original bug : pro13495
 # Date : 4June98
 
-restore pro13495a.rle a 
-restore pro13495b.rle b
+restore [locate_data_file pro13495a.rle] a 
+restore [locate_data_file pro13495b.rle] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/L7 b/tests/boolean/bcut_complex/L7
index 6045d04ff9..4691854ad0 100644
--- a/tests/boolean/bcut_complex/L7
+++ b/tests/boolean/bcut_complex/L7
@@ -1,8 +1,8 @@
 # Original bug : buc60220 
 # Date : 24June98
 
-restore buc60220a.rle a 
-restore buc60220b.rle b
+restore [locate_data_file buc60220a.rle] a 
+restore [locate_data_file buc60220b.rle] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/L8 b/tests/boolean/bcut_complex/L8
index 3d3799ec98..09ffbd4054 100644
--- a/tests/boolean/bcut_complex/L8
+++ b/tests/boolean/bcut_complex/L8
@@ -1,8 +1,8 @@
 # Original bug : cts20077
 # Date : 24June98
 
-restore cts20077a.rle a 
-restore cts20077b.rle b
+restore [locate_data_file cts20077a.rle] a 
+restore [locate_data_file cts20077b.rle] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/L9 b/tests/boolean/bcut_complex/L9
index 641946c912..378537e273 100644
--- a/tests/boolean/bcut_complex/L9
+++ b/tests/boolean/bcut_complex/L9
@@ -1,8 +1,8 @@
 # Original bug : cts20088
 # Date : 24June98
 
-restore cts20088a.rle a 
-restore cts20088b.rle b
+restore [locate_data_file cts20088a.rle] a 
+restore [locate_data_file cts20088b.rle] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/M1 b/tests/boolean/bcut_complex/M1
index ff4e224187..3087999796 100644
--- a/tests/boolean/bcut_complex/M1
+++ b/tests/boolean/bcut_complex/M1
@@ -1,8 +1,8 @@
 # Original bug : ger60224
 # Date : 24June98
 
-restore ger60224a.rle a 
-restore ger60224b.rle w
+restore [locate_data_file ger60224a.rle] a 
+restore [locate_data_file ger60224b.rle] w
 
 mkplane w w
 prism p1 w 0 100 0
diff --git a/tests/boolean/bcut_complex/M2 b/tests/boolean/bcut_complex/M2
index f8d3c3895c..83cb6947a5 100644
--- a/tests/boolean/bcut_complex/M2
+++ b/tests/boolean/bcut_complex/M2
@@ -1,8 +1,8 @@
 # Original bug : fra61199
 # Date : 29June98
 cpulimit 3000
-restore fra61199a.rle a 
-restore fra61199b.rle b
+restore [locate_data_file fra61199a.rle] a 
+restore [locate_data_file fra61199b.rle] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/M3 b/tests/boolean/bcut_complex/M3
index 1296bb4ce4..b40bf3e320 100644
--- a/tests/boolean/bcut_complex/M3
+++ b/tests/boolean/bcut_complex/M3
@@ -1,8 +1,8 @@
 # Original bug : cts21182
 # Date : 16July98
 
-restore cts21182a.rle a 
-restore cts21182b.rle skface
+restore [locate_data_file cts21182a.rle] a 
+restore [locate_data_file cts21182b.rle] skface
 
 # Cut
 revol b skface 0 0 0 0 0 1 360
diff --git a/tests/boolean/bcut_complex/M4 b/tests/boolean/bcut_complex/M4
index e5fd9975ac..f136024d14 100644
--- a/tests/boolean/bcut_complex/M4
+++ b/tests/boolean/bcut_complex/M4
@@ -1,8 +1,8 @@
 # Original bug : cts21200
 # Date : 16July98
 
-restore cts21200a.rle a 
-restore cts21200b.rle skface
+restore [locate_data_file cts21200a.rle] a 
+restore [locate_data_file cts21200b.rle] skface
 
 prism b skface 0 0 -230
 
diff --git a/tests/boolean/bcut_complex/M5 b/tests/boolean/bcut_complex/M5
index afa276aea8..85f2952209 100644
--- a/tests/boolean/bcut_complex/M5
+++ b/tests/boolean/bcut_complex/M5
@@ -1,8 +1,8 @@
 # Original bug : cts21208
 # Date : 16July98
 
-restore cts21208a.rle a 
-restore cts21208b.rle b
+restore [locate_data_file cts21208a.rle] a 
+restore [locate_data_file cts21208b.rle] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/M6 b/tests/boolean/bcut_complex/M6
index 3f84bbddb7..de1cafacbc 100644
--- a/tests/boolean/bcut_complex/M6
+++ b/tests/boolean/bcut_complex/M6
@@ -1,8 +1,8 @@
 # Original bug : cts21210
 # Date : 16July98
 
-restore cts21210a.rle a 
-restore cts21210b.rle b
+restore [locate_data_file cts21210a.rle] a 
+restore [locate_data_file cts21210b.rle] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/M7 b/tests/boolean/bcut_complex/M7
index 02347a8ef1..c937c06b3c 100644
--- a/tests/boolean/bcut_complex/M7
+++ b/tests/boolean/bcut_complex/M7
@@ -1,8 +1,8 @@
 # Original bug : cts21289
 # Date : 16July98
 
-restore cts21289a.rle a 
-restore cts21289b.rle b
+restore [locate_data_file cts21289a.rle] a 
+restore [locate_data_file cts21289b.rle] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/M8 b/tests/boolean/bcut_complex/M8
index e2cc1c405b..e982edee8b 100644
--- a/tests/boolean/bcut_complex/M8
+++ b/tests/boolean/bcut_complex/M8
@@ -1,8 +1,8 @@
 # Original bug : cts21296
 # Date : 16July98
 
-restore cts21296a.rle a 
-restore cts21296b.rle b
+restore [locate_data_file cts21296a.rle] a 
+restore [locate_data_file cts21296b.rle] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/M9 b/tests/boolean/bcut_complex/M9
index 0272ce127f..a0dfc2d055 100644
--- a/tests/boolean/bcut_complex/M9
+++ b/tests/boolean/bcut_complex/M9
@@ -1,8 +1,8 @@
 # Original bug : hkg60150
 # Date : 16July98
 
-restore hkg60150a.rle a 
-restore hkg60150b.rle b
+restore [locate_data_file hkg60150a.rle] a 
+restore [locate_data_file hkg60150b.rle] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/N1 b/tests/boolean/bcut_complex/N1
index 8ad4fa9310..1006ba7bba 100644
--- a/tests/boolean/bcut_complex/N1
+++ b/tests/boolean/bcut_complex/N1
@@ -1,8 +1,8 @@
 # Original bug : hkg60156
 # Date : 16July98
 
-restore hkg60156a.rle a 
-restore hkg60156b.rle b
+restore [locate_data_file hkg60156a.rle] a 
+restore [locate_data_file hkg60156b.rle] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/N2 b/tests/boolean/bcut_complex/N2
index d88dbad7d8..592b50d757 100644
--- a/tests/boolean/bcut_complex/N2
+++ b/tests/boolean/bcut_complex/N2
@@ -1,8 +1,8 @@
 # Original bug : pro14630
 # Date : 16July98
 
-restore pro14630a.rle a 
-restore pro14630b.rle b
+restore [locate_data_file pro14630a.rle] a 
+restore [locate_data_file pro14630b.rle] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/N3 b/tests/boolean/bcut_complex/N3
index 72ea3a5561..036400ba30 100644
--- a/tests/boolean/bcut_complex/N3
+++ b/tests/boolean/bcut_complex/N3
@@ -1,8 +1,8 @@
 # Original bug : usa60180
 # Date : 16July98
 
-restore usa60180a.rle a 
-restore usa60180b.rle b
+restore [locate_data_file usa60180a.rle] a 
+restore [locate_data_file usa60180b.rle] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/N4 b/tests/boolean/bcut_complex/N4
index 55446ebfaa..cfcdc49c05 100644
--- a/tests/boolean/bcut_complex/N4
+++ b/tests/boolean/bcut_complex/N4
@@ -1,8 +1,8 @@
 # Original bug : cts20875
 # Date : 20July98
 
-restore cts20875-part.rle part
-restore cts20875-tool.rle tool
+restore [locate_data_file cts20875-part.rle] part
+restore [locate_data_file cts20875-tool.rle] tool
 
 bcut result part tool
 
diff --git a/tests/boolean/bcut_complex/N5 b/tests/boolean/bcut_complex/N5
index ad5a9391fc..b174e16a31 100644
--- a/tests/boolean/bcut_complex/N5
+++ b/tests/boolean/bcut_complex/N5
@@ -1,8 +1,8 @@
 # Original bug : cts21321
 # Date : 16July98
 
-restore cts21321a.rle a 
-restore cts21321b.rle b
+restore [locate_data_file cts21321a.rle] a 
+restore [locate_data_file cts21321b.rle] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/N6 b/tests/boolean/bcut_complex/N6
index 41ac5b3177..55a847e933 100644
--- a/tests/boolean/bcut_complex/N6
+++ b/tests/boolean/bcut_complex/N6
@@ -1,8 +1,8 @@
 # Original bug : pro14928
 # Date : 16July98
 
-restore pro14928a.rle a 
-restore pro14928b.rle aface
+restore [locate_data_file pro14928a.rle] a 
+restore [locate_data_file pro14928b.rle] aface
 
 prism b aface 0 500 0
 explode b
diff --git a/tests/boolean/bcut_complex/N7 b/tests/boolean/bcut_complex/N7
index a83340f548..c9697eb7d0 100644
--- a/tests/boolean/bcut_complex/N7
+++ b/tests/boolean/bcut_complex/N7
@@ -1,8 +1,8 @@
 # Original bug : pro14974
 # Date : 26Aout98
 
-restore pro14974a.rle a 
-restore pro14974b.rle b
+restore [locate_data_file pro14974a.rle] a 
+restore [locate_data_file pro14974b.rle] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/N8 b/tests/boolean/bcut_complex/N8
index dc52ccb34b..77bcc5b86d 100644
--- a/tests/boolean/bcut_complex/N8
+++ b/tests/boolean/bcut_complex/N8
@@ -1,8 +1,8 @@
 # Original bug : pro14957
 # Date : 26Aout98
 
-restore pro14957a.rle a 
-restore pro14957b.rle b
+restore [locate_data_file pro14957a.rle] a 
+restore [locate_data_file pro14957b.rle] b
 
 explode a so
 
diff --git a/tests/boolean/bcut_complex/N9 b/tests/boolean/bcut_complex/N9
index 7356a810b0..665e57a2cf 100644
--- a/tests/boolean/bcut_complex/N9
+++ b/tests/boolean/bcut_complex/N9
@@ -4,8 +4,8 @@
 puts "TODO #22911 ALL: Faulty shapes in variables faulty_1 to faulty_"
 puts "TODO #22911 ALL: Error : The square of result shape is"
 
-restore pro14942a.rle a 
-restore pro14942b.rle b
+restore [locate_data_file pro14942a.rle] a 
+restore [locate_data_file pro14942b.rle] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/O1 b/tests/boolean/bcut_complex/O1
index 76532daa5e..c262cdffe4 100644
--- a/tests/boolean/bcut_complex/O1
+++ b/tests/boolean/bcut_complex/O1
@@ -1,8 +1,8 @@
 # Original bug : cts21347
 # Date : 26Aout98
 
-restore cts21347a.rle a 
-restore cts21347b.rle b
+restore [locate_data_file cts21347a.rle] a 
+restore [locate_data_file cts21347b.rle] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/O2 b/tests/boolean/bcut_complex/O2
index 0d4624ca15..0e3784a529 100644
--- a/tests/boolean/bcut_complex/O2
+++ b/tests/boolean/bcut_complex/O2
@@ -2,7 +2,7 @@
 # Date : 26Aout98
 # pkv f
 
-restore pro15042.rle a 
+restore [locate_data_file pro15042.rle] a 
 explode a
 
 bcut result a_1 a_2
diff --git a/tests/boolean/bcut_complex/O3 b/tests/boolean/bcut_complex/O3
index 9ded7b4be1..f3c3ce2ffe 100644
--- a/tests/boolean/bcut_complex/O3
+++ b/tests/boolean/bcut_complex/O3
@@ -1,8 +1,8 @@
 puts "TODO #22911 ALL: Faulty shapes in variables faulty_1 to faulty_2"
 puts "TODO #22911 ALL: Error : The square of result shape is"
 
-restore topo101-o1.brep obj1
-restore topo101-t1.brep tool1
+restore [locate_data_file topo101-o1.brep] obj1
+restore [locate_data_file topo101-t1.brep] tool1
 
 bcut result obj1 tool1
 
diff --git a/tests/boolean/bcut_complex/O4 b/tests/boolean/bcut_complex/O4
index b34e50cc9e..1cf05e754d 100644
--- a/tests/boolean/bcut_complex/O4
+++ b/tests/boolean/bcut_complex/O4
@@ -1,8 +1,8 @@
 puts "TODO #22911 ALL: Faulty shapes in variables faulty_1 to faulty_2"
 puts "TODO #22911 ALL: Error : The square of result shape is"
 
-restore topo101-o2.brep obj2
-restore topo101-t2.brep tool2
+restore [locate_data_file topo101-o2.brep] obj2
+restore [locate_data_file topo101-t2.brep] tool2
 bcut result obj2 tool2
 
 set square 0
diff --git a/tests/boolean/bcut_complex/O5 b/tests/boolean/bcut_complex/O5
index 2a3e8e7bb5..e12ff0cc5f 100644
--- a/tests/boolean/bcut_complex/O5
+++ b/tests/boolean/bcut_complex/O5
@@ -1,8 +1,8 @@
 puts "TODO #22911 ALL: Faulty shapes in variables faulty_1 to faulty_2"
 puts "TODO #22911 ALL: Error : The square of result shape is"
 
-restore topo102-o.brep obj
-restore topo102-t.brep tool
+restore [locate_data_file topo102-o.brep] obj
+restore [locate_data_file topo102-t.brep] tool
 
 bcut result obj tool
 
diff --git a/tests/boolean/bcut_complex/O6 b/tests/boolean/bcut_complex/O6
index 730a277401..1169285886 100644
--- a/tests/boolean/bcut_complex/O6
+++ b/tests/boolean/bcut_complex/O6
@@ -1,8 +1,8 @@
 puts "TODO #22911 ALL: Faulty shapes in variables faulty_1 to faulty_2"
 puts "TODO #22911 ALL: Error : The square of result shape is"
 
-restore topo103-o.brep obj
-restore topo103-t.brep tool
+restore [locate_data_file topo103-o.brep] obj
+restore [locate_data_file topo103-t.brep] tool
 
 bcut result obj tool
 
diff --git a/tests/boolean/bcut_complex/O7 b/tests/boolean/bcut_complex/O7
index c3043fa808..7ad929d48d 100644
--- a/tests/boolean/bcut_complex/O7
+++ b/tests/boolean/bcut_complex/O7
@@ -1,8 +1,8 @@
 puts "TODO #22911 ALL: Faulty shapes in variables faulty_1 to faulty_4"
 puts "TODO #22911 ALL: Error : The square of result shape is"
 
-restore topo108-o.brep obj
-restore topo108-t.brep out
+restore [locate_data_file topo108-o.brep] obj
+restore [locate_data_file topo108-t.brep] out
 
 bcut result obj out
 
diff --git a/tests/boolean/bcut_complex/O8 b/tests/boolean/bcut_complex/O8
index 51824c6d62..8df83f49d9 100644
--- a/tests/boolean/bcut_complex/O8
+++ b/tests/boolean/bcut_complex/O8
@@ -2,7 +2,7 @@
 puts "TODO #22911 ALL: Faulty shapes in variables faulty_1 to faulty_"
 puts "TODO #22911 ALL: Error : The square of result shape is"
 
-restore cts20461.rle a
+restore [locate_data_file cts20461.rle] a
 nexplode a f
 mksurface surf a_26
 nexplode a_26 e
diff --git a/tests/boolean/bcut_complex/O9 b/tests/boolean/bcut_complex/O9
index 455b76ee94..0d7cf41fe6 100644
--- a/tests/boolean/bcut_complex/O9
+++ b/tests/boolean/bcut_complex/O9
@@ -1,7 +1,7 @@
 # cts20549
 
-restore prisme.rle a
-restore revol.rle b
+restore [locate_data_file prisme.rle] a
+restore [locate_data_file revol.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bcut_complex/P1 b/tests/boolean/bcut_complex/P1
index fb17fff59e..196ab90ee3 100644
--- a/tests/boolean/bcut_complex/P1
+++ b/tests/boolean/bcut_complex/P1
@@ -1,7 +1,7 @@
 ## PRO 16663
 
-restore Shape.brep a
-restore Outil.brep b
+restore [locate_data_file Shape_2.brep] a
+restore [locate_data_file Outil.brep] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/P2 b/tests/boolean/bcut_complex/P2
index 7bd569d37b..3ead5b8d5a 100644
--- a/tests/boolean/bcut_complex/P2
+++ b/tests/boolean/bcut_complex/P2
@@ -1,7 +1,7 @@
 ## CTS19305
 
-restore a.rle a
-restore b.rle b
+restore [locate_data_file a.rle] a
+restore [locate_data_file b.rle] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/P3 b/tests/boolean/bcut_complex/P3
index 6138eaa158..3156156553 100644
--- a/tests/boolean/bcut_complex/P3
+++ b/tests/boolean/bcut_complex/P3
@@ -1,7 +1,7 @@
 ## cts20077
 
-restore shapetocut sh
-restore prismtocut  pr
+restore [locate_data_file shapetocut] sh
+restore [locate_data_file prismtocut]  pr
 
 bcut result sh pr
 
diff --git a/tests/boolean/bcut_complex/P4 b/tests/boolean/bcut_complex/P4
index 77c559ec2d..7a79bff8e3 100644
--- a/tests/boolean/bcut_complex/P4
+++ b/tests/boolean/bcut_complex/P4
@@ -1,6 +1,6 @@
 # cts21347
-restore part_1.brep a
-restore tool_2.brep b
+restore [locate_data_file part_1.brep] a
+restore [locate_data_file tool_2.brep] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/P5 b/tests/boolean/bcut_complex/P5
index 48905cbd8b..26fd74cbb4 100644
--- a/tests/boolean/bcut_complex/P5
+++ b/tests/boolean/bcut_complex/P5
@@ -1,7 +1,7 @@
 ## cts21576
 
-restore shape_1.brep a
-restore outil_1.brep b
+restore [locate_data_file shape_1.brep] a
+restore [locate_data_file outil_1.brep] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/P6 b/tests/boolean/bcut_complex/P6
index bdd2433340..65552c84fb 100644
--- a/tests/boolean/bcut_complex/P6
+++ b/tests/boolean/bcut_complex/P6
@@ -2,8 +2,8 @@
 puts "TODO #22911 ALL: Faulty shapes in variables faulty_1 to faulty_"
 puts "TODO #22911 ALL: Error : The square of result shape is"
 
-restore  Bug3_Tr_obj.rle a
-restore  Bug4_Tr_outil.rle b
+restore [locate_data_file Bug3_Tr_obj.rle] a
+restore [locate_data_file Bug4_Tr_outil.rle] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/P7 b/tests/boolean/bcut_complex/P7
index ea1d49f6f2..6c7628b21e 100644
--- a/tests/boolean/bcut_complex/P7
+++ b/tests/boolean/bcut_complex/P7
@@ -1,7 +1,7 @@
 ## FRA61291
 
-restore part.brep a
-restore tool.brep b
+restore [locate_data_file part.brep] a
+restore [locate_data_file tool.brep] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/P8 b/tests/boolean/bcut_complex/P8
index dc2ffc39b7..aba1311df8 100644
--- a/tests/boolean/bcut_complex/P8
+++ b/tests/boolean/bcut_complex/P8
@@ -1,8 +1,8 @@
 # Original bug : cfe002C5
 # Date : 09 Nov 98
 
-restore boitecfe002.rle base
-restore toolcfe002.rle prism
+restore [locate_data_file boitecfe002.rle] base
+restore [locate_data_file toolcfe002.rle] prism
 
 bcut result base prism
 
diff --git a/tests/boolean/bcut_complex/P9 b/tests/boolean/bcut_complex/P9
index d6b2999ea7..c428518307 100644
--- a/tests/boolean/bcut_complex/P9
+++ b/tests/boolean/bcut_complex/P9
@@ -2,8 +2,8 @@ puts "BUC60092"
 puts "cut"
 puts ""
 
-restore buc60092a.rle a
-restore buc60092b.rle b
+restore [locate_data_file buc60092a.rle] a
+restore [locate_data_file buc60092b.rle] b
 
 bcut result a b
 
diff --git a/tests/boolean/bcut_complex/Q1 b/tests/boolean/bcut_complex/Q1
index 6abe7f48c8..db41153c4c 100644
--- a/tests/boolean/bcut_complex/Q1
+++ b/tests/boolean/bcut_complex/Q1
@@ -1,7 +1,7 @@
 puts "BUC60290 (the same problem with cut and common)"
 
-restore buc60290a.rle sol1
-restore buc60290b.rle sol2
+restore [locate_data_file buc60290a.rle] sol1
+restore [locate_data_file buc60290b.rle] sol2
 
 bcut result sol2 sol1
 
diff --git a/tests/boolean/bcut_complex/Q2 b/tests/boolean/bcut_complex/Q2
index 83824ed826..ae513bcaf4 100644
--- a/tests/boolean/bcut_complex/Q2
+++ b/tests/boolean/bcut_complex/Q2
@@ -4,8 +4,8 @@ puts "PRO16389"
 puts "Cut"
 puts ""
 
-restore pro16389a.rle base
-restore pro16389b.rle prism
+restore [locate_data_file pro16389a.rle] base
+restore [locate_data_file pro16389b.rle] prism
 
 bcut result base prism
 
diff --git a/tests/boolean/bcut_complex/Q3 b/tests/boolean/bcut_complex/Q3
index f46d5f1d56..47fc634a01 100644
--- a/tests/boolean/bcut_complex/Q3
+++ b/tests/boolean/bcut_complex/Q3
@@ -1,8 +1,8 @@
 puts "CTS20196"
 puts ""
 
-restore cts20196a.rle base
-restore cts20196b.rle cont
+restore [locate_data_file cts20196a.rle] base
+restore [locate_data_file cts20196b.rle] cont
 
 # test ope. top.
 prism prism cont 0 20 0
diff --git a/tests/boolean/bcut_complex/Q4 b/tests/boolean/bcut_complex/Q4
index 2be081b16a..2f910ec60a 100644
--- a/tests/boolean/bcut_complex/Q4
+++ b/tests/boolean/bcut_complex/Q4
@@ -2,8 +2,8 @@ puts "PRO20110"
 puts "One edge of cut is incorrect."
 puts ""
 
-restore cts21135a.brep o
-restore cts21135b.brep t
+restore [locate_data_file cts21135a.brep] o
+restore [locate_data_file cts21135b.brep] t
 
 bcut result o t
 
diff --git a/tests/boolean/bcut_complex/Q5 b/tests/boolean/bcut_complex/Q5
index 954909d3f1..ba584e0212 100644
--- a/tests/boolean/bcut_complex/Q5
+++ b/tests/boolean/bcut_complex/Q5
@@ -1,8 +1,8 @@
 puts "CTS60025"
 puts "CUT doesn't give the waiting result."
 puts ""
-restore cts60025a.rle b
-restore cts60025b.rle f
+restore [locate_data_file cts60025a.rle] b
+restore [locate_data_file cts60025b.rle] f
 
 # Essai de cut
 prism tool f 0 0 4
diff --git a/tests/boolean/bcut_complex/Q6 b/tests/boolean/bcut_complex/Q6
index 1e3b5f0bae..3dd822bbf6 100644
--- a/tests/boolean/bcut_complex/Q6
+++ b/tests/boolean/bcut_complex/Q6
@@ -2,8 +2,8 @@ puts "GER60854"
 puts "Cut"
 puts ""
 
-restore ger60854a.rle a
-restore ger60854b.rle b
+restore [locate_data_file ger60854a.rle] a
+restore [locate_data_file ger60854b.rle] b
 
 explode a sh
 bcut result a_1 b
diff --git a/tests/boolean/bcut_complex/Q7 b/tests/boolean/bcut_complex/Q7
index fae6f90a8a..cee2555a32 100644
--- a/tests/boolean/bcut_complex/Q7
+++ b/tests/boolean/bcut_complex/Q7
@@ -2,8 +2,8 @@ puts "ID260084"
 puts "Cut"
 puts ""
 
-restore id260084a.rle a
-restore id260084b.rle b
+restore [locate_data_file id260084a.rle] a
+restore [locate_data_file id260084b.rle] b
 
 # Cut
 prism tool b 0 0 10
diff --git a/tests/boolean/bcut_complex/Q8 b/tests/boolean/bcut_complex/Q8
index ad8d6f2c3d..98b3fa3c2e 100644
--- a/tests/boolean/bcut_complex/Q8
+++ b/tests/boolean/bcut_complex/Q8
@@ -4,8 +4,8 @@ puts "PRO16389"
 puts "Cut"
 puts ""
 
-restore pro16389a.rle base
-restore pro16389b.rle prism
+restore [locate_data_file pro16389a.rle] base
+restore [locate_data_file pro16389b.rle] prism
 
 bcut result base prism
 
diff --git a/tests/boolean/bcut_complex/Q9 b/tests/boolean/bcut_complex/Q9
index e3d122d86a..32ab12ae79 100644
--- a/tests/boolean/bcut_complex/Q9
+++ b/tests/boolean/bcut_complex/Q9
@@ -1,4 +1,4 @@
-restore topo001.brep m
+restore [locate_data_file topo001.brep] m
 
 explode m
 compound m_2 m_3 m_4 m_5 c1
diff --git a/tests/boolean/bcutblend/A1 b/tests/boolean/bcutblend/A1
index 90db306999..4fbcbfbbe1 100644
--- a/tests/boolean/bcutblend/A1
+++ b/tests/boolean/bcutblend/A1
@@ -2,8 +2,8 @@
 # Date : 07mar97
 
 ## this saved box has length of 0.3 Meter (300 mm)
-restore pro5640a.shape box1
-restore pro5640b.shape box2
+restore [locate_data_file pro5640a.shape] box1
+restore [locate_data_file pro5640b.shape] box2
 
 ## we want a radius of 0.01 Meter (10 mm)
 bcutblend result box1 box2 0.01
diff --git a/tests/boolean/begin b/tests/boolean/begin
index f08f0d1dd4..481e19515c 100755
--- a/tests/boolean/begin
+++ b/tests/boolean/begin
@@ -8,9 +8,6 @@ cpulimit 300
 dset SCALE 100
 protect SCALE
 
-if {[string compare [datadir] "."] == 0} { 
-   datadir [file dirname [info script]]/data
-}
 if { [info exists imagedir] == 0 } {
    set imagedir .
 }
diff --git a/tests/boolean/bfuse_2d/A1 b/tests/boolean/bfuse_2d/A1
index 2f7cf90a04..0723608fbb 100644
--- a/tests/boolean/bfuse_2d/A1
+++ b/tests/boolean/bfuse_2d/A1
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_edge1.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_edge1.brep] b
 bfuse result a b
 set length 635.826
 set nbsh_v 12
diff --git a/tests/boolean/bfuse_2d/A2 b/tests/boolean/bfuse_2d/A2
index e1a894ca7c..c339e7d2fe 100644
--- a/tests/boolean/bfuse_2d/A2
+++ b/tests/boolean/bfuse_2d/A2
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_wire1.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_wire1.brep] b
 bfuse result a b
 set length 739.311
 set nbsh_v 14
diff --git a/tests/boolean/bfuse_2d/A3 b/tests/boolean/bfuse_2d/A3
index 1a858da05f..3582ee1806 100644
--- a/tests/boolean/bfuse_2d/A3
+++ b/tests/boolean/bfuse_2d/A3
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_wire2.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_wire2.brep] b
 bfuse result a b
 set length 739.311
 set nbsh_v 20
diff --git a/tests/boolean/bfuse_2d/A4 b/tests/boolean/bfuse_2d/A4
index dcacd7700b..2367bed74f 100644
--- a/tests/boolean/bfuse_2d/A4
+++ b/tests/boolean/bfuse_2d/A4
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_wire5.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_wire5.brep] b
 bfuse result a b
 set length 862.192
 set nbsh_v 12
diff --git a/tests/boolean/bfuse_2d/A5 b/tests/boolean/bfuse_2d/A5
index 76324b40fb..2f53984bb9 100644
--- a/tests/boolean/bfuse_2d/A5
+++ b/tests/boolean/bfuse_2d/A5
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge1.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge1.brep] b
 bfuse result a b
 set length 1045.95
 set nbsh_v 5
diff --git a/tests/boolean/bfuse_2d/A6 b/tests/boolean/bfuse_2d/A6
index 46210e340c..eec5fc9f7e 100644
--- a/tests/boolean/bfuse_2d/A6
+++ b/tests/boolean/bfuse_2d/A6
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge2.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge2.brep] b
 bfuse result a b
 set length 1157.7
 set nbsh_v 6
diff --git a/tests/boolean/bfuse_2d/A7 b/tests/boolean/bfuse_2d/A7
index e275a538d1..5ad9571636 100644
--- a/tests/boolean/bfuse_2d/A7
+++ b/tests/boolean/bfuse_2d/A7
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge3.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge3.brep] b
 bfuse result a b
 set length 1252.16
 set nbsh_v 7
diff --git a/tests/boolean/bfuse_2d/A8 b/tests/boolean/bfuse_2d/A8
index a91dc61399..f73c6ea4da 100644
--- a/tests/boolean/bfuse_2d/A8
+++ b/tests/boolean/bfuse_2d/A8
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge4.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge4.brep] b
 bfuse result a b
 set length 1127.57
 set nbsh_v 7
diff --git a/tests/boolean/bfuse_2d/A9 b/tests/boolean/bfuse_2d/A9
index b3ec740f27..063bbace6c 100644
--- a/tests/boolean/bfuse_2d/A9
+++ b/tests/boolean/bfuse_2d/A9
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge5.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge5.brep] b
 bfuse result a b
 set length 1316.05
 set nbsh_v 7
diff --git a/tests/boolean/bfuse_2d/B1 b/tests/boolean/bfuse_2d/B1
index 962e60ac9b..33fdf540b5 100644
--- a/tests/boolean/bfuse_2d/B1
+++ b/tests/boolean/bfuse_2d/B1
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_wire1.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_wire1.brep] b
 bfuse result a b
 set length 1809.78
 set nbsh_v 8
diff --git a/tests/boolean/bfuse_2d/B2 b/tests/boolean/bfuse_2d/B2
index 74f19cc336..5d4adf82d5 100644
--- a/tests/boolean/bfuse_2d/B2
+++ b/tests/boolean/bfuse_2d/B2
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_wire2.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_wire2.brep] b
 bfuse result a b
 set length 1982.81
 set nbsh_v 10
diff --git a/tests/boolean/bfuse_2d/B3 b/tests/boolean/bfuse_2d/B3
index c1568bbe54..8899e20a92 100644
--- a/tests/boolean/bfuse_2d/B3
+++ b/tests/boolean/bfuse_2d/B3
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_wire3.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_wire3.brep] b
 bfuse result a b
 set length 2046.69
 set nbsh_v 10
diff --git a/tests/boolean/bfuse_2d/B4 b/tests/boolean/bfuse_2d/B4
index 7fba6cf6ab..6c78f85e83 100644
--- a/tests/boolean/bfuse_2d/B4
+++ b/tests/boolean/bfuse_2d/B4
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge1.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge1.brep] b
 bfuse result a b
 set length 613.678
 set nbsh_v 4
diff --git a/tests/boolean/bfuse_2d/B5 b/tests/boolean/bfuse_2d/B5
index 087fbc8cdc..76be41ee19 100644
--- a/tests/boolean/bfuse_2d/B5
+++ b/tests/boolean/bfuse_2d/B5
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge2.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge2.brep] b
 bfuse result a b
 set length 725.427
 set nbsh_v 4
diff --git a/tests/boolean/bfuse_2d/B6 b/tests/boolean/bfuse_2d/B6
index 2bb567f84f..3b6960f21d 100644
--- a/tests/boolean/bfuse_2d/B6
+++ b/tests/boolean/bfuse_2d/B6
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge3.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge3.brep] b
 bfuse result a b
 set length 963.678
 set nbsh_v 5
diff --git a/tests/boolean/bfuse_2d/B7 b/tests/boolean/bfuse_2d/B7
index cfce38a420..9585b474c5 100644
--- a/tests/boolean/bfuse_2d/B7
+++ b/tests/boolean/bfuse_2d/B7
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge4.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge4.brep] b
 bfuse result a b
 set length 695.295
 set nbsh_v 4
diff --git a/tests/boolean/bfuse_2d/B8 b/tests/boolean/bfuse_2d/B8
index eec065f139..91ee901840 100644
--- a/tests/boolean/bfuse_2d/B8
+++ b/tests/boolean/bfuse_2d/B8
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge5.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge5.brep] b
 bfuse result a b
 set length 963.678
 set nbsh_v 4
diff --git a/tests/boolean/bfuse_2d/B9 b/tests/boolean/bfuse_2d/B9
index 2617153609..62250b64dc 100644
--- a/tests/boolean/bfuse_2d/B9
+++ b/tests/boolean/bfuse_2d/B9
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_wire1.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_wire1.brep] b
 bfuse result a b
 set length 1377.51
 set nbsh_v 7
diff --git a/tests/boolean/bfuse_2d/C1 b/tests/boolean/bfuse_2d/C1
index 192b5badbc..2d0d2e6ab4 100644
--- a/tests/boolean/bfuse_2d/C1
+++ b/tests/boolean/bfuse_2d/C1
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_wire2.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_wire2.brep] b
 bfuse result a b
 set length 1694.32
 set nbsh_v 8
diff --git a/tests/boolean/bfuse_2d/C2 b/tests/boolean/bfuse_2d/C2
index f77e76bbec..9001bd3601 100644
--- a/tests/boolean/bfuse_2d/C2
+++ b/tests/boolean/bfuse_2d/C2
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_wire3.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_wire3.brep] b
 bfuse result a b
 set length 1694.32
 set nbsh_v 7
diff --git a/tests/boolean/bfuse_2d/C3 b/tests/boolean/bfuse_2d/C3
index d04cb6c6a9..fe75e10ba0 100644
--- a/tests/boolean/bfuse_2d/C3
+++ b/tests/boolean/bfuse_2d/C3
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge1.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge1.brep] b
 bfuse result a b
 set length 613.678
 set nbsh_v 4
diff --git a/tests/boolean/bfuse_2d/C4 b/tests/boolean/bfuse_2d/C4
index abbcf5795f..785e82d600 100644
--- a/tests/boolean/bfuse_2d/C4
+++ b/tests/boolean/bfuse_2d/C4
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge2.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge2.brep] b
 bfuse result a b
 set length 725.427
 set nbsh_v 4
diff --git a/tests/boolean/bfuse_2d/C5 b/tests/boolean/bfuse_2d/C5
index 47654127cd..51b927274b 100644
--- a/tests/boolean/bfuse_2d/C5
+++ b/tests/boolean/bfuse_2d/C5
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge3.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge3.brep] b
 bfuse result a b
 set length 963.678
 set nbsh_v 5
diff --git a/tests/boolean/bfuse_2d/C6 b/tests/boolean/bfuse_2d/C6
index b576d4fbf0..b67ff0ce9d 100644
--- a/tests/boolean/bfuse_2d/C6
+++ b/tests/boolean/bfuse_2d/C6
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge4.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge4.brep] b
 bfuse result a b
 set length 695.295
 set nbsh_v 4
diff --git a/tests/boolean/bfuse_2d/C7 b/tests/boolean/bfuse_2d/C7
index cfa381d29c..1f731fb4fc 100644
--- a/tests/boolean/bfuse_2d/C7
+++ b/tests/boolean/bfuse_2d/C7
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge5.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge5.brep] b
 bfuse result a b
 set length 963.678
 set nbsh_v 4
diff --git a/tests/boolean/bfuse_2d/C8 b/tests/boolean/bfuse_2d/C8
index 8964990070..0ffb066f10 100644
--- a/tests/boolean/bfuse_2d/C8
+++ b/tests/boolean/bfuse_2d/C8
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_wire1.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_wire1.brep] b
 bfuse result a b
 set length 1377.51
 set nbsh_v 7
diff --git a/tests/boolean/bfuse_2d/C9 b/tests/boolean/bfuse_2d/C9
index 65e2fd1780..309479a1e1 100644
--- a/tests/boolean/bfuse_2d/C9
+++ b/tests/boolean/bfuse_2d/C9
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_wire2.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_wire2.brep] b
 bfuse result a b
 set length 1694.32
 set nbsh_v 8
diff --git a/tests/boolean/bfuse_2d/D1 b/tests/boolean/bfuse_2d/D1
index 3de73980c9..cf82d7217a 100644
--- a/tests/boolean/bfuse_2d/D1
+++ b/tests/boolean/bfuse_2d/D1
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_wire3.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_wire3.brep] b
 bfuse result a b
 set length 1694.32
 set nbsh_v 7
diff --git a/tests/boolean/bfuse_complex/A1 b/tests/boolean/bfuse_complex/A1
index d2cc97c82c..e71fa0b2a0 100644
--- a/tests/boolean/bfuse_complex/A1
+++ b/tests/boolean/bfuse_complex/A1
@@ -1,5 +1,5 @@
-restore cts20976a.rle a
-restore cts20976b.rle b
+restore [locate_data_file cts20976a.rle] a
+restore [locate_data_file cts20976b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/A2 b/tests/boolean/bfuse_complex/A2
index 38d30bbf54..a6d647a5a2 100644
--- a/tests/boolean/bfuse_complex/A2
+++ b/tests/boolean/bfuse_complex/A2
@@ -1,5 +1,5 @@
-restore fra61083a.rle a
-restore fra61083b.rle b
+restore [locate_data_file fra61083a.rle] a
+restore [locate_data_file fra61083b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/A3 b/tests/boolean/bfuse_complex/A3
index 0454beb56f..c6e65deda2 100644
--- a/tests/boolean/bfuse_complex/A3
+++ b/tests/boolean/bfuse_complex/A3
@@ -1,5 +1,5 @@
-restore cts21184a.rle a
-restore cts21184b.rle b
+restore [locate_data_file cts21184a.rle] a
+restore [locate_data_file cts21184b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/A4 b/tests/boolean/bfuse_complex/A4
index d8c30a4b64..e3a88557f0 100644
--- a/tests/boolean/bfuse_complex/A4
+++ b/tests/boolean/bfuse_complex/A4
@@ -1,5 +1,5 @@
-restore f2 b1
-restore f6 b2
+restore [locate_data_file f2] b1
+restore [locate_data_file f6] b2
 
 bfuse result b1 b2
 
diff --git a/tests/boolean/bfuse_complex/A5 b/tests/boolean/bfuse_complex/A5
index 6dba9c4337..7016f331c4 100644
--- a/tests/boolean/bfuse_complex/A5
+++ b/tests/boolean/bfuse_complex/A5
@@ -1,5 +1,5 @@
-restore f7 b1
-restore f3 b2
+restore [locate_data_file f7] b1
+restore [locate_data_file f3] b2
 
 bfuse result b1 b2
 
diff --git a/tests/boolean/bfuse_complex/A6 b/tests/boolean/bfuse_complex/A6
index 2dfe2daeb8..2250932233 100644
--- a/tests/boolean/bfuse_complex/A6
+++ b/tests/boolean/bfuse_complex/A6
@@ -1,5 +1,5 @@
-restore f2 b1
-restore f5 b2
+restore [locate_data_file f2] b1
+restore [locate_data_file f5] b2
 
 bfuse result b1 b2
 
diff --git a/tests/boolean/bfuse_complex/A7 b/tests/boolean/bfuse_complex/A7
index 9ddd14343f..660883b043 100644
--- a/tests/boolean/bfuse_complex/A7
+++ b/tests/boolean/bfuse_complex/A7
@@ -1,5 +1,5 @@
-restore f4 b1
-restore f5 b2
+restore [locate_data_file f4] b1
+restore [locate_data_file f5] b2
 
 bfuse result b1 b2
 
diff --git a/tests/boolean/bfuse_complex/A8 b/tests/boolean/bfuse_complex/A8
index f2b7f4ba6b..0d8e826088 100644
--- a/tests/boolean/bfuse_complex/A8
+++ b/tests/boolean/bfuse_complex/A8
@@ -1,5 +1,5 @@
-restore f1 b1
-restore f5 b2
+restore [locate_data_file f1] b1
+restore [locate_data_file f5] b2
 
 bfuse result b1 b2
 
diff --git a/tests/boolean/bfuse_complex/A9 b/tests/boolean/bfuse_complex/A9
index 691221bb30..4785cd2605 100644
--- a/tests/boolean/bfuse_complex/A9
+++ b/tests/boolean/bfuse_complex/A9
@@ -1,5 +1,5 @@
-restore f1 b1
-restore f4 b2
+restore [locate_data_file f1] b1
+restore [locate_data_file f4] b2
 
 bfuse result b1 b2
 
diff --git a/tests/boolean/bfuse_complex/B1 b/tests/boolean/bfuse_complex/B1
index 14171933b2..b01aa0a888 100644
--- a/tests/boolean/bfuse_complex/B1
+++ b/tests/boolean/bfuse_complex/B1
@@ -1,5 +1,5 @@
-restore f2 b1
-restore f3 b2
+restore [locate_data_file f2] b1
+restore [locate_data_file f3] b2
 
 bfuse result b1 b2
 
diff --git a/tests/boolean/bfuse_complex/B2 b/tests/boolean/bfuse_complex/B2
index 28c19d9374..9e0ec0c613 100644
--- a/tests/boolean/bfuse_complex/B2
+++ b/tests/boolean/bfuse_complex/B2
@@ -1,5 +1,5 @@
-restore f3 b1
-restore f4 b2
+restore [locate_data_file f3] b1
+restore [locate_data_file f4] b2
 
 bfuse result b1 b2
 
diff --git a/tests/boolean/bfuse_complex/B3 b/tests/boolean/bfuse_complex/B3
index da8c6b7971..b7c0590ba4 100644
--- a/tests/boolean/bfuse_complex/B3
+++ b/tests/boolean/bfuse_complex/B3
@@ -1,5 +1,5 @@
-restore f3 b1
-restore f5 b2
+restore [locate_data_file f3] b1
+restore [locate_data_file f5] b2
 
 bfuse result b1 b2
 
diff --git a/tests/boolean/bfuse_complex/B4 b/tests/boolean/bfuse_complex/B4
index 05d8ccb30c..072663e574 100644
--- a/tests/boolean/bfuse_complex/B4
+++ b/tests/boolean/bfuse_complex/B4
@@ -1,5 +1,5 @@
-restore f1 b1
-restore f41 b2
+restore [locate_data_file f1] b1
+restore [locate_data_file f41] b2
 
 bfuse result b1 b2
 
diff --git a/tests/boolean/bfuse_complex/B5 b/tests/boolean/bfuse_complex/B5
index cfd63762c8..00dff4f957 100644
--- a/tests/boolean/bfuse_complex/B5
+++ b/tests/boolean/bfuse_complex/B5
@@ -1,5 +1,5 @@
-restore so1 b1
-restore so4 b2
+restore [locate_data_file so1] b1
+restore [locate_data_file so4] b2
 
 bfuse result b1 b2
 
diff --git a/tests/boolean/bfuse_complex/B6 b/tests/boolean/bfuse_complex/B6
index e0ac984a0e..154ec6c9cc 100644
--- a/tests/boolean/bfuse_complex/B6
+++ b/tests/boolean/bfuse_complex/B6
@@ -1,5 +1,5 @@
-restore so1 b1
-restore so2 b2
+restore [locate_data_file so1] b1
+restore [locate_data_file so2] b2
 
 bfuse result b1 b2
 
diff --git a/tests/boolean/bfuse_complex/B7 b/tests/boolean/bfuse_complex/B7
index 272d4252a4..449ac63374 100644
--- a/tests/boolean/bfuse_complex/B7
+++ b/tests/boolean/bfuse_complex/B7
@@ -1,5 +1,5 @@
-restore so2 b1
-restore so3 b2
+restore [locate_data_file so2] b1
+restore [locate_data_file so3] b2
 
 bfuse result b1 b2
 
diff --git a/tests/boolean/bfuse_complex/B8 b/tests/boolean/bfuse_complex/B8
index dc95aa828f..1b0120bbe0 100644
--- a/tests/boolean/bfuse_complex/B8
+++ b/tests/boolean/bfuse_complex/B8
@@ -1,5 +1,5 @@
-restore so4 b1
-restore so2 b2
+restore [locate_data_file so4] b1
+restore [locate_data_file so2] b2
 
 bfuse result b1 b2
 
diff --git a/tests/boolean/bfuse_complex/B9 b/tests/boolean/bfuse_complex/B9
index 50bb952e19..b48adc3f45 100644
--- a/tests/boolean/bfuse_complex/B9
+++ b/tests/boolean/bfuse_complex/B9
@@ -1,5 +1,5 @@
-restore so5 b1
-restore so2 b2
+restore [locate_data_file so5] b1
+restore [locate_data_file so2] b2
 
 bfuse result b1 b2
 
diff --git a/tests/boolean/bfuse_complex/C1 b/tests/boolean/bfuse_complex/C1
index a65ea6ebe6..d769ac3cea 100644
--- a/tests/boolean/bfuse_complex/C1
+++ b/tests/boolean/bfuse_complex/C1
@@ -1,5 +1,5 @@
-restore so3 b1
-restore so7 b2
+restore [locate_data_file so3] b1
+restore [locate_data_file so7] b2
 
 bfuse result b1 b2
 
diff --git a/tests/boolean/bfuse_complex/C2 b/tests/boolean/bfuse_complex/C2
index 54977333ff..3c6a13aba2 100644
--- a/tests/boolean/bfuse_complex/C2
+++ b/tests/boolean/bfuse_complex/C2
@@ -1,5 +1,5 @@
-restore so2 b1
-restore so7 b2
+restore [locate_data_file so2] b1
+restore [locate_data_file so7] b2
 
 bfuse result b1 b2
 
diff --git a/tests/boolean/bfuse_complex/C3 b/tests/boolean/bfuse_complex/C3
index 7bf897d31a..cd2371b03d 100644
--- a/tests/boolean/bfuse_complex/C3
+++ b/tests/boolean/bfuse_complex/C3
@@ -1,5 +1,5 @@
-restore so2 b1
-restore so6 b2
+restore [locate_data_file so2] b1
+restore [locate_data_file so6] b2
 
 bfuse result b1 b2
 
diff --git a/tests/boolean/bfuse_complex/C4 b/tests/boolean/bfuse_complex/C4
index 22ad4e94c4..599640e722 100644
--- a/tests/boolean/bfuse_complex/C4
+++ b/tests/boolean/bfuse_complex/C4
@@ -1,5 +1,5 @@
-restore box.brep b
-restore c2.brep c
+restore [locate_data_file box.brep] b
+restore [locate_data_file c2.brep] c
 
 bfuse result b c
 
diff --git a/tests/boolean/bfuse_complex/C5 b/tests/boolean/bfuse_complex/C5
index c8fee6436a..63e3458d0e 100644
--- a/tests/boolean/bfuse_complex/C5
+++ b/tests/boolean/bfuse_complex/C5
@@ -1,5 +1,5 @@
-restore c2.brep c
-restore box.brep b
+restore [locate_data_file c2.brep] c
+restore [locate_data_file box.brep] b
 
 bfuse result c b
 
diff --git a/tests/boolean/bfuse_complex/C6 b/tests/boolean/bfuse_complex/C6
index 39f90c6a2a..d317d75bd2 100644
--- a/tests/boolean/bfuse_complex/C6
+++ b/tests/boolean/bfuse_complex/C6
@@ -4,11 +4,11 @@
 dset SCALE 100
 
 ## restore the Prismed oblong (size 200 mm)
-restore pro7637_prism_oblong.rle p1
+restore [locate_data_file pro7637_prism_oblong.rle] p1
 tscale p1 0 0 0 1*SCALE
 
 ## Box creation (size 300 mm)
-restore pro7637_box.rle p2
+restore [locate_data_file pro7637_box.rle] p2
 tscale p2 0 0 0 1*SCALE
 
 bfuse result p2 p1
diff --git a/tests/boolean/bfuse_complex/C7 b/tests/boolean/bfuse_complex/C7
index 24946a369d..6c06d274cc 100644
--- a/tests/boolean/bfuse_complex/C7
+++ b/tests/boolean/bfuse_complex/C7
@@ -4,11 +4,11 @@
 dset SCALE 100
 
 ## restore the Prismed oblong created in Designer K1-2 (size 200 mm)
-restore pro7637c_prism_oblong_dsg.rle p1
+restore [locate_data_file pro7637c_prism_oblong_dsg.rle] p1
 tscale p1 0 0 0 1*SCALE
 
 ## restore the Box created in Designer K1-2 (size 300 mm)
-restore pro7637c_box_dsg.rle p2
+restore [locate_data_file pro7637c_box_dsg.rle] p2
 tscale p2 0 0 0 1*SCALE
 
 bfuse result p2 p1
diff --git a/tests/boolean/bfuse_complex/C8 b/tests/boolean/bfuse_complex/C8
index 2c0b508295..9eb8c30f40 100644
--- a/tests/boolean/bfuse_complex/C8
+++ b/tests/boolean/bfuse_complex/C8
@@ -4,11 +4,11 @@
 dset SCALE 100
 
 ## restore the revol created in Designer ED2FCS (size ? mm)
-restore cts40185_top.rle p1
+restore [locate_data_file cts40185_top.rle] p1
 tscale p1 0 0 0 1*SCALE
 
 ## restore the prismed oblong (size ? mm)
-restore cts40185_ailette.rle p2
+restore [locate_data_file cts40185_ailette.rle] p2
 tscale p2 0 0 0 1*SCALE
 
 bfuse result p2 p1
diff --git a/tests/boolean/bfuse_complex/C9 b/tests/boolean/bfuse_complex/C9
index 29b7380cf9..343904bc83 100644
--- a/tests/boolean/bfuse_complex/C9
+++ b/tests/boolean/bfuse_complex/C9
@@ -1,8 +1,8 @@
 # Original bug : cts16184
 # Date : 11mar98
 
-restore cts16184a.shape a
-restore cts16184b.shape b
+restore [locate_data_file cts16184a.shape] a
+restore [locate_data_file cts16184b.shape] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/D1 b/tests/boolean/bfuse_complex/D1
index 297d55fe2e..934faaaa10 100644
--- a/tests/boolean/bfuse_complex/D1
+++ b/tests/boolean/bfuse_complex/D1
@@ -1,8 +1,8 @@
 # Original bug : cts19474
 # Date : 11mar98
 
-restore cts19474part.rle part
-restore cts19474tool.rle tool
+restore [locate_data_file cts19474part.rle] part
+restore [locate_data_file cts19474tool.rle] tool
 
 bfuse result part tool
 
diff --git a/tests/boolean/bfuse_complex/D2 b/tests/boolean/bfuse_complex/D2
index aa0697fe1b..745ebe6a00 100644
--- a/tests/boolean/bfuse_complex/D2
+++ b/tests/boolean/bfuse_complex/D2
@@ -1,9 +1,9 @@
 # Original bug : ger60039
 # Date : 11mar98
 
-restore ger60039a.shape a
+restore [locate_data_file ger60039a.shape] a
 fsameparameter a
-restore ger60039b.shape b 
+restore [locate_data_file ger60039b.shape] b 
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/D3 b/tests/boolean/bfuse_complex/D3
index 2a8fc3e5e9..7c822dd656 100644
--- a/tests/boolean/bfuse_complex/D3
+++ b/tests/boolean/bfuse_complex/D3
@@ -1,9 +1,9 @@
 # Original bug : ger60041
 # Date : 11mar98 
 
-restore ger60041a.rle a
+restore [locate_data_file ger60041a.rle] a
 fsameparameter a
-restore ger60041b.rle b
+restore [locate_data_file ger60041b.rle] b
 
 bfuse result a b 
 
diff --git a/tests/boolean/bfuse_complex/D4 b/tests/boolean/bfuse_complex/D4
index 1311cddcf6..6fdb7a1d7f 100644
--- a/tests/boolean/bfuse_complex/D4
+++ b/tests/boolean/bfuse_complex/D4
@@ -3,8 +3,8 @@
 
 puts "TODO #22911 Mandriva2010: Faulty shapes in variables faulty_1 to faulty_2"
 
-restore ger60054a.rle a
-restore ger60054b.rle b
+restore [locate_data_file ger60054a.rle] a
+restore [locate_data_file ger60054b.rle] b
 fsameparameter a
 fsameparameter b
 
diff --git a/tests/boolean/bfuse_complex/D5 b/tests/boolean/bfuse_complex/D5
index 16fbbfdf15..49092fcfd2 100644
--- a/tests/boolean/bfuse_complex/D5
+++ b/tests/boolean/bfuse_complex/D5
@@ -1,8 +1,8 @@
 # Original bug : ksi0014
 # Date : 11mar98
 
-restore ksi0014a.rle a
-restore ksi0014b.rle b
+restore [locate_data_file ksi0014a.rle] a
+restore [locate_data_file ksi0014b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/D6 b/tests/boolean/bfuse_complex/D6
index 05f95bd697..6ef6a0b270 100644
--- a/tests/boolean/bfuse_complex/D6
+++ b/tests/boolean/bfuse_complex/D6
@@ -1,8 +1,8 @@
 # Original bug : pro6050
 # Date : 11mar98
 
-restore pro6050a.rle a
-restore pro6050b.rle b
+restore [locate_data_file pro6050a.rle] a
+restore [locate_data_file pro6050b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/D7 b/tests/boolean/bfuse_complex/D7
index 2edd553f00..cb9cd92ccc 100644
--- a/tests/boolean/bfuse_complex/D7
+++ b/tests/boolean/bfuse_complex/D7
@@ -1,8 +1,8 @@
 # Original bug : pro6965
 # Date : 11mar98
 
-restore pro6965a.rle a
-restore pro6965b.rle b
+restore [locate_data_file pro6965a.rle] a
+restore [locate_data_file pro6965b.rle] b
 
 bfuse result a b 
 
diff --git a/tests/boolean/bfuse_complex/D8 b/tests/boolean/bfuse_complex/D8
index 709af9b18e..b05f0d65af 100644
--- a/tests/boolean/bfuse_complex/D8
+++ b/tests/boolean/bfuse_complex/D8
@@ -1,8 +1,8 @@
 # Original bug : pro11172
 # Date : 11mar98
 
-restore pro11172a.rle a
-restore pro11172b.rle b
+restore [locate_data_file pro11172a.rle] a
+restore [locate_data_file pro11172b.rle] b
 
 bfuse result a b 
 
diff --git a/tests/boolean/bfuse_complex/D9 b/tests/boolean/bfuse_complex/D9
index fa67c3d5ed..46dc78682b 100644
--- a/tests/boolean/bfuse_complex/D9
+++ b/tests/boolean/bfuse_complex/D9
@@ -1,8 +1,8 @@
 # Original bug : pro12559
 # Date : 19mar98
 
-restore pro12559a.rle a
-restore pro12559b.rle b
+restore [locate_data_file pro12559a.rle] a
+restore [locate_data_file pro12559b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/E1 b/tests/boolean/bfuse_complex/E1
index d0de5664c2..6281264b5f 100644
--- a/tests/boolean/bfuse_complex/E1
+++ b/tests/boolean/bfuse_complex/E1
@@ -1,7 +1,7 @@
 # Original bug FRA11018: 
 # Date : 19mar98
-restore fra11018a.rle a
-restore fra11018b.rle b
+restore [locate_data_file fra11018a.rle] a
+restore [locate_data_file fra11018b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/E2 b/tests/boolean/bfuse_complex/E2
index 602a50f6c7..f992fac363 100644
--- a/tests/boolean/bfuse_complex/E2
+++ b/tests/boolean/bfuse_complex/E2
@@ -1,9 +1,9 @@
 # Original bug : cts60005
 # Date : 19mar98
 
-restore cts60005a.rle a
+restore [locate_data_file cts60005a.rle] a
 fsameparameter a
-restore cts60005b.rle b
+restore [locate_data_file cts60005b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/E3 b/tests/boolean/bfuse_complex/E3
index d49aefa34f..b9401eaf10 100644
--- a/tests/boolean/bfuse_complex/E3
+++ b/tests/boolean/bfuse_complex/E3
@@ -1,8 +1,8 @@
 # Original bug : pro8934
 # Date : 19mar98
 
-restore pro8934a.rle a
-restore pro8934b.rle b
+restore [locate_data_file pro8934a.rle] a
+restore [locate_data_file pro8934b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/E4 b/tests/boolean/bfuse_complex/E4
index b108875176..d57f774305 100644
--- a/tests/boolean/bfuse_complex/E4
+++ b/tests/boolean/bfuse_complex/E4
@@ -1,8 +1,8 @@
 # Original bug : pro14260
 # Date : 21 Sept 98
 
-restore pro14260c.rle c
-restore pro14260d.rle d
+restore [locate_data_file pro14260c.rle] c
+restore [locate_data_file pro14260d.rle] d
 
 bfuse result c d
 
diff --git a/tests/boolean/bfuse_complex/E5 b/tests/boolean/bfuse_complex/E5
index a02f8973d1..908811e97c 100644
--- a/tests/boolean/bfuse_complex/E5
+++ b/tests/boolean/bfuse_complex/E5
@@ -1,8 +1,8 @@
 # Original bug : pro9476
 # Date : 20mar98
 
-restore pro9476-part.rle part
-restore pro9476-tool.rle tool
+restore [locate_data_file pro9476-part.rle] part
+restore [locate_data_file pro9476-tool.rle] tool
 
 bfuse result part tool
 
diff --git a/tests/boolean/bfuse_complex/E6 b/tests/boolean/bfuse_complex/E6
index 710c3976ea..dbc575b10f 100644
--- a/tests/boolean/bfuse_complex/E6
+++ b/tests/boolean/bfuse_complex/E6
@@ -1,8 +1,8 @@
 # Original bug : pro10505   
 # Date : 20mar98
 
-restore pro10505a.rle a
-restore pro10505b.rle b
+restore [locate_data_file pro10505a.rle] a
+restore [locate_data_file pro10505b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/E7 b/tests/boolean/bfuse_complex/E7
index 1b49f55562..73eb4d7cdc 100644
--- a/tests/boolean/bfuse_complex/E7
+++ b/tests/boolean/bfuse_complex/E7
@@ -1,9 +1,9 @@
 # Original bug : cts 19304
 # Date : 23mar98
 
-restore cts19304a.rle a
-restore cts19304b.rle b
-restore cts19304c.rle c
+restore [locate_data_file cts19304a.rle] a
+restore [locate_data_file cts19304b.rle] b
+restore [locate_data_file cts19304c.rle] c
 
 mkplane af a 
 mkplane bf b
diff --git a/tests/boolean/bfuse_complex/E8 b/tests/boolean/bfuse_complex/E8
index 77fb2e9762..e15d76cd3b 100644
--- a/tests/boolean/bfuse_complex/E8
+++ b/tests/boolean/bfuse_complex/E8
@@ -1,8 +1,8 @@
 # Original bug : ger60239
 # Date : 23mar98
 
-restore ger60239a.rle a
-restore ger60239b.rle b
+restore [locate_data_file ger60239a.rle] a
+restore [locate_data_file ger60239b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/E9 b/tests/boolean/bfuse_complex/E9
index 2d0a9a2d27..7fffbe06d8 100644
--- a/tests/boolean/bfuse_complex/E9
+++ b/tests/boolean/bfuse_complex/E9
@@ -1,8 +1,8 @@
 # Original bug : pro7934
 # Date : 23mar98
 
-restore pro7934a.rle a
-restore pro7934b.rle b
+restore [locate_data_file pro7934a.rle] a
+restore [locate_data_file pro7934b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/F1 b/tests/boolean/bfuse_complex/F1
index 9ef91b0b22..fffd9c7f98 100644
--- a/tests/boolean/bfuse_complex/F1
+++ b/tests/boolean/bfuse_complex/F1
@@ -3,8 +3,8 @@
 
 puts "TODO OCC23099 Mandriva2010: Faulty shapes in variables faulty_1 to faulty_"
 
-restore pro12696a.rle a
-restore pro12696b.rle b
+restore [locate_data_file pro12696a.rle] a
+restore [locate_data_file pro12696b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/F2 b/tests/boolean/bfuse_complex/F2
index 357b53b97f..a5e83fafb3 100644
--- a/tests/boolean/bfuse_complex/F2
+++ b/tests/boolean/bfuse_complex/F2
@@ -1,8 +1,8 @@
 # Original bug : pro12695
 # Date : 24mar98
 
-restore pro12695a.rle a
-restore pro12695b.rle b
+restore [locate_data_file pro12695a.rle] a
+restore [locate_data_file pro12695b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/F3 b/tests/boolean/bfuse_complex/F3
index 3e8a001566..23bccb0e49 100644
--- a/tests/boolean/bfuse_complex/F3
+++ b/tests/boolean/bfuse_complex/F3
@@ -1,8 +1,8 @@
 # Original bug : pro6110
 # Date : 24mar98
 
-restore pro6110a.rle a
-restore pro6110b.rle b
+restore [locate_data_file pro6110a.rle] a
+restore [locate_data_file pro6110b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/F4 b/tests/boolean/bfuse_complex/F4
index f49562b7d3..02a9474ae9 100644
--- a/tests/boolean/bfuse_complex/F4
+++ b/tests/boolean/bfuse_complex/F4
@@ -1,8 +1,8 @@
 # Original bug : pro10494
 # Date : 24mar98
 
-restore pro10494b.rle b
-restore pro10494c.rle c
+restore [locate_data_file pro10494b.rle] b
+restore [locate_data_file pro10494c.rle] c
 
 bfuse result b c
 
diff --git a/tests/boolean/bfuse_complex/F5 b/tests/boolean/bfuse_complex/F5
index b885318e23..00daf2fa3c 100644
--- a/tests/boolean/bfuse_complex/F5
+++ b/tests/boolean/bfuse_complex/F5
@@ -1,8 +1,8 @@
 # Original bug : pro10658
 # Date : 24mar98
 
-restore pro10658a.rle a
-restore pro10658b.rle b
+restore [locate_data_file pro10658a.rle] a
+restore [locate_data_file pro10658b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/F6 b/tests/boolean/bfuse_complex/F6
index ddd28527f3..c8a8ef8bed 100644
--- a/tests/boolean/bfuse_complex/F6
+++ b/tests/boolean/bfuse_complex/F6
@@ -1,8 +1,8 @@
 # Original bug : pro12896
 # Date : 30mar98
 
-restore pro12896a.rle a
-restore pro12896b.rle b
+restore [locate_data_file pro12896a.rle] a
+restore [locate_data_file pro12896b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/F7 b/tests/boolean/bfuse_complex/F7
index e869c0342a..fe055590dc 100644
--- a/tests/boolean/bfuse_complex/F7
+++ b/tests/boolean/bfuse_complex/F7
@@ -1,7 +1,7 @@
 # Original bug :pro14621
 
-restore pro14621c.rle  base
-restore pro14621d.rle  prism
+restore [locate_data_file pro14621c.rle]  base
+restore [locate_data_file pro14621d.rle]  prism
 
 bcut res1 prism base
 
diff --git a/tests/boolean/bfuse_complex/F8 b/tests/boolean/bfuse_complex/F8
index 59932b247d..7245cc7000 100644
--- a/tests/boolean/bfuse_complex/F8
+++ b/tests/boolean/bfuse_complex/F8
@@ -1,8 +1,8 @@
 # Original bug : pro12913
 # Date : 24mar98
 
-restore pro12913a.rle a
-restore pro12913b.rle b
+restore [locate_data_file pro12913a.rle] a
+restore [locate_data_file pro12913b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/F9 b/tests/boolean/bfuse_complex/F9
index cb2ff04396..de5c7f7ad0 100644
--- a/tests/boolean/bfuse_complex/F9
+++ b/tests/boolean/bfuse_complex/F9
@@ -1,8 +1,8 @@
 # Original bug : cts20124
 # Date : 24mar98
 
-restore cts20124a.rle a
-restore cts20124b.rle b
+restore [locate_data_file cts20124a.rle] a
+restore [locate_data_file cts20124b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/G1 b/tests/boolean/bfuse_complex/G1
index fae78c1aef..07a576e3ba 100644
--- a/tests/boolean/bfuse_complex/G1
+++ b/tests/boolean/bfuse_complex/G1
@@ -2,8 +2,8 @@
 # Date : 21 sept 98
 
 
-restore cts21197c.rle part
-restore cts21197d.rle tool
+restore [locate_data_file cts21197c.rle] part
+restore [locate_data_file cts21197d.rle] tool
 
 bfuse result part tool
 
diff --git a/tests/boolean/bfuse_complex/G2 b/tests/boolean/bfuse_complex/G2
index 36cf945a23..eaf8583ccf 100644
--- a/tests/boolean/bfuse_complex/G2
+++ b/tests/boolean/bfuse_complex/G2
@@ -1,8 +1,8 @@
 # Original bug : cts21180
 # Date : 21 Sept 98
 
-restore cts21180c.rle part
-restore cts21180d.rle tool
+restore [locate_data_file cts21180c.rle] part
+restore [locate_data_file cts21180d.rle] tool
 updatetolerance tool 1
 
 bfuse result part tool
diff --git a/tests/boolean/bfuse_complex/G3 b/tests/boolean/bfuse_complex/G3
index f187b20c6b..8b3ce3d596 100644
--- a/tests/boolean/bfuse_complex/G3
+++ b/tests/boolean/bfuse_complex/G3
@@ -1,8 +1,8 @@
 # Original bug : cts20124
 # Date : 13Mai98
 
-restore  cts20124a.rle  a
-restore  cts20124b.rle  b
+restore [locate_data_file cts20124a.rle]  a
+restore [locate_data_file cts20124b.rle]  b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/G4 b/tests/boolean/bfuse_complex/G4
index d4500f3e09..9bfb56ad9b 100644
--- a/tests/boolean/bfuse_complex/G4
+++ b/tests/boolean/bfuse_complex/G4
@@ -1,8 +1,8 @@
 # Original bug : cts20171
 # Date : 13Mai98
 
-restore  cts20171_base  base
-restore  cts20171_outil  outil
+restore [locate_data_file cts20171_base]  base
+restore [locate_data_file cts20171_outil]  outil
 
 bfuse result base outil
 
diff --git a/tests/boolean/bfuse_complex/G5 b/tests/boolean/bfuse_complex/G5
index ad7d18a3e5..581b9f0d41 100644
--- a/tests/boolean/bfuse_complex/G5
+++ b/tests/boolean/bfuse_complex/G5
@@ -1,8 +1,8 @@
 # Original bug : cts20204
 # Date : 13Mai98
 
-restore  cts20204_base  base
-restore  cts20204_outil  outil
+restore [locate_data_file cts20204_base]  base
+restore [locate_data_file cts20204_outil]  outil
 
 bfuse result base outil
 
diff --git a/tests/boolean/bfuse_complex/G6 b/tests/boolean/bfuse_complex/G6
index 594f33096d..20166046b4 100644
--- a/tests/boolean/bfuse_complex/G6
+++ b/tests/boolean/bfuse_complex/G6
@@ -1,6 +1,6 @@
 
-restore  cts20205-base.rle  base
-restore  cts20205-outil.rle  outil
+restore [locate_data_file cts20205-base.rle]  base
+restore [locate_data_file cts20205-outil.rle]  outil
 
 bfuse result base outil
 
diff --git a/tests/boolean/bfuse_complex/G7 b/tests/boolean/bfuse_complex/G7
index 4bcfceac65..2983b0ad7d 100644
--- a/tests/boolean/bfuse_complex/G7
+++ b/tests/boolean/bfuse_complex/G7
@@ -1,8 +1,8 @@
 # Original bug : cts20216
 # Date : 13Mai98
 
-restore  cts20216_base.rle  base
-restore  cts20216_outil.rle  outil
+restore [locate_data_file cts20216_base.rle]  base
+restore [locate_data_file cts20216_outil.rle]  outil
 
 bfuse result base outil
 
diff --git a/tests/boolean/bfuse_complex/G8 b/tests/boolean/bfuse_complex/G8
index d5eab5d557..c9e52fd428 100644
--- a/tests/boolean/bfuse_complex/G8
+++ b/tests/boolean/bfuse_complex/G8
@@ -1,7 +1,7 @@
 # bug cts 20221 et cts20222
 
-restore  cts20222_base.rle  base
-restore  cts20222_outil.rle  outil
+restore [locate_data_file cts20222_base.rle]  base
+restore [locate_data_file cts20222_outil.rle]  outil
 
 bfuse result base outil
 
diff --git a/tests/boolean/bfuse_complex/G9 b/tests/boolean/bfuse_complex/G9
index 93f6de1cb6..6a7e966f13 100644
--- a/tests/boolean/bfuse_complex/G9
+++ b/tests/boolean/bfuse_complex/G9
@@ -2,8 +2,8 @@
 # Date : 13Mai98
 # A1.gi
 
-restore  cts20452a.rle a
-restore  cts20452b.rle b
+restore [locate_data_file cts20452a.rle] a
+restore [locate_data_file cts20452b.rle] b
 
 
 bfuse result a b
diff --git a/tests/boolean/bfuse_complex/H1 b/tests/boolean/bfuse_complex/H1
index 913f09d447..bf48e512ad 100644
--- a/tests/boolean/bfuse_complex/H1
+++ b/tests/boolean/bfuse_complex/H1
@@ -2,8 +2,8 @@
 # Date : 13Mai98
 # A2.gif
 
-restore cts20453b.rle b
-restore cts20453a.rle a
+restore [locate_data_file cts20453b.rle] b
+restore [locate_data_file cts20453a.rle] a
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/H2 b/tests/boolean/bfuse_complex/H2
index 9cc84902c0..64c5cc8350 100644
--- a/tests/boolean/bfuse_complex/H2
+++ b/tests/boolean/bfuse_complex/H2
@@ -3,8 +3,8 @@
 # A3.gif
 
 
-restore cts20454a.rle a
-restore cts20454b.rle b
+restore [locate_data_file cts20454a.rle] a
+restore [locate_data_file cts20454b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/H3 b/tests/boolean/bfuse_complex/H3
index 393bae5c20..f47f7775d1 100644
--- a/tests/boolean/bfuse_complex/H3
+++ b/tests/boolean/bfuse_complex/H3
@@ -2,8 +2,8 @@
 # Date : 13Mai98
 # A9.gif
 
-restore cts20457a.rle a
-restore cts20457b.rle b
+restore [locate_data_file cts20457a.rle] a
+restore [locate_data_file cts20457b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/H4 b/tests/boolean/bfuse_complex/H4
index 1650686529..c3b2784a09 100644
--- a/tests/boolean/bfuse_complex/H4
+++ b/tests/boolean/bfuse_complex/H4
@@ -2,8 +2,8 @@
 # Date : 13Mai98
 # B1.gif
 
-restore cts20458a.rle a
-restore cts20458b.rle b
+restore [locate_data_file cts20458a.rle] a
+restore [locate_data_file cts20458b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/H5 b/tests/boolean/bfuse_complex/H5
index ea315335ac..b0087eb3ea 100644
--- a/tests/boolean/bfuse_complex/H5
+++ b/tests/boolean/bfuse_complex/H5
@@ -2,9 +2,9 @@
 # Date : 13Mai98
 # B3
 
-restore cts20482a.rle a
-restore cts20482b.rle b
-restore cts20482c.rle c
+restore [locate_data_file cts20482a.rle] a
+restore [locate_data_file cts20482b.rle] b
+restore [locate_data_file cts20482c.rle] c
 
 bfuse result a b
 bfuse result result c
diff --git a/tests/boolean/bfuse_complex/H6 b/tests/boolean/bfuse_complex/H6
index b5c30589c5..d9d8092fd2 100644
--- a/tests/boolean/bfuse_complex/H6
+++ b/tests/boolean/bfuse_complex/H6
@@ -2,8 +2,8 @@
 # Date : 13Mai98
 # B5
 
-restore cts20484a.rle a
-restore cts20484b.rle b
+restore [locate_data_file cts20484a.rle] a
+restore [locate_data_file cts20484b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/H7 b/tests/boolean/bfuse_complex/H7
index af786a81bf..6ebf88dfb5 100644
--- a/tests/boolean/bfuse_complex/H7
+++ b/tests/boolean/bfuse_complex/H7
@@ -2,9 +2,9 @@
 # Date : 13Mai98
 # B6
 
-restore cts20486a.rle a
-restore cts20486b.rle b
-restore cts20486c.rle c
+restore [locate_data_file cts20486a.rle] a
+restore [locate_data_file cts20486b.rle] b
+restore [locate_data_file cts20486c.rle] c
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/H8 b/tests/boolean/bfuse_complex/H8
index 6f3519f752..b9d4c32962 100644
--- a/tests/boolean/bfuse_complex/H8
+++ b/tests/boolean/bfuse_complex/H8
@@ -2,8 +2,8 @@
 # Date : 13Mai98
 # B7
 
-restore cts20487a.rle a
-restore cts20487b.rle b
+restore [locate_data_file cts20487a.rle] a
+restore [locate_data_file cts20487b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/H9 b/tests/boolean/bfuse_complex/H9
index c8329bdd91..6521bcec43 100644
--- a/tests/boolean/bfuse_complex/H9
+++ b/tests/boolean/bfuse_complex/H9
@@ -2,8 +2,8 @@
 # Date : 13Mai98
 # C2
 
-restore cts20506a.rle a
-restore cts20506b.rle b
+restore [locate_data_file cts20506a.rle] a
+restore [locate_data_file cts20506b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/I1 b/tests/boolean/bfuse_complex/I1
index 83f36a51fb..c097b88a81 100644
--- a/tests/boolean/bfuse_complex/I1
+++ b/tests/boolean/bfuse_complex/I1
@@ -2,8 +2,8 @@
 # Date : 13Mai98
 # C3
 
-restore cts20492a.rle a
-restore cts20492b.rle b
+restore [locate_data_file cts20492a.rle] a
+restore [locate_data_file cts20492b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/I2 b/tests/boolean/bfuse_complex/I2
index fd94c24b98..fecadf3efe 100644
--- a/tests/boolean/bfuse_complex/I2
+++ b/tests/boolean/bfuse_complex/I2
@@ -2,8 +2,8 @@
 # Date : 13Mai98
 # C4
 
-restore cts20493a.rle a
-restore cts20493b.rle b
+restore [locate_data_file cts20493a.rle] a
+restore [locate_data_file cts20493b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/I3 b/tests/boolean/bfuse_complex/I3
index af182fc7a8..cf28597af5 100644
--- a/tests/boolean/bfuse_complex/I3
+++ b/tests/boolean/bfuse_complex/I3
@@ -2,8 +2,8 @@
 # Date : 13Mai98
 # C5
 
-restore cts20494a.rle a
-restore cts20494b.rle b
+restore [locate_data_file cts20494a.rle] a
+restore [locate_data_file cts20494b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/I4 b/tests/boolean/bfuse_complex/I4
index 3821cde725..a1026f3bb8 100644
--- a/tests/boolean/bfuse_complex/I4
+++ b/tests/boolean/bfuse_complex/I4
@@ -2,8 +2,8 @@
 # Date : 13Mai98
 # C6
 
-restore cts20495a.rle a
-restore cts20495b.rle b
+restore [locate_data_file cts20495a.rle] a
+restore [locate_data_file cts20495b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/I5 b/tests/boolean/bfuse_complex/I5
index 286e6c4b39..4d42a5fb97 100644
--- a/tests/boolean/bfuse_complex/I5
+++ b/tests/boolean/bfuse_complex/I5
@@ -2,8 +2,8 @@
 # Date : 13Mai98
 # D1
 
-restore cts20552a.rle a
-restore cts20552b.rle b
+restore [locate_data_file cts20552a.rle] a
+restore [locate_data_file cts20552b.rle] b
 
 
 bfuse result a b
diff --git a/tests/boolean/bfuse_complex/I6 b/tests/boolean/bfuse_complex/I6
index 7d5fd289f1..a058de6b51 100644
--- a/tests/boolean/bfuse_complex/I6
+++ b/tests/boolean/bfuse_complex/I6
@@ -2,8 +2,8 @@
 # Date : 13Mai98
 # D2
 
-restore cts20551a.rle a
-restore cts20551b.rle b
+restore [locate_data_file cts20551a.rle] a
+restore [locate_data_file cts20551b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/I7 b/tests/boolean/bfuse_complex/I7
index dc174a9c7d..0b288d1827 100644
--- a/tests/boolean/bfuse_complex/I7
+++ b/tests/boolean/bfuse_complex/I7
@@ -2,8 +2,8 @@
 # Date : 13Mai98
 # D4
 
-restore cts20535a.rle a
-restore cts20535b.rle b
+restore [locate_data_file cts20535a.rle] a
+restore [locate_data_file cts20535b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/I8 b/tests/boolean/bfuse_complex/I8
index db0ad1769a..3f76f55d92 100644
--- a/tests/boolean/bfuse_complex/I8
+++ b/tests/boolean/bfuse_complex/I8
@@ -2,8 +2,8 @@
 # Date : 13Mai98
 # D5
 
-restore cts20529a.rle a
-restore cts20529b.rle b
+restore [locate_data_file cts20529a.rle] a
+restore [locate_data_file cts20529b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/I9 b/tests/boolean/bfuse_complex/I9
index ac585e6229..6b62429ea5 100644
--- a/tests/boolean/bfuse_complex/I9
+++ b/tests/boolean/bfuse_complex/I9
@@ -1,8 +1,8 @@
 # Original bug : pro12956
 # Date : 18Mai98
 
-restore pro12956a.rle a
-restore pro12956b.rle b
+restore [locate_data_file pro12956a.rle] a
+restore [locate_data_file pro12956b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/J2 b/tests/boolean/bfuse_complex/J2
index 3f6ebb2532..b95d199811 100644
--- a/tests/boolean/bfuse_complex/J2
+++ b/tests/boolean/bfuse_complex/J2
@@ -1,9 +1,9 @@
 # Original bug : cts20482
 # Date : 19Mai98
 
-restore cts20482-part.rle part
-restore cts20482-tool1.rle tool1
-restore cts20482-tool2.rle tool2
+restore [locate_data_file cts20482-part.rle] part
+restore [locate_data_file cts20482-tool1.rle] tool1
+restore [locate_data_file cts20482-tool2.rle] tool2
 
 bfuse result1 part tool1
 bfuse result result1 tool2
diff --git a/tests/boolean/bfuse_complex/J3 b/tests/boolean/bfuse_complex/J3
index 1a0f2c3926..ed364a008b 100644
--- a/tests/boolean/bfuse_complex/J3
+++ b/tests/boolean/bfuse_complex/J3
@@ -1,9 +1,9 @@
 # Original bug : cts20484
 # Date : 19Mai98
 
-restore cts20484-part.rle part
-restore cts20484-tool1.rle tool1
-restore cts20484-tool2.rle tool2
+restore [locate_data_file cts20484-part.rle] part
+restore [locate_data_file cts20484-tool1.rle] tool1
+restore [locate_data_file cts20484-tool2.rle] tool2
 
 bfuse result1 part tool1
 bfuse result result1 tool2
diff --git a/tests/boolean/bfuse_complex/J4 b/tests/boolean/bfuse_complex/J4
index 1c277f8a4c..3d9feb2786 100644
--- a/tests/boolean/bfuse_complex/J4
+++ b/tests/boolean/bfuse_complex/J4
@@ -1,8 +1,8 @@
 # Original bug : cts20549
 # Date : 19Mai98
 
-restore cts20549a.rle a
-restore cts20549b.rle b
+restore [locate_data_file cts20549a.rle] a
+restore [locate_data_file cts20549b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/J6 b/tests/boolean/bfuse_complex/J6
index 2d0fb2278d..582b5c6ea3 100644
--- a/tests/boolean/bfuse_complex/J6
+++ b/tests/boolean/bfuse_complex/J6
@@ -1,7 +1,7 @@
 # Original bug : ger60038
 # Date : 25Mai98
 
-restore ger60038.rle a
+restore [locate_data_file ger60038.rle] a
 
 tcopy a b
 tmirror b 0 0 0 1 0 0
diff --git a/tests/boolean/bfuse_complex/J7 b/tests/boolean/bfuse_complex/J7
index ec0dc3f8a7..0795033eef 100644
--- a/tests/boolean/bfuse_complex/J7
+++ b/tests/boolean/bfuse_complex/J7
@@ -1,8 +1,8 @@
 # Original bug : cts20549
 # Date : 4June98
 
-restore cts20549a.rle a
-restore cts20549b.rle b
+restore [locate_data_file cts20549a.rle] a
+restore [locate_data_file cts20549b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/J8 b/tests/boolean/bfuse_complex/J8
index d45769c48e..6cc02455bb 100644
--- a/tests/boolean/bfuse_complex/J8
+++ b/tests/boolean/bfuse_complex/J8
@@ -1,8 +1,8 @@
 # Original bug : cts20751
 # Date : 4June98
 
-restore cts20751a.rle a
-restore cts20751b.rle b
+restore [locate_data_file cts20751a.rle] a
+restore [locate_data_file cts20751b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/J9 b/tests/boolean/bfuse_complex/J9
index 09076b8aa1..d5085cd7c2 100644
--- a/tests/boolean/bfuse_complex/J9
+++ b/tests/boolean/bfuse_complex/J9
@@ -1,8 +1,8 @@
 # Original bug : cts20769
 # Date : 4June98
 
-restore cts20769a.rle a
-restore cts20769b.rle b
+restore [locate_data_file cts20769a.rle] a
+restore [locate_data_file cts20769b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/K1 b/tests/boolean/bfuse_complex/K1
index bb26da894d..049becc0c4 100644
--- a/tests/boolean/bfuse_complex/K1
+++ b/tests/boolean/bfuse_complex/K1
@@ -1,8 +1,8 @@
 # Original bug : cts20370
 # Date : 4June98
 
-restore cts20370a.rle a
-restore cts20370b.rle b
+restore [locate_data_file cts20370a.rle] a
+restore [locate_data_file cts20370b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/K2 b/tests/boolean/bfuse_complex/K2
index b07f355818..95459a8fab 100644
--- a/tests/boolean/bfuse_complex/K2
+++ b/tests/boolean/bfuse_complex/K2
@@ -1,8 +1,8 @@
 # Original bug : cts20578
 # Date : 4June98
 
-restore cts20578a.rle a
-restore cts20578b.rle b
+restore [locate_data_file cts20578a.rle] a
+restore [locate_data_file cts20578b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/K3 b/tests/boolean/bfuse_complex/K3
index 36f3e2ac22..17a358a932 100644
--- a/tests/boolean/bfuse_complex/K3
+++ b/tests/boolean/bfuse_complex/K3
@@ -1,8 +1,8 @@
 # Original bug : fra60275
 # Date : 4June98
 
-restore fra60275a.rle s
-restore fra60275b.rle c
+restore [locate_data_file fra60275a.rle] s
+restore [locate_data_file fra60275b.rle] c
 tcopy  c w
 mkplane f w
 
diff --git a/tests/boolean/bfuse_complex/K4 b/tests/boolean/bfuse_complex/K4
index d254a1439e..c39267e3d2 100644
--- a/tests/boolean/bfuse_complex/K4
+++ b/tests/boolean/bfuse_complex/K4
@@ -1,8 +1,8 @@
 # Original bug : pro13494
 # Date : 4June98
 
-restore pro13494a.rle a 
-restore pro13494b.rle b
+restore [locate_data_file pro13494a.rle] a 
+restore [locate_data_file pro13494b.rle] b
 
 # pkv f
 explode a so
diff --git a/tests/boolean/bfuse_complex/K5 b/tests/boolean/bfuse_complex/K5
index cfeef3ab31..bab2cb1e4e 100644
--- a/tests/boolean/bfuse_complex/K5
+++ b/tests/boolean/bfuse_complex/K5
@@ -1,8 +1,8 @@
 # Original bug : buc60116
 # Date : 12June98
 
-restore buc60116a.rle a 
-restore buc60116b.rle b
+restore [locate_data_file buc60116a.rle] a 
+restore [locate_data_file buc60116b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/K6 b/tests/boolean/bfuse_complex/K6
index 716e939031..56114f407c 100644
--- a/tests/boolean/bfuse_complex/K6
+++ b/tests/boolean/bfuse_complex/K6
@@ -1,8 +1,8 @@
 # Original bug : cts20973
 # Date : 12June98
 
-restore cts20973a.rle a 
-restore cts20973b.rle b
+restore [locate_data_file cts20973a.rle] a 
+restore [locate_data_file cts20973b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/K7 b/tests/boolean/bfuse_complex/K7
index c9c7387145..cca63fae63 100644
--- a/tests/boolean/bfuse_complex/K7
+++ b/tests/boolean/bfuse_complex/K7
@@ -1,9 +1,9 @@
 # Original bug : cts20974
 # Date : 12June98
 
-restore cts20974a.rle a 
+restore [locate_data_file cts20974a.rle] a 
 fsameparameter a
-restore cts20974b.rle b
+restore [locate_data_file cts20974b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/K8 b/tests/boolean/bfuse_complex/K8
index 6051ae98a4..5fdc782499 100644
--- a/tests/boolean/bfuse_complex/K8
+++ b/tests/boolean/bfuse_complex/K8
@@ -1,8 +1,8 @@
 # Original bug : pro12875
 # Date : 12June98
 
-restore pro12875a.rle a 
-restore pro12875b.rle b
+restore [locate_data_file pro12875a.rle] a 
+restore [locate_data_file pro12875b.rle] b
 updatetolerance a 1
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/K9 b/tests/boolean/bfuse_complex/K9
index e93f8c7dc5..95dcff2fb5 100644
--- a/tests/boolean/bfuse_complex/K9
+++ b/tests/boolean/bfuse_complex/K9
@@ -1,8 +1,8 @@
 # Original bug : pro13555
 # Date : 12June98
 
-restore pro13555a.rle a 
-restore pro13555b.rle b
+restore [locate_data_file pro13555a.rle] a 
+restore [locate_data_file pro13555b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/L1 b/tests/boolean/bfuse_complex/L1
index a2f20f2569..6f248d43dc 100644
--- a/tests/boolean/bfuse_complex/L1
+++ b/tests/boolean/bfuse_complex/L1
@@ -1,8 +1,8 @@
 # Original bug : cts20525
 # Date : 24June98
 
-restore cts20525a.rle a 
-restore cts200525b.rle b
+restore [locate_data_file cts20525a.rle] a 
+restore [locate_data_file cts200525b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/L2 b/tests/boolean/bfuse_complex/L2
index 5f628b80f1..3fc033b928 100644
--- a/tests/boolean/bfuse_complex/L2
+++ b/tests/boolean/bfuse_complex/L2
@@ -1,8 +1,8 @@
 # Original bug : cts21044
 # Date : 24June98
 
-restore cts21044a.rle a 
-restore cts21044b.rle b
+restore [locate_data_file cts21044a.rle] a 
+restore [locate_data_file cts21044b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/L3 b/tests/boolean/bfuse_complex/L3
index d5f9735c79..8671f54348 100644
--- a/tests/boolean/bfuse_complex/L3
+++ b/tests/boolean/bfuse_complex/L3
@@ -1,8 +1,8 @@
 # Original bug : cts20528
 # Date : 24June98
 
-restore cts20528a.rle a 
-restore cts20528b.rle b
+restore [locate_data_file cts20528a.rle] a 
+restore [locate_data_file cts20528b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/L4 b/tests/boolean/bfuse_complex/L4
index dca173c54f..8a1a68952e 100644
--- a/tests/boolean/bfuse_complex/L4
+++ b/tests/boolean/bfuse_complex/L4
@@ -1,8 +1,8 @@
 # Original bug : pro12859
 # Date : 24June98
 
-restore pro12859a.rle a 
-restore pro12859b.rle b
+restore [locate_data_file pro12859a.rle] a 
+restore [locate_data_file pro12859b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/L5 b/tests/boolean/bfuse_complex/L5
index dc36e8c01f..a25b69875c 100644
--- a/tests/boolean/bfuse_complex/L5
+++ b/tests/boolean/bfuse_complex/L5
@@ -1,8 +1,8 @@
 # Original bug : pro12852
 # Date : 24June98
 
-restore pro12852a.rle a 
-restore pro12852b.rle b
+restore [locate_data_file pro12852a.rle] a 
+restore [locate_data_file pro12852b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/L6 b/tests/boolean/bfuse_complex/L6
index d2b3cb00e9..675d97a1f5 100644
--- a/tests/boolean/bfuse_complex/L6
+++ b/tests/boolean/bfuse_complex/L6
@@ -1,8 +1,8 @@
 # Original bug : cts20907
 # Date : 24June98
 
-restore cts20907a.rle a 
-restore cts20907b.rle b
+restore [locate_data_file cts20907a.rle] a 
+restore [locate_data_file cts20907b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/L7 b/tests/boolean/bfuse_complex/L7
index 75edf0376f..c3ccc74d47 100644
--- a/tests/boolean/bfuse_complex/L7
+++ b/tests/boolean/bfuse_complex/L7
@@ -1,8 +1,8 @@
 # Original bug : cts21124
 # Date : 24June98
 
-restore cts21124a.rle a 
-restore cts21124b.rle b
+restore [locate_data_file cts21124a.rle] a 
+restore [locate_data_file cts21124b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/L8 b/tests/boolean/bfuse_complex/L8
index a3c1d5a899..22776bc763 100644
--- a/tests/boolean/bfuse_complex/L8
+++ b/tests/boolean/bfuse_complex/L8
@@ -1,8 +1,8 @@
 # Original bug : cts21326
 # Date : 16July98
 
-restore cts21326a.rle a 
-restore cts21326b.rle b
+restore [locate_data_file cts21326a.rle] a 
+restore [locate_data_file cts21326b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/L9 b/tests/boolean/bfuse_complex/L9
index d52066a7a2..b8e5fe0742 100644
--- a/tests/boolean/bfuse_complex/L9
+++ b/tests/boolean/bfuse_complex/L9
@@ -1,8 +1,8 @@
 # Original bug : cts21199
 # Date : 16July98
 
-restore cts21199a.rle a 
-restore cts21199b.rle skface
+restore [locate_data_file cts21199a.rle] a 
+restore [locate_data_file cts21199b.rle] skface
 
 prism b skface 0 0 -50
 
diff --git a/tests/boolean/bfuse_complex/M1 b/tests/boolean/bfuse_complex/M1
index 5af5eb171a..d41cfa4b94 100644
--- a/tests/boolean/bfuse_complex/M1
+++ b/tests/boolean/bfuse_complex/M1
@@ -1,8 +1,8 @@
 # Original bug : cts21216
 # Date : 16July98
 
-restore cts21216a.rle a 
-restore cts21216b.rle b
+restore [locate_data_file cts21216a.rle] a 
+restore [locate_data_file cts21216b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/M2 b/tests/boolean/bfuse_complex/M2
index d81b380cc0..7f81129671 100644
--- a/tests/boolean/bfuse_complex/M2
+++ b/tests/boolean/bfuse_complex/M2
@@ -1,8 +1,8 @@
 # Original bug : cts21240
 # Date : 16July98
 
-restore cts21240a.rle a 
-restore cts21240b.rle skface
+restore [locate_data_file cts21240a.rle] a 
+restore [locate_data_file cts21240b.rle] skface
 
 prism b skface 0 0 1 10
 
diff --git a/tests/boolean/bfuse_complex/M3 b/tests/boolean/bfuse_complex/M3
index 1945193c57..d37749cc2a 100644
--- a/tests/boolean/bfuse_complex/M3
+++ b/tests/boolean/bfuse_complex/M3
@@ -1,8 +1,8 @@
 # Original bug : cts21244
 # Date : 16July98
 
-restore cts21244a.rle a 
-restore cts21244b.rle b
+restore [locate_data_file cts21244a.rle] a 
+restore [locate_data_file cts21244b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/M4 b/tests/boolean/bfuse_complex/M4
index b0ec674520..78e378ba65 100644
--- a/tests/boolean/bfuse_complex/M4
+++ b/tests/boolean/bfuse_complex/M4
@@ -1,8 +1,8 @@
 # Original bug : cts21251
 # Date : 16July98
 
-restore cts21251a.rle a 
-restore cts21251b.rle skface
+restore [locate_data_file cts21251a.rle] a 
+restore [locate_data_file cts21251b.rle] skface
 
 revol b skface 0 0 0 0 -1 0 360
 
diff --git a/tests/boolean/bfuse_complex/M5 b/tests/boolean/bfuse_complex/M5
index 3ac05a87bd..5079d587e9 100644
--- a/tests/boolean/bfuse_complex/M5
+++ b/tests/boolean/bfuse_complex/M5
@@ -1,9 +1,9 @@
 # Original bug : cts21306
 # Date : 16July98
 
-restore cts21306a.rle a 
-restore cts21306b.rle b
-restore cts21306c.rle c
+restore [locate_data_file cts21306a.rle] a 
+restore [locate_data_file cts21306b.rle] b
+restore [locate_data_file cts21306c.rle] c
 
 bfuse rab a b
 
diff --git a/tests/boolean/bfuse_complex/M6 b/tests/boolean/bfuse_complex/M6
index 11e0b653a0..1772306aa8 100644
--- a/tests/boolean/bfuse_complex/M6
+++ b/tests/boolean/bfuse_complex/M6
@@ -1,8 +1,8 @@
 # Original bug : cts21306
 # Date : 16July98
 
-restore cts21306b.rle b
-restore cts21306c.rle c
+restore [locate_data_file cts21306b.rle] b
+restore [locate_data_file cts21306c.rle] c
 
 bfuse result b c
 
diff --git a/tests/boolean/bfuse_complex/M7 b/tests/boolean/bfuse_complex/M7
index 4f96bfa85c..5923cc420d 100644
--- a/tests/boolean/bfuse_complex/M7
+++ b/tests/boolean/bfuse_complex/M7
@@ -1,8 +1,8 @@
 # Original bug : cts20176
 # Date : 16July98
 
-restore cts20176a.rle a 
-restore cts20176b.rle b
+restore [locate_data_file cts20176a.rle] a 
+restore [locate_data_file cts20176b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/M8 b/tests/boolean/bfuse_complex/M8
index ba72c34630..cb442e927c 100644
--- a/tests/boolean/bfuse_complex/M8
+++ b/tests/boolean/bfuse_complex/M8
@@ -1,8 +1,8 @@
 # Original bug : cts20944
 # Date : 16July98
 
-restore cts20944a.rle a 
-restore cts20944b.rle b
+restore [locate_data_file cts20944a.rle] a 
+restore [locate_data_file cts20944b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/M9 b/tests/boolean/bfuse_complex/M9
index 91288fa5a5..da68265dbd 100644
--- a/tests/boolean/bfuse_complex/M9
+++ b/tests/boolean/bfuse_complex/M9
@@ -1,8 +1,8 @@
 # Original bug : hkg60155
 # Date : 16July98
 
-restore hkg60155a.rle a 
-restore hkg60155b.rle b
+restore [locate_data_file hkg60155a.rle] a 
+restore [locate_data_file hkg60155b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/N1 b/tests/boolean/bfuse_complex/N1
index f9cb3fcd33..49b26a24e0 100644
--- a/tests/boolean/bfuse_complex/N1
+++ b/tests/boolean/bfuse_complex/N1
@@ -1,8 +1,8 @@
 # Original bug : pro14893
 # Date : 16July98
 
-restore pro14893a.rle a 
-restore pro14893b.rle b
+restore [locate_data_file pro14893a.rle] a 
+restore [locate_data_file pro14893b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/N2 b/tests/boolean/bfuse_complex/N2
index 3d01d3bcb7..b4cadc31b4 100644
--- a/tests/boolean/bfuse_complex/N2
+++ b/tests/boolean/bfuse_complex/N2
@@ -1,8 +1,8 @@
 # Original bug : cts20960
 # Date : 16July98
 
-restore cts20960a.rle a 
-restore cts20960b.rle b
+restore [locate_data_file cts20960a.rle] a 
+restore [locate_data_file cts20960b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/N3 b/tests/boolean/bfuse_complex/N3
index f3c2a30ead..eb17d148b9 100644
--- a/tests/boolean/bfuse_complex/N3
+++ b/tests/boolean/bfuse_complex/N3
@@ -1,9 +1,9 @@
 # Original bug : pro14785
 # Date : 21July98
 
-restore pro14785a.rle a 
-restore pro14785b.rle b
-restore pro14785c.rle c
+restore [locate_data_file pro14785a.rle] a 
+restore [locate_data_file pro14785b.rle] b
+restore [locate_data_file pro14785c.rle] c
 
 bfuse res a b
 bfuse result res c
diff --git a/tests/boolean/bfuse_complex/N4 b/tests/boolean/bfuse_complex/N4
index 298b988970..0133dd471d 100644
--- a/tests/boolean/bfuse_complex/N4
+++ b/tests/boolean/bfuse_complex/N4
@@ -1,8 +1,8 @@
 # Original bug : pro14892
 # Date : 16July98
 
-restore pro14892a.rle a 
-restore pro14892b.rle aface
+restore [locate_data_file pro14892a.rle] a 
+restore [locate_data_file pro14892b.rle] aface
 
 prism b aface 0 0 -50
 
diff --git a/tests/boolean/bfuse_complex/N5 b/tests/boolean/bfuse_complex/N5
index d216191655..b4f48762b4 100644
--- a/tests/boolean/bfuse_complex/N5
+++ b/tests/boolean/bfuse_complex/N5
@@ -1,8 +1,8 @@
 # Original bug : fra61146
 # Date : 16July98
 
-restore fra61146a.rle a
-restore fra61146b.rle b
+restore [locate_data_file fra61146a.rle] a
+restore [locate_data_file fra61146b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/N6 b/tests/boolean/bfuse_complex/N6
index 638e5ff4c0..6e486b9e95 100644
--- a/tests/boolean/bfuse_complex/N6
+++ b/tests/boolean/bfuse_complex/N6
@@ -1,8 +1,8 @@
 # Original bug : fra61146
 # Date : 16July98
 
-restore fra61146a.rle a
-restore fra61146b.rle b
+restore [locate_data_file fra61146a.rle] a
+restore [locate_data_file fra61146b.rle] b
 
 bfuse result b a
 
diff --git a/tests/boolean/bfuse_complex/N7 b/tests/boolean/bfuse_complex/N7
index 96041b3ac9..60b522a7b6 100644
--- a/tests/boolean/bfuse_complex/N7
+++ b/tests/boolean/bfuse_complex/N7
@@ -1,8 +1,8 @@
 # Original bug : pro15049
 # Date : 26Aout98
 
-restore pro15049a.rle a
-restore pro15049b.rle b
+restore [locate_data_file pro15049a.rle] a
+restore [locate_data_file pro15049b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/N8 b/tests/boolean/bfuse_complex/N8
index 894f55cd38..1f1b9acbb7 100644
--- a/tests/boolean/bfuse_complex/N8
+++ b/tests/boolean/bfuse_complex/N8
@@ -1,8 +1,8 @@
 # Original bug : cts21364
 # Date : 26Aout98
 
-restore cts21364a.rle a 
-restore cts21364b.rle b
+restore [locate_data_file cts21364a.rle] a 
+restore [locate_data_file cts21364b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/N9 b/tests/boolean/bfuse_complex/N9
index 2fa3b173e7..527cbfbf57 100644
--- a/tests/boolean/bfuse_complex/N9
+++ b/tests/boolean/bfuse_complex/N9
@@ -1,8 +1,8 @@
 # Original bug : pro15150
 # Date : 26Aout98
 
-restore pro15150a.rle a 
-restore pro15150b.rle b
+restore [locate_data_file pro15150a.rle] a 
+restore [locate_data_file pro15150b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/O1 b/tests/boolean/bfuse_complex/O1
index 0b1b4c12f0..0bf8ead5ab 100644
--- a/tests/boolean/bfuse_complex/O1
+++ b/tests/boolean/bfuse_complex/O1
@@ -3,8 +3,8 @@
 
 # part 1 of 4
 
-restore pro15203a.rle a 
-restore pro15203c.rle c 
+restore [locate_data_file pro15203a.rle] a 
+restore [locate_data_file pro15203c.rle] c 
 
 #pkv f
 explode a f
diff --git a/tests/boolean/bfuse_complex/O2 b/tests/boolean/bfuse_complex/O2
index 522212ab56..f639ef4456 100644
--- a/tests/boolean/bfuse_complex/O2
+++ b/tests/boolean/bfuse_complex/O2
@@ -3,8 +3,8 @@
 
 # part 2 of 4
 
-restore pro15203a.rle a 
-restore pro15203d.rle d 
+restore [locate_data_file pro15203a.rle] a 
+restore [locate_data_file pro15203d.rle] d 
 
 #pkv f
 explode a f
diff --git a/tests/boolean/bfuse_complex/O3 b/tests/boolean/bfuse_complex/O3
index f971c76931..452a58719a 100644
--- a/tests/boolean/bfuse_complex/O3
+++ b/tests/boolean/bfuse_complex/O3
@@ -3,8 +3,8 @@
 
 # part 3 of 4
 
-restore pro15203b.rle b 
-restore pro15203c.rle c 
+restore [locate_data_file pro15203b.rle] b 
+restore [locate_data_file pro15203c.rle] c 
 
 #pkv f
 explode b f
diff --git a/tests/boolean/bfuse_complex/O4 b/tests/boolean/bfuse_complex/O4
index b30dac4996..f4a01e6fc8 100644
--- a/tests/boolean/bfuse_complex/O4
+++ b/tests/boolean/bfuse_complex/O4
@@ -3,8 +3,8 @@
 
 # part 4 of 4
 
-restore pro15203b.rle b 
-restore pro15203d.rle d 
+restore [locate_data_file pro15203b.rle] b 
+restore [locate_data_file pro15203d.rle] d 
 
 #pkv f
 explode b f
diff --git a/tests/boolean/bfuse_complex/O5 b/tests/boolean/bfuse_complex/O5
index 3bada19e5e..3ae085e05c 100644
--- a/tests/boolean/bfuse_complex/O5
+++ b/tests/boolean/bfuse_complex/O5
@@ -1,8 +1,8 @@
 puts "TODO #22911 ALL: Faulty shapes in variables faulty_1 to faulty_2"
 puts "TODO #22911 ALL: Error : The square of result shape is"
 
-restore topo104-o1.brep wheel
-restore topo104-o2.brep jante
+restore [locate_data_file topo104-o1.brep] wheel
+restore [locate_data_file topo104-o2.brep] jante
 
 bfuse result wheel jante
 
diff --git a/tests/boolean/bfuse_complex/O6 b/tests/boolean/bfuse_complex/O6
index d43144364a..b37ee1a333 100644
--- a/tests/boolean/bfuse_complex/O6
+++ b/tests/boolean/bfuse_complex/O6
@@ -1,8 +1,8 @@
 puts "TODO #22911 ALL: Faulty shapes in variables faulty_1 to faulty_2"
 puts "TODO #22911 ALL: Error : The square of result shape is"
 
-restore topo106-p.brep poche
-restore topo106-n.brep nervure
+restore [locate_data_file topo106-p.brep] poche
+restore [locate_data_file topo106-n.brep] nervure
 
 bfuse result poche nervure
 
diff --git a/tests/boolean/bfuse_complex/O7 b/tests/boolean/bfuse_complex/O7
index d59f884faf..3dbb2e26bc 100644
--- a/tests/boolean/bfuse_complex/O7
+++ b/tests/boolean/bfuse_complex/O7
@@ -1,7 +1,7 @@
 #buc60381
 
-restore IR2_TuyoPipe20.brep pip 
-restore IR2_sphere1_20.brep sp1 
+restore [locate_data_file IR2_TuyoPipe20.brep] pip 
+restore [locate_data_file IR2_sphere1_20.brep] sp1 
 
 bfuse result pip sp1
 
diff --git a/tests/boolean/bfuse_complex/O8 b/tests/boolean/bfuse_complex/O8
index 53c6a63b71..6b99bbd258 100644
--- a/tests/boolean/bfuse_complex/O8
+++ b/tests/boolean/bfuse_complex/O8
@@ -1,6 +1,6 @@
 #cts21588
-restore part_syb.brep a
-restore tool_syb.brep b
+restore [locate_data_file part_syb.brep] a
+restore [locate_data_file tool_syb.brep] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/O9 b/tests/boolean/bfuse_complex/O9
index a7e65fdbb7..f014e0d240 100644
--- a/tests/boolean/bfuse_complex/O9
+++ b/tests/boolean/bfuse_complex/O9
@@ -1,7 +1,7 @@
 #buc60326
 
-restore 1.brep a
-restore 2.brep b
+restore [locate_data_file 1.brep] a
+restore [locate_data_file 2.brep] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/P1 b/tests/boolean/bfuse_complex/P1
index 4f84579c23..0b3c76c563 100644
--- a/tests/boolean/bfuse_complex/P1
+++ b/tests/boolean/bfuse_complex/P1
@@ -2,8 +2,8 @@
 puts "TODO #22911 ALL: Faulty shapes in variables faulty_1 to faulty_"
 puts "TODO #22911 ALL: Error : The square of result shape is"
 
-restore cts17861a.rle a
-restore cts17861b.rle b
+restore [locate_data_file cts17861a.rle] a
+restore [locate_data_file cts17861b.rle] b
 
 fsameparameter a
 fsameparameter b
diff --git a/tests/boolean/bfuse_complex/P2 b/tests/boolean/bfuse_complex/P2
index 3334847cfb..1971eae44d 100644
--- a/tests/boolean/bfuse_complex/P2
+++ b/tests/boolean/bfuse_complex/P2
@@ -1,9 +1,9 @@
 # Original bug : pro15203
 ###########################
-restore cq12.brep c1
+restore [locate_data_file cq12.brep] c1
 explode c1 f
 copy c1_1 c1
-restore cq21.brep c2
+restore [locate_data_file cq21.brep] c2
 explode c2 f
 copy c2_1 c2
 
diff --git a/tests/boolean/bfuse_complex/P3 b/tests/boolean/bfuse_complex/P3
index e22b89c4e4..9824664570 100644
--- a/tests/boolean/bfuse_complex/P3
+++ b/tests/boolean/bfuse_complex/P3
@@ -1,9 +1,9 @@
 # Original bug : pro15203
 ###########################
-restore cq12.brep c1
+restore [locate_data_file cq12.brep] c1
 explode c1 f
 copy c1_1 c1
-restore cq22.brep c2
+restore [locate_data_file cq22.brep] c2
 explode c2 f
 copy c2_1 c2
 
diff --git a/tests/boolean/bfuse_complex/P4 b/tests/boolean/bfuse_complex/P4
index 6a1596b48c..29332c71c1 100644
--- a/tests/boolean/bfuse_complex/P4
+++ b/tests/boolean/bfuse_complex/P4
@@ -1,6 +1,6 @@
 ## pro16001
 
-restore PbHLR.brep a
+restore [locate_data_file PbHLR.brep] a
 checkshape a
 
 hlr hlr a
diff --git a/tests/boolean/bfuse_complex/P5 b/tests/boolean/bfuse_complex/P5
index ef3b344cd5..52aa4349ba 100644
--- a/tests/boolean/bfuse_complex/P5
+++ b/tests/boolean/bfuse_complex/P5
@@ -1,7 +1,7 @@
 # Original bug : pro16255
 
-restore part3bis.brep s
-restore part5-noFillet.brep t
+restore [locate_data_file part3bis.brep] s
+restore [locate_data_file part5-noFillet.brep] t
 
 #pkv f
 updatetolerance s 1
diff --git a/tests/boolean/bfuse_complex/P6 b/tests/boolean/bfuse_complex/P6
index 8a04978243..dd77fea06e 100644
--- a/tests/boolean/bfuse_complex/P6
+++ b/tests/boolean/bfuse_complex/P6
@@ -1,8 +1,8 @@
 # Original bug : pro16255
 
 #pkv f
-restore part3bis.brep s
-restore part5-with-fillet.brep u
+restore [locate_data_file part3bis.brep] s
+restore [locate_data_file part5-with-fillet.brep] u
 updatetolerance s 1
 updatetolerance u 1
 #pkv t
diff --git a/tests/boolean/bfuse_complex/P7 b/tests/boolean/bfuse_complex/P7
index b46613564d..61e5add5c0 100644
--- a/tests/boolean/bfuse_complex/P7
+++ b/tests/boolean/bfuse_complex/P7
@@ -1,8 +1,8 @@
 # Original bug : pro16255
 
 #pkv f
-restore part3bis.brep s
-restore part5-with-fillet.brep u
+restore [locate_data_file part3bis.brep] s
+restore [locate_data_file part5-with-fillet.brep] u
 #pkv t
 tscale s 0 0 0 0.01
 tscale u 0 0 0 0.01
diff --git a/tests/boolean/bfuse_complex/P8 b/tests/boolean/bfuse_complex/P8
index 5567142591..a8f130efb1 100644
--- a/tests/boolean/bfuse_complex/P8
+++ b/tests/boolean/bfuse_complex/P8
@@ -1,8 +1,8 @@
 ## cts21139
 puts "TODO #22911 ALL: Faulty shapes in variables faulty_1 to faulty_"
 
-restore shape.brep a
-restore tool_1.brep b
+restore [locate_data_file shape.brep] a
+restore [locate_data_file tool_1.brep] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/P9 b/tests/boolean/bfuse_complex/P9
index 82162e3ba8..6088b55188 100644
--- a/tests/boolean/bfuse_complex/P9
+++ b/tests/boolean/bfuse_complex/P9
@@ -1,7 +1,7 @@
 #ger60239
 
-restore mds-part1.rle a
-restore mds-part2.rle b
+restore [locate_data_file mds-part1.rle] a
+restore [locate_data_file mds-part2.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/Q1 b/tests/boolean/bfuse_complex/Q1
index f18e934261..df35238578 100644
--- a/tests/boolean/bfuse_complex/Q1
+++ b/tests/boolean/bfuse_complex/Q1
@@ -1,7 +1,7 @@
 #ger60239
 
-restore solid_2.brep c
-restore solid_5.brep d
+restore [locate_data_file solid_2.brep] c
+restore [locate_data_file solid_5.brep] d
 
 bfuse result c d
 
diff --git a/tests/boolean/bfuse_complex/Q2 b/tests/boolean/bfuse_complex/Q2
index b680d08185..7409b352c0 100644
--- a/tests/boolean/bfuse_complex/Q2
+++ b/tests/boolean/bfuse_complex/Q2
@@ -1,7 +1,7 @@
 # pro10658
 
-restore pro10658a.rle a
-restore pro10658b.rle b
+restore [locate_data_file pro10658a.rle] a
+restore [locate_data_file pro10658b.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/Q3 b/tests/boolean/bfuse_complex/Q3
index e48ed9f3c5..9fbe98974d 100644
--- a/tests/boolean/bfuse_complex/Q3
+++ b/tests/boolean/bfuse_complex/Q3
@@ -2,14 +2,14 @@ puts " BUC60068 "
 puts "If scales by 1000, time to compute is 10 times greater "
 ##
 ## mod pkv from
-restore buc60068a.rle a
-restore buc60068b.rle b
-restore buc60068a.rle c
-restore buc60068b.rle d
-restore buc60068a.rle e
-restore buc60068b.rle f
-restore buc60068a.rle g
-restore buc60068b.rle h
+restore [locate_data_file buc60068a.rle] a
+restore [locate_data_file buc60068b.rle] b
+restore [locate_data_file buc60068a.rle] c
+restore [locate_data_file buc60068b.rle] d
+restore [locate_data_file buc60068a.rle] e
+restore [locate_data_file buc60068b.rle] f
+restore [locate_data_file buc60068a.rle] g
+restore [locate_data_file buc60068b.rle] h
 ## mod pkv from
 ##
 
@@ -36,15 +36,15 @@ dchrono m start
 bfuse resgh g h
 dchrono m stop
 
-regexp {Elapsed time: ([0-9]+) Hours ([0-9]+) Minutes ([0-9]|.+) Seconds} [dchrono j show] full Jhours Jminutes Jseconds
-regexp {Elapsed time: ([0-9]+) Hours ([0-9]+) Minutes ([0-9]|.+) Seconds} [dchrono k show] full Khours Kminutes Kseconds
-regexp {Elapsed time: ([0-9]+) Hours ([0-9]+) Minutes ([0-9]|.+) Seconds} [dchrono l show] full Lhours Lminutes Lseconds
-regexp {Elapsed time: ([0-9]+) Hours ([0-9]+) Minutes ([0-9]|.+) Seconds} [dchrono m show] full Mhours Mminutes Mseconds
+regexp {CPU user time: ([0-9|.]+) seconds} [dchrono j show] full Jseconds
+regexp {CPU user time: ([0-9|.]+) seconds} [dchrono k show] full Kseconds
+regexp {CPU user time: ([0-9|.]+) seconds} [dchrono l show] full Lseconds
+regexp {CPU user time: ([0-9|.]+) seconds} [dchrono m show] full Mseconds
 
-set Jtime [expr ($Jhours*60*60 + $Jminutes*60 + $Jseconds)*2]
-set Ktime [expr $Khours*60*60 + $Kminutes*60 + $Kseconds]
-set Ltime [expr $Lhours*60*60 + $Lminutes*60 + $Lseconds]
-set Mtime [expr $Mhours*60*60 + $Mminutes*60 + $Mseconds]
+set Jtime [expr $Jseconds * 1.1]
+set Ktime $Kseconds
+set Ltime $Lseconds
+set Mtime $Mseconds
 
 if { $Jtime < $Ktime || $Jtime < $Ltime || $Jtime < $Mtime} {
    puts "Error: incorrect performance of bfuse operation:"
diff --git a/tests/boolean/bfuse_complex/Q4 b/tests/boolean/bfuse_complex/Q4
index 6472bffe9b..a5635a6cfe 100644
--- a/tests/boolean/bfuse_complex/Q4
+++ b/tests/boolean/bfuse_complex/Q4
@@ -1,8 +1,8 @@
 puts "BUC60321"
 puts "Creating fuse is impossible"
 
-restore buc60321a.brep a
-restore buc60321b.brep b
+restore [locate_data_file buc60321a.brep] a
+restore [locate_data_file buc60321b.brep] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/Q5 b/tests/boolean/bfuse_complex/Q5
index 902d1da2a8..7473203244 100644
--- a/tests/boolean/bfuse_complex/Q5
+++ b/tests/boolean/bfuse_complex/Q5
@@ -2,8 +2,8 @@ puts "BUC60382"
 puts "Problem with fuse operation "
 puts ""
 
-restore IR2_TuyoPipeBSpline_20_draw2.brep a
-restore IR2_sphere2_20.brep b 
+restore [locate_data_file IR2_TuyoPipeBSpline_20_draw2.brep] a
+restore [locate_data_file IR2_sphere2_20.brep] b 
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/Q6 b/tests/boolean/bfuse_complex/Q6
index ff1cfa89ca..d89e735da2 100644
--- a/tests/boolean/bfuse_complex/Q6
+++ b/tests/boolean/bfuse_complex/Q6
@@ -2,8 +2,8 @@ puts "CTS20769"
 puts "Creating fuse is impossible"
 puts ""
 
-restore cts20769a.brep a
-restore cts20769b.brep b
+restore [locate_data_file cts20769a.brep] a
+restore [locate_data_file cts20769b.brep] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bfuse_complex/Q7 b/tests/boolean/bfuse_complex/Q7
index ffb013cdfd..08c30860aa 100644
--- a/tests/boolean/bfuse_complex/Q7
+++ b/tests/boolean/bfuse_complex/Q7
@@ -2,8 +2,8 @@ puts "GER60806"
 puts "Fuse doesn't give the waiting result."
 puts ""
 
-restore ger60806a.rle base
-restore ger60806b.rle tool
+restore [locate_data_file ger60806a.rle] base
+restore [locate_data_file ger60806b.rle] tool
 
 # ope. top. -> KO
 bcut res1 tool base
diff --git a/tests/boolean/bfuse_complex/Q8 b/tests/boolean/bfuse_complex/Q8
index 40de5d1347..1b59766414 100644
--- a/tests/boolean/bfuse_complex/Q8
+++ b/tests/boolean/bfuse_complex/Q8
@@ -2,8 +2,8 @@ puts "ID160065"
 puts "Fuse"
 puts ""
 
-restore id260065c.rle base
-restore id260065a.rle cont1
+restore [locate_data_file id260065c.rle] base
+restore [locate_data_file id260065a.rle] cont1
 
 prism tool1 cont1 -86.60254 50 0
 
diff --git a/tests/boolean/bfuse_complex/Q9 b/tests/boolean/bfuse_complex/Q9
index 2129ef1960..2e376829ea 100644
--- a/tests/boolean/bfuse_complex/Q9
+++ b/tests/boolean/bfuse_complex/Q9
@@ -2,8 +2,8 @@ puts "ID160065"
 puts "Fuse"
 puts ""
 
-restore id260065c.rle base
-restore id260065b.rle cont2
+restore [locate_data_file id260065c.rle] base
+restore [locate_data_file id260065b.rle] cont2
 
 prism tool2 cont2 -86.60254 50 0
 
diff --git a/tests/boolean/bfuse_complex/R1 b/tests/boolean/bfuse_complex/R1
index 113c9e95cb..f4f5832c75 100644
--- a/tests/boolean/bfuse_complex/R1
+++ b/tests/boolean/bfuse_complex/R1
@@ -3,8 +3,8 @@ puts "Fuse"
 puts ""
 
 
-restore ita60531a.rle b
-restore ita60531b.rle f
+restore [locate_data_file ita60531a.rle] b
+restore [locate_data_file ita60531b.rle] f
 
 # Operation booleenne -> shape pas valide
 prism tool f 0 0 1
diff --git a/tests/boolean/bfuse_complex/R2 b/tests/boolean/bfuse_complex/R2
index e6af39a3d0..67e3607f13 100644
--- a/tests/boolean/bfuse_complex/R2
+++ b/tests/boolean/bfuse_complex/R2
@@ -3,8 +3,8 @@ puts "PRO16252"
 puts "Fuse"
 puts ""
 
-restore pro16252a.brep a
-restore pro16252b.brep b
+restore [locate_data_file pro16252a.brep] a
+restore [locate_data_file pro16252b.brep] b
 
 fsameparameter b
 maxtolerance a
diff --git a/tests/boolean/bfuse_complex/R3 b/tests/boolean/bfuse_complex/R3
index 22d99db15f..4c5c4d3596 100644
--- a/tests/boolean/bfuse_complex/R3
+++ b/tests/boolean/bfuse_complex/R3
@@ -2,8 +2,8 @@
 puts "PRO16253"
 puts "Fuse"
 puts ""
-restore pro16253-1.brep s
-restore pro16253-2.brep t
+restore [locate_data_file pro16253-1.brep] s
+restore [locate_data_file pro16253-2.brep] t
 
 maxtolerance s
 maxtolerance t
diff --git a/tests/boolean/bfuse_complex/R4 b/tests/boolean/bfuse_complex/R4
index 6170e82d28..5c7c8d3003 100644
--- a/tests/boolean/bfuse_complex/R4
+++ b/tests/boolean/bfuse_complex/R4
@@ -3,8 +3,8 @@ puts "PRO16255"
 puts "Fuse"
 puts ""
 
-restore part3bis.brep s
-restore part5-noFillet.brep t
+restore [locate_data_file part3bis.brep] s
+restore [locate_data_file part5-noFillet.brep] t
 
 updatetolerance s 1
 updatetolerance t 1
diff --git a/tests/boolean/bfuse_complex/R5 b/tests/boolean/bfuse_complex/R5
index 6292e6a710..c1eb787ed9 100644
--- a/tests/boolean/bfuse_complex/R5
+++ b/tests/boolean/bfuse_complex/R5
@@ -3,8 +3,8 @@ puts "PRO16255"
 puts "Fuse"
 puts ""
 
-restore part3bis.brep s
-restore part5-with-fillet.brep u
+restore [locate_data_file part3bis.brep] s
+restore [locate_data_file part5-with-fillet.brep] u
 updatetolerance s 1
 updatetolerance u 1
 
diff --git a/tests/boolean/bfuse_complex/R6 b/tests/boolean/bfuse_complex/R6
index 6620d3312c..a502ef06f4 100644
--- a/tests/boolean/bfuse_complex/R6
+++ b/tests/boolean/bfuse_complex/R6
@@ -3,8 +3,8 @@ puts "PRO16255"
 puts "Fuse"
 puts ""
 
-restore part3bis.brep s
-restore part5-with-fillet.brep u
+restore [locate_data_file part3bis.brep] s
+restore [locate_data_file part5-with-fillet.brep] u
 
 tscale s 0 0 0 0.01
 tscale u 0 0 0 0.01
diff --git a/tests/boolean/bfuse_complex/R7 b/tests/boolean/bfuse_complex/R7
index bc78698155..17d0d0c431 100644
--- a/tests/boolean/bfuse_complex/R7
+++ b/tests/boolean/bfuse_complex/R7
@@ -3,8 +3,8 @@ puts "PRO16261"
 puts "Fuse"
 puts ""
 
-restore pro16261-1.brep s
-restore pro16261-2.brep t
+restore [locate_data_file pro16261-1.brep] s
+restore [locate_data_file pro16261-2.brep] t
 
 maxtolerance s
 #face tangente
diff --git a/tests/boolean/bfuse_complex/R8 b/tests/boolean/bfuse_complex/R8
index ff39f11288..39c3aaa076 100644
--- a/tests/boolean/bfuse_complex/R8
+++ b/tests/boolean/bfuse_complex/R8
@@ -2,8 +2,8 @@ puts "PRO16769"
 puts "Fuse"
 puts ""
 
-restore pro16769a.rle base
-restore pro16769b.rle tool
+restore [locate_data_file pro16769a.rle] base
+restore [locate_data_file pro16769b.rle] tool
 
 bfuse result base tool
 fsameparameter result
diff --git a/tests/boolean/bfuse_complex/R9 b/tests/boolean/bfuse_complex/R9
index 4fa8b128b5..f561621e31 100644
--- a/tests/boolean/bfuse_complex/R9
+++ b/tests/boolean/bfuse_complex/R9
@@ -5,12 +5,12 @@ puts "PRO18457"
 puts "Fuse"
 puts ""
 
-puts "TODO #22911 ALL: Error : The bfuse can not be build"
+puts "TODO #22911 ALL: Faulty shapes in variables faulty_1 to faulty_"
+puts "TODO #22911 ALL: Error : The square of result shape is"
 
-restore pro18457a.rle f1
-restore pro18457b.rle f2
-
-bfuse restore f1 f2
+restore [locate_data_file pro18457a.rle] f1
+restore [locate_data_file pro18457b.rle] f2
 
+bfuse result f1 f2
 
 set square 0
diff --git a/tests/boolean/bfuse_complex/S1 b/tests/boolean/bfuse_complex/S1
index bdd874ab22..13804d335c 100644
--- a/tests/boolean/bfuse_complex/S1
+++ b/tests/boolean/bfuse_complex/S1
@@ -3,8 +3,8 @@ puts "Fuse"
 puts ""
 
 
-restore uki60919a.brep base
-restore uki60919b.brep cont
+restore [locate_data_file uki60919a.brep] base
+restore [locate_data_file uki60919b.brep] cont
 
 prism pr cont 0 0 -200
 
diff --git a/tests/boolean/bfuse_complex/S2 b/tests/boolean/bfuse_complex/S2
index 0b85817002..9598fa25e2 100644
--- a/tests/boolean/bfuse_complex/S2
+++ b/tests/boolean/bfuse_complex/S2
@@ -3,8 +3,8 @@ puts "Fuse"
 puts ""
 dall
 
-restore hkg60159a.brep sh
-restore hkg60159b.brep ct
+restore [locate_data_file hkg60159a.brep] sh
+restore [locate_data_file hkg60159b.brep] ct
 
 prism pr ct 0 -30 0
 bcut res pr sh
diff --git a/tests/boolean/bfuse_complex/S3 b/tests/boolean/bfuse_complex/S3
index e2687c77c1..2d3f9d4691 100644
--- a/tests/boolean/bfuse_complex/S3
+++ b/tests/boolean/bfuse_complex/S3
@@ -3,8 +3,8 @@ puts "Fuse"
 puts ""
 
 
-restore pro15203_12.brep c1
-restore pro15203_21.brep c2
+restore [locate_data_file pro15203_12.brep] c1
+restore [locate_data_file pro15203_21.brep] c2
 ########################mod by pkv f
 explode c1 f
 copy c1_1 c1
diff --git a/tests/boolean/bfuse_complex/S4 b/tests/boolean/bfuse_complex/S4
index ed22707aa8..95efd655c9 100644
--- a/tests/boolean/bfuse_complex/S4
+++ b/tests/boolean/bfuse_complex/S4
@@ -2,8 +2,8 @@ puts "PRO15203"
 puts "Fuse"
 puts ""
 
-restore pro15203_12.brep c1
-restore pro15203_22.brep c2
+restore [locate_data_file pro15203_12.brep] c1
+restore [locate_data_file pro15203_22.brep] c2
 
 ########################mod by pkv f
 explode c1 f
diff --git a/tests/boolean/bfuse_complex/S5 b/tests/boolean/bfuse_complex/S5
index 6cda06af57..2bca324d35 100644
--- a/tests/boolean/bfuse_complex/S5
+++ b/tests/boolean/bfuse_complex/S5
@@ -1,8 +1,8 @@
 # Original bug : cts20944
 # Date : 16July98
 
-restore cts20944a.rle a 
-restore cts20944b.rle b
+restore [locate_data_file cts20944a.rle] a 
+restore [locate_data_file cts20944b.rle] b
 fsameparameter a
 
 bfuse result a b
diff --git a/tests/boolean/bfuse_complex/S6 b/tests/boolean/bfuse_complex/S6
index aaecac1bd2..5d4547e557 100644
--- a/tests/boolean/bfuse_complex/S6
+++ b/tests/boolean/bfuse_complex/S6
@@ -1,7 +1,7 @@
 # Original bug : pro12896
 
-restore shape1.rle a
-restore outil1.rle b
+restore [locate_data_file shape1.rle] a
+restore [locate_data_file outil1.rle] b
 
 bfuse result a b
 
diff --git a/tests/boolean/bopcommon_2d/A1 b/tests/boolean/bopcommon_2d/A1
index 8d18fe4f92..0a699ec514 100644
--- a/tests/boolean/bopcommon_2d/A1
+++ b/tests/boolean/bopcommon_2d/A1
@@ -1,5 +1,5 @@
-restore case_1_solid.brep a
-restore case_1_edge1.brep b
+restore [locate_data_file case_1_solid.brep] a
+restore [locate_data_file case_1_edge1.brep] b
 bop a b
 bopcommon result
 set length 100.002
diff --git a/tests/boolean/bopcommon_2d/A2 b/tests/boolean/bopcommon_2d/A2
index 0698ff908e..80ce6da750 100644
--- a/tests/boolean/bopcommon_2d/A2
+++ b/tests/boolean/bopcommon_2d/A2
@@ -1,5 +1,5 @@
-restore case_1_solid.brep a
-restore case_1_edge2.brep b
+restore [locate_data_file case_1_solid.brep] a
+restore [locate_data_file case_1_edge2.brep] b
 bop a b
 bopcommon result
 set length empty
diff --git a/tests/boolean/bopcommon_2d/A3 b/tests/boolean/bopcommon_2d/A3
index 2d6308af11..dceba50234 100644
--- a/tests/boolean/bopcommon_2d/A3
+++ b/tests/boolean/bopcommon_2d/A3
@@ -1,5 +1,5 @@
-restore case_1_solid.brep a
-restore case_1_edge3.brep b
+restore [locate_data_file case_1_solid.brep] a
+restore [locate_data_file case_1_edge3.brep] b
 bop a b
 bopcommon result
 set length 297.02
diff --git a/tests/boolean/bopcommon_2d/A4 b/tests/boolean/bopcommon_2d/A4
index efc6c7b826..6867730865 100644
--- a/tests/boolean/bopcommon_2d/A4
+++ b/tests/boolean/bopcommon_2d/A4
@@ -1,5 +1,5 @@
-restore case_1_solid.brep a
-restore case_1_edge4.brep b
+restore [locate_data_file case_1_solid.brep] a
+restore [locate_data_file case_1_edge4.brep] b
 bop a b
 bopcommon result
 set length 471.239
diff --git a/tests/boolean/bopcommon_2d/A5 b/tests/boolean/bopcommon_2d/A5
index 7ba3f8771e..f7acc29fac 100644
--- a/tests/boolean/bopcommon_2d/A5
+++ b/tests/boolean/bopcommon_2d/A5
@@ -1,5 +1,5 @@
-restore case_1_solid.brep a
-restore case_1_wire1.brep b
+restore [locate_data_file case_1_solid.brep] a
+restore [locate_data_file case_1_wire1.brep] b
 bop a b
 bopcommon result
 set length 100.002
diff --git a/tests/boolean/bopcommon_2d/A6 b/tests/boolean/bopcommon_2d/A6
index ec2db33683..6bfb1b3ab2 100644
--- a/tests/boolean/bopcommon_2d/A6
+++ b/tests/boolean/bopcommon_2d/A6
@@ -1,5 +1,5 @@
-restore case_1_solid.brep a
-restore case_1_wire2.brep b
+restore [locate_data_file case_1_solid.brep] a
+restore [locate_data_file case_1_wire2.brep] b
 bop a b
 bopcommon result
 set length 350.738
diff --git a/tests/boolean/bopcommon_2d/A7 b/tests/boolean/bopcommon_2d/A7
index d70b890d1f..e8b836577b 100644
--- a/tests/boolean/bopcommon_2d/A7
+++ b/tests/boolean/bopcommon_2d/A7
@@ -1,5 +1,5 @@
-restore case_1_solid.brep a
-restore case_1_wire3.brep b
+restore [locate_data_file case_1_solid.brep] a
+restore [locate_data_file case_1_wire3.brep] b
 bop a b
 bopcommon result
 set length 942.478
diff --git a/tests/boolean/bopcommon_2d/A8 b/tests/boolean/bopcommon_2d/A8
index 47802178ac..f3a9d8d145 100644
--- a/tests/boolean/bopcommon_2d/A8
+++ b/tests/boolean/bopcommon_2d/A8
@@ -1,5 +1,5 @@
-restore case_1_shell.brep a
-restore case_1_edge2.brep b
+restore [locate_data_file case_1_shell.brep] a
+restore [locate_data_file case_1_edge2.brep] b
 bop a b
 bopcommon result
 set length empty
diff --git a/tests/boolean/bopcommon_2d/A9 b/tests/boolean/bopcommon_2d/A9
index f39f65d607..12a2fb8fb9 100644
--- a/tests/boolean/bopcommon_2d/A9
+++ b/tests/boolean/bopcommon_2d/A9
@@ -1,5 +1,5 @@
-restore case_1_shell.brep a
-restore case_1_edge4.brep b
+restore [locate_data_file case_1_shell.brep] a
+restore [locate_data_file case_1_edge4.brep] b
 bop a b
 bopcommon result
 set length 471.239
diff --git a/tests/boolean/bopcommon_2d/B1 b/tests/boolean/bopcommon_2d/B1
index 61eca7a0ed..b58c041997 100644
--- a/tests/boolean/bopcommon_2d/B1
+++ b/tests/boolean/bopcommon_2d/B1
@@ -1,5 +1,5 @@
-restore case_1_shell.brep a
-restore case_1_wire3.brep b
+restore [locate_data_file case_1_shell.brep] a
+restore [locate_data_file case_1_wire3.brep] b
 bop a b
 bopcommon result
 set length 942.478
diff --git a/tests/boolean/bopcommon_2d/B2 b/tests/boolean/bopcommon_2d/B2
index 41a4bebc1e..f033c20474 100644
--- a/tests/boolean/bopcommon_2d/B2
+++ b/tests/boolean/bopcommon_2d/B2
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_edge1.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_edge1.brep] b
 bop a b
 bopcommon result
 set length 847.007
diff --git a/tests/boolean/bopcommon_2d/B3 b/tests/boolean/bopcommon_2d/B3
index 582bedf871..4579a89e17 100644
--- a/tests/boolean/bopcommon_2d/B3
+++ b/tests/boolean/bopcommon_2d/B3
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_edge2.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_edge2.brep] b
 bop a b
 bopcommon result
 set length 847.007
diff --git a/tests/boolean/bopcommon_2d/B4 b/tests/boolean/bopcommon_2d/B4
index dceca19de5..0f74af1acd 100644
--- a/tests/boolean/bopcommon_2d/B4
+++ b/tests/boolean/bopcommon_2d/B4
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_edge3.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_edge3.brep] b
 bop a b
 bopcommon result
 set length 753.315
diff --git a/tests/boolean/bopcommon_2d/B5 b/tests/boolean/bopcommon_2d/B5
index 2f226f4627..4adcd3a95b 100644
--- a/tests/boolean/bopcommon_2d/B5
+++ b/tests/boolean/bopcommon_2d/B5
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_edge4.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_edge4.brep] b
 bop a b
 bopcommon result
 set length 753.315
diff --git a/tests/boolean/bopcommon_2d/B6 b/tests/boolean/bopcommon_2d/B6
index 54fdfb18bc..122a3aee8b 100644
--- a/tests/boolean/bopcommon_2d/B6
+++ b/tests/boolean/bopcommon_2d/B6
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_wire1.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_wire1.brep] b
 bop a b
 bopcommon result
 set length 874
diff --git a/tests/boolean/bopcommon_2d/B7 b/tests/boolean/bopcommon_2d/B7
index fa4a916aee..c8d6d0c2b9 100644
--- a/tests/boolean/bopcommon_2d/B7
+++ b/tests/boolean/bopcommon_2d/B7
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_wire2.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_wire2.brep] b
 bop a b
 bopcommon result
 set length 874
diff --git a/tests/boolean/bopcommon_2d/B8 b/tests/boolean/bopcommon_2d/B8
index 7d793714e9..a5f5a3f438 100644
--- a/tests/boolean/bopcommon_2d/B8
+++ b/tests/boolean/bopcommon_2d/B8
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_wire3.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_wire3.brep] b
 bop a b
 bopcommon result
 set length 846.821
diff --git a/tests/boolean/bopcommon_2d/B9 b/tests/boolean/bopcommon_2d/B9
index eaf9a080cf..3b21cc9e29 100644
--- a/tests/boolean/bopcommon_2d/B9
+++ b/tests/boolean/bopcommon_2d/B9
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_wire4.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_wire4.brep] b
 bop a b
 bopcommon result
 set length 768.597
diff --git a/tests/boolean/bopcommon_2d/C1 b/tests/boolean/bopcommon_2d/C1
index 58c91e59d8..8b06e9c91e 100644
--- a/tests/boolean/bopcommon_2d/C1
+++ b/tests/boolean/bopcommon_2d/C1
@@ -1,5 +1,5 @@
-restore case_2_shell_r.brep a
-restore case_2_edge1.brep b
+restore [locate_data_file case_2_shell_r.brep] a
+restore [locate_data_file case_2_edge1.brep] b
 bop a b
 bopcommon result
 set length 847.007
diff --git a/tests/boolean/bopcommon_2d/C2 b/tests/boolean/bopcommon_2d/C2
index 4fd858c586..2bf7b5d381 100644
--- a/tests/boolean/bopcommon_2d/C2
+++ b/tests/boolean/bopcommon_2d/C2
@@ -1,5 +1,5 @@
-restore case_2_shell_r.brep a
-restore case_2_edge2.brep b
+restore [locate_data_file case_2_shell_r.brep] a
+restore [locate_data_file case_2_edge2.brep] b
 bop a b
 bopcommon result
 set length 847.007
diff --git a/tests/boolean/bopcommon_2d/C3 b/tests/boolean/bopcommon_2d/C3
index cd35983bd2..767c752091 100644
--- a/tests/boolean/bopcommon_2d/C3
+++ b/tests/boolean/bopcommon_2d/C3
@@ -1,5 +1,5 @@
-restore case_2_shell_r.brep a
-restore case_2_edge3.brep b
+restore [locate_data_file case_2_shell_r.brep] a
+restore [locate_data_file case_2_edge3.brep] b
 bop a b
 bopcommon result
 set length 753.315
diff --git a/tests/boolean/bopcommon_2d/C4 b/tests/boolean/bopcommon_2d/C4
index c945b3a722..d7fb9a7fde 100644
--- a/tests/boolean/bopcommon_2d/C4
+++ b/tests/boolean/bopcommon_2d/C4
@@ -1,5 +1,5 @@
-restore case_2_shell_r.brep a
-restore case_2_wire1.brep b
+restore [locate_data_file case_2_shell_r.brep] a
+restore [locate_data_file case_2_wire1.brep] b
 bop a b
 bopcommon result
 set length 874
diff --git a/tests/boolean/bopcommon_2d/C5 b/tests/boolean/bopcommon_2d/C5
index 20f175f8ed..fb69308b8b 100644
--- a/tests/boolean/bopcommon_2d/C5
+++ b/tests/boolean/bopcommon_2d/C5
@@ -1,5 +1,5 @@
-restore case_2_shell_r.brep a
-restore case_2_wire2.brep b
+restore [locate_data_file case_2_shell_r.brep] a
+restore [locate_data_file case_2_wire2.brep] b
 bop a b
 bopcommon result
 set length empty
diff --git a/tests/boolean/bopcommon_2d/C6 b/tests/boolean/bopcommon_2d/C6
index 5086ec8811..2e7ae62799 100644
--- a/tests/boolean/bopcommon_2d/C6
+++ b/tests/boolean/bopcommon_2d/C6
@@ -1,5 +1,5 @@
-restore case_2_shell_r.brep a
-restore case_2_wire3.brep b
+restore [locate_data_file case_2_shell_r.brep] a
+restore [locate_data_file case_2_wire3.brep] b
 bop a b
 bopcommon result
 set length 846.821
diff --git a/tests/boolean/bopcommon_2d/C7 b/tests/boolean/bopcommon_2d/C7
index 74e6d02fcd..1d46d9e82d 100644
--- a/tests/boolean/bopcommon_2d/C7
+++ b/tests/boolean/bopcommon_2d/C7
@@ -1,5 +1,5 @@
-restore case_2_face_r.brep a
-restore case_2_edge1.brep b
+restore [locate_data_file case_2_face_r.brep] a
+restore [locate_data_file case_2_edge1.brep] b
 bop a b
 bopcommon result
 set length 847.007
diff --git a/tests/boolean/bopcommon_2d/C8 b/tests/boolean/bopcommon_2d/C8
index b7b7fe8956..4895fedd32 100644
--- a/tests/boolean/bopcommon_2d/C8
+++ b/tests/boolean/bopcommon_2d/C8
@@ -1,5 +1,5 @@
-restore case_2_face_r.brep a
-restore case_2_edge3.brep b
+restore [locate_data_file case_2_face_r.brep] a
+restore [locate_data_file case_2_edge3.brep] b
 bop a b
 bopcommon result
 set length 753.315
diff --git a/tests/boolean/bopcommon_2d/C9 b/tests/boolean/bopcommon_2d/C9
index 619f5ea522..446a89ac9a 100644
--- a/tests/boolean/bopcommon_2d/C9
+++ b/tests/boolean/bopcommon_2d/C9
@@ -1,5 +1,5 @@
-restore case_2_face_r.brep a
-restore case_2_wire1.brep b
+restore [locate_data_file case_2_face_r.brep] a
+restore [locate_data_file case_2_wire1.brep] b
 bop a b
 bopcommon result
 set length 874
diff --git a/tests/boolean/bopcommon_2d/D1 b/tests/boolean/bopcommon_2d/D1
index 8716f958c0..7129e85b8e 100644
--- a/tests/boolean/bopcommon_2d/D1
+++ b/tests/boolean/bopcommon_2d/D1
@@ -1,5 +1,5 @@
-restore case_2_face_r.brep a
-restore case_2_wire3.brep b
+restore [locate_data_file case_2_face_r.brep] a
+restore [locate_data_file case_2_wire3.brep] b
 bop a b
 bopcommon result
 set length 846.821
diff --git a/tests/boolean/bopcommon_2d/D2 b/tests/boolean/bopcommon_2d/D2
index 8032347e41..9d795d85aa 100644
--- a/tests/boolean/bopcommon_2d/D2
+++ b/tests/boolean/bopcommon_2d/D2
@@ -1,5 +1,5 @@
-restore case_3_solid.brep a
-restore case_3_edge1.brep b
+restore [locate_data_file case_3_solid.brep] a
+restore [locate_data_file case_3_edge1.brep] b
 bop a b
 bopcommon result
 set length 345.975
diff --git a/tests/boolean/bopcommon_2d/D3 b/tests/boolean/bopcommon_2d/D3
index f922af9b56..354a13ded3 100644
--- a/tests/boolean/bopcommon_2d/D3
+++ b/tests/boolean/bopcommon_2d/D3
@@ -1,5 +1,5 @@
-restore case_3_solid.brep a
-restore case_3_edge2.brep b
+restore [locate_data_file case_3_solid.brep] a
+restore [locate_data_file case_3_edge2.brep] b
 bop a b
 bopcommon result
 set length 345.975
diff --git a/tests/boolean/bopcommon_2d/D4 b/tests/boolean/bopcommon_2d/D4
index d6f9528909..fcbdf26852 100644
--- a/tests/boolean/bopcommon_2d/D4
+++ b/tests/boolean/bopcommon_2d/D4
@@ -1,5 +1,5 @@
-restore case_3_solid.brep a
-restore case_3_wire1.brep b
+restore [locate_data_file case_3_solid.brep] a
+restore [locate_data_file case_3_wire1.brep] b
 bop a b
 bopcommon result
 set length 345.975
diff --git a/tests/boolean/bopcommon_2d/D5 b/tests/boolean/bopcommon_2d/D5
index 9e4e248020..c5b5b6bace 100644
--- a/tests/boolean/bopcommon_2d/D5
+++ b/tests/boolean/bopcommon_2d/D5
@@ -1,5 +1,5 @@
-restore case_3_solid.brep a
-restore case_3_wire2.brep b
+restore [locate_data_file case_3_solid.brep] a
+restore [locate_data_file case_3_wire2.brep] b
 bop a b
 bopcommon result
 set length 345.975
diff --git a/tests/boolean/bopcommon_2d/D6 b/tests/boolean/bopcommon_2d/D6
index 69fc751b7e..a3a54d412e 100644
--- a/tests/boolean/bopcommon_2d/D6
+++ b/tests/boolean/bopcommon_2d/D6
@@ -1,5 +1,5 @@
-restore case_3_solid.brep a
-restore case_3_wire3.brep b
+restore [locate_data_file case_3_solid.brep] a
+restore [locate_data_file case_3_wire3.brep] b
 bop a b
 bopcommon result
 set length 345.975
diff --git a/tests/boolean/bopcommon_2d/D7 b/tests/boolean/bopcommon_2d/D7
index da6a6beb3a..12f48df170 100644
--- a/tests/boolean/bopcommon_2d/D7
+++ b/tests/boolean/bopcommon_2d/D7
@@ -1,5 +1,5 @@
-restore case_3_solid.brep a
-restore case_3_wire4.brep b
+restore [locate_data_file case_3_solid.brep] a
+restore [locate_data_file case_3_wire4.brep] b
 bop a b
 bopcommon result
 set length 345.975
diff --git a/tests/boolean/bopcommon_2d/D8 b/tests/boolean/bopcommon_2d/D8
index 4fd36c2bb3..66ad6e46b0 100644
--- a/tests/boolean/bopcommon_2d/D8
+++ b/tests/boolean/bopcommon_2d/D8
@@ -1,5 +1,5 @@
-restore case_3_solid.brep a
-restore case_3_wire5.brep b
+restore [locate_data_file case_3_solid.brep] a
+restore [locate_data_file case_3_wire5.brep] b
 bop a b
 bopcommon result
 set length 292.732
diff --git a/tests/boolean/bopcommon_2d/D9 b/tests/boolean/bopcommon_2d/D9
index 5af4957dea..6ada88eee7 100644
--- a/tests/boolean/bopcommon_2d/D9
+++ b/tests/boolean/bopcommon_2d/D9
@@ -1,5 +1,5 @@
-restore case_3_shell.brep a
-restore case_3_edge1.brep b
+restore [locate_data_file case_3_shell.brep] a
+restore [locate_data_file case_3_edge1.brep] b
 bop a b
 bopcommon result
 set length 345.975
diff --git a/tests/boolean/bopcommon_2d/E1 b/tests/boolean/bopcommon_2d/E1
index 0b6d90bc05..7e4621b89c 100644
--- a/tests/boolean/bopcommon_2d/E1
+++ b/tests/boolean/bopcommon_2d/E1
@@ -1,5 +1,5 @@
-restore case_3_shell.brep a
-restore case_3_edge2.brep b
+restore [locate_data_file case_3_shell.brep] a
+restore [locate_data_file case_3_edge2.brep] b
 bop a b
 bopcommon result
 set length 345.975
diff --git a/tests/boolean/bopcommon_2d/E2 b/tests/boolean/bopcommon_2d/E2
index 53d26f1763..2fdf879cc2 100644
--- a/tests/boolean/bopcommon_2d/E2
+++ b/tests/boolean/bopcommon_2d/E2
@@ -1,5 +1,5 @@
-restore case_3_shell.brep a
-restore case_3_wire1.brep b
+restore [locate_data_file case_3_shell.brep] a
+restore [locate_data_file case_3_wire1.brep] b
 bop a b
 bopcommon result
 set length 345.975
diff --git a/tests/boolean/bopcommon_2d/E3 b/tests/boolean/bopcommon_2d/E3
index 18bd5ba0be..e154333d93 100644
--- a/tests/boolean/bopcommon_2d/E3
+++ b/tests/boolean/bopcommon_2d/E3
@@ -1,5 +1,5 @@
-restore case_3_shell.brep a
-restore case_3_wire2.brep b
+restore [locate_data_file case_3_shell.brep] a
+restore [locate_data_file case_3_wire2.brep] b
 bop a b
 bopcommon result
 set length 345.975
diff --git a/tests/boolean/bopcommon_2d/E4 b/tests/boolean/bopcommon_2d/E4
index 7989a82846..4147f111fa 100644
--- a/tests/boolean/bopcommon_2d/E4
+++ b/tests/boolean/bopcommon_2d/E4
@@ -1,5 +1,5 @@
-restore case_3_shell.brep a
-restore case_3_wire3.brep b
+restore [locate_data_file case_3_shell.brep] a
+restore [locate_data_file case_3_wire3.brep] b
 bop a b
 bopcommon result
 set length 345.975
diff --git a/tests/boolean/bopcommon_2d/E5 b/tests/boolean/bopcommon_2d/E5
index c790c09904..34f8e1d454 100644
--- a/tests/boolean/bopcommon_2d/E5
+++ b/tests/boolean/bopcommon_2d/E5
@@ -1,5 +1,5 @@
-restore case_3_shell.brep a
-restore case_3_wire4.brep b
+restore [locate_data_file case_3_shell.brep] a
+restore [locate_data_file case_3_wire4.brep] b
 bop a b
 bopcommon result
 set length 345.975
diff --git a/tests/boolean/bopcommon_2d/E6 b/tests/boolean/bopcommon_2d/E6
index cfd96f382e..e85cf1b671 100644
--- a/tests/boolean/bopcommon_2d/E6
+++ b/tests/boolean/bopcommon_2d/E6
@@ -1,5 +1,5 @@
-restore case_3_shell.brep a
-restore case_3_wire5.brep b
+restore [locate_data_file case_3_shell.brep] a
+restore [locate_data_file case_3_wire5.brep] b
 bop a b
 bopcommon result
 set length 292.732
diff --git a/tests/boolean/bopcommon_2d/E7 b/tests/boolean/bopcommon_2d/E7
index 8dce580620..6f1d7eb967 100644
--- a/tests/boolean/bopcommon_2d/E7
+++ b/tests/boolean/bopcommon_2d/E7
@@ -1,5 +1,5 @@
-restore case_3_face.brep a
-restore case_3_edge1.brep b
+restore [locate_data_file case_3_face.brep] a
+restore [locate_data_file case_3_edge1.brep] b
 bop a b
 bopcommon result
 set length 345.975
diff --git a/tests/boolean/bopcommon_2d/E8 b/tests/boolean/bopcommon_2d/E8
index 303d75f21b..6e033c88ca 100644
--- a/tests/boolean/bopcommon_2d/E8
+++ b/tests/boolean/bopcommon_2d/E8
@@ -1,5 +1,5 @@
-restore case_3_face.brep a
-restore case_3_wire1.brep b
+restore [locate_data_file case_3_face.brep] a
+restore [locate_data_file case_3_wire1.brep] b
 bop a b
 bopcommon result
 set length 345.975
diff --git a/tests/boolean/bopcommon_2d/E9 b/tests/boolean/bopcommon_2d/E9
index dbf8e8be8d..b575360b70 100644
--- a/tests/boolean/bopcommon_2d/E9
+++ b/tests/boolean/bopcommon_2d/E9
@@ -1,5 +1,5 @@
-restore case_4_shell.brep a
-restore case_4_wire3.brep b
+restore [locate_data_file case_4_shell.brep] a
+restore [locate_data_file case_4_wire3.brep] b
 bop a b
 bopcommon result
 set length 1150.78
diff --git a/tests/boolean/bopcommon_2d/F1 b/tests/boolean/bopcommon_2d/F1
index 08de113938..447541ddce 100644
--- a/tests/boolean/bopcommon_2d/F1
+++ b/tests/boolean/bopcommon_2d/F1
@@ -1,5 +1,5 @@
-restore case_3_face.brep a
-restore case_3_wire5.brep b
+restore [locate_data_file case_3_face.brep] a
+restore [locate_data_file case_3_wire5.brep] b
 bop a b
 bopcommon result
 set length 66.3661
diff --git a/tests/boolean/bopcommon_2d/F2 b/tests/boolean/bopcommon_2d/F2
index 47d50e18bd..392997cdfc 100644
--- a/tests/boolean/bopcommon_2d/F2
+++ b/tests/boolean/bopcommon_2d/F2
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_edge1.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_edge1.brep] b
 bop a b
 bopcommon result
 set length 345.975
diff --git a/tests/boolean/bopcommon_2d/F3 b/tests/boolean/bopcommon_2d/F3
index 856686778b..b0fd690040 100644
--- a/tests/boolean/bopcommon_2d/F3
+++ b/tests/boolean/bopcommon_2d/F3
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_wire1.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_wire1.brep] b
 bop a b
 bopcommon result
 set length 345.975
diff --git a/tests/boolean/bopcommon_2d/F4 b/tests/boolean/bopcommon_2d/F4
index fd3229889f..f7fed6c7e1 100644
--- a/tests/boolean/bopcommon_2d/F4
+++ b/tests/boolean/bopcommon_2d/F4
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_wire2.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_wire2.brep] b
 bop a b
 bopcommon result
 set length 345.975
diff --git a/tests/boolean/bopcommon_2d/F5 b/tests/boolean/bopcommon_2d/F5
index f089dae2d5..1ec439ce97 100644
--- a/tests/boolean/bopcommon_2d/F5
+++ b/tests/boolean/bopcommon_2d/F5
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_wire5.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_wire5.brep] b
 bop a b
 bopcommon result
 set length 66.3661
diff --git a/tests/boolean/bopcommon_2d/F6 b/tests/boolean/bopcommon_2d/F6
index 1e12c59f58..9411850702 100644
--- a/tests/boolean/bopcommon_2d/F6
+++ b/tests/boolean/bopcommon_2d/F6
@@ -1,5 +1,5 @@
-restore case_4_solid.brep a
-restore case_4_edge1.brep b
+restore [locate_data_file case_4_solid.brep] a
+restore [locate_data_file case_4_edge1.brep] b
 bop a b
 bopcommon result
 set length 1231.36
diff --git a/tests/boolean/bopcommon_2d/F7 b/tests/boolean/bopcommon_2d/F7
index 8a7888963b..3fcedea168 100644
--- a/tests/boolean/bopcommon_2d/F7
+++ b/tests/boolean/bopcommon_2d/F7
@@ -1,5 +1,5 @@
-restore case_4_solid.brep a
-restore case_4_edge2.brep b
+restore [locate_data_file case_4_solid.brep] a
+restore [locate_data_file case_4_edge2.brep] b
 bop a b
 bopcommon result
 set length 1231.36
diff --git a/tests/boolean/bopcommon_2d/F8 b/tests/boolean/bopcommon_2d/F8
index 3243adb4c7..4c1058795d 100644
--- a/tests/boolean/bopcommon_2d/F8
+++ b/tests/boolean/bopcommon_2d/F8
@@ -1,5 +1,5 @@
-restore case_4_solid.brep a
-restore case_4_edge3.brep b
+restore [locate_data_file case_4_solid.brep] a
+restore [locate_data_file case_4_edge3.brep] b
 bop a b
 bopcommon result
 set length 375.748
diff --git a/tests/boolean/bopcommon_2d/F9 b/tests/boolean/bopcommon_2d/F9
index a224d11d7f..b1636d21d1 100644
--- a/tests/boolean/bopcommon_2d/F9
+++ b/tests/boolean/bopcommon_2d/F9
@@ -1,5 +1,5 @@
-restore case_4_solid.brep a
-restore case_4_wire1.brep b
+restore [locate_data_file case_4_solid.brep] a
+restore [locate_data_file case_4_wire1.brep] b
 bop a b
 bopcommon result
 set length 2553.95
diff --git a/tests/boolean/bopcommon_2d/G1 b/tests/boolean/bopcommon_2d/G1
index 17567ec82b..4c4af485d1 100644
--- a/tests/boolean/bopcommon_2d/G1
+++ b/tests/boolean/bopcommon_2d/G1
@@ -1,5 +1,5 @@
-restore case_4_solid.brep a
-restore case_4_wire2.brep b
+restore [locate_data_file case_4_solid.brep] a
+restore [locate_data_file case_4_wire2.brep] b
 bop a b
 bopcommon result
 set length 2553.95
diff --git a/tests/boolean/bopcommon_2d/G2 b/tests/boolean/bopcommon_2d/G2
index dadc826a89..534dafa77f 100644
--- a/tests/boolean/bopcommon_2d/G2
+++ b/tests/boolean/bopcommon_2d/G2
@@ -1,5 +1,5 @@
-restore case_4_solid.brep a
-restore case_4_wire3.brep b
+restore [locate_data_file case_4_solid.brep] a
+restore [locate_data_file case_4_wire3.brep] b
 bop a b
 bopcommon result
 set length 633.071
diff --git a/tests/boolean/bopcommon_2d/G3 b/tests/boolean/bopcommon_2d/G3
index 4865f8fb94..2c0a815920 100644
--- a/tests/boolean/bopcommon_2d/G3
+++ b/tests/boolean/bopcommon_2d/G3
@@ -1,5 +1,5 @@
-restore case_4_solid.brep a
-restore case_4_wire4.brep b
+restore [locate_data_file case_4_solid.brep] a
+restore [locate_data_file case_4_wire4.brep] b
 bop a b
 bopcommon result
 set length 633.071
diff --git a/tests/boolean/bopcommon_2d/G4 b/tests/boolean/bopcommon_2d/G4
index 9a579a8f98..93cee247ad 100644
--- a/tests/boolean/bopcommon_2d/G4
+++ b/tests/boolean/bopcommon_2d/G4
@@ -1,5 +1,5 @@
-restore case_4_shell.brep a
-restore case_4_edge1.brep b
+restore [locate_data_file case_4_shell.brep] a
+restore [locate_data_file case_4_edge1.brep] b
 bop a b
 bopcommon result
 set length 615.235
diff --git a/tests/boolean/bopcommon_2d/G5 b/tests/boolean/bopcommon_2d/G5
index 77789b3bc8..15da525f29 100644
--- a/tests/boolean/bopcommon_2d/G5
+++ b/tests/boolean/bopcommon_2d/G5
@@ -1,5 +1,5 @@
-restore case_4_shell.brep a
-restore case_4_edge3.brep b
+restore [locate_data_file case_4_shell.brep] a
+restore [locate_data_file case_4_edge3.brep] b
 bop a b
 bopcommon result
 set length 474.547
diff --git a/tests/boolean/bopcommon_2d/G6 b/tests/boolean/bopcommon_2d/G6
index e2d5507970..7ca369c886 100644
--- a/tests/boolean/bopcommon_2d/G6
+++ b/tests/boolean/bopcommon_2d/G6
@@ -1,5 +1,5 @@
-restore case_4_shell.brep a
-restore case_4_wire1.brep b
+restore [locate_data_file case_4_shell.brep] a
+restore [locate_data_file case_4_wire1.brep] b
 bop a b
 bopcommon result
 set length 1245.29
diff --git a/tests/boolean/bopcommon_2d/G7 b/tests/boolean/bopcommon_2d/G7
index dbf8e8be8d..b575360b70 100644
--- a/tests/boolean/bopcommon_2d/G7
+++ b/tests/boolean/bopcommon_2d/G7
@@ -1,5 +1,5 @@
-restore case_4_shell.brep a
-restore case_4_wire3.brep b
+restore [locate_data_file case_4_shell.brep] a
+restore [locate_data_file case_4_wire3.brep] b
 bop a b
 bopcommon result
 set length 1150.78
diff --git a/tests/boolean/bopcommon_2d/G8 b/tests/boolean/bopcommon_2d/G8
index 62b09d01dc..c5f1fefb7e 100644
--- a/tests/boolean/bopcommon_2d/G8
+++ b/tests/boolean/bopcommon_2d/G8
@@ -1,5 +1,5 @@
-restore case_4_face.brep a
-restore case_4_edge1.brep b
+restore [locate_data_file case_4_face.brep] a
+restore [locate_data_file case_4_edge1.brep] b
 bop a b
 bopcommon result
 set length 615.235
diff --git a/tests/boolean/bopcommon_2d/G9 b/tests/boolean/bopcommon_2d/G9
index fab36cf22a..c848e6ed68 100644
--- a/tests/boolean/bopcommon_2d/G9
+++ b/tests/boolean/bopcommon_2d/G9
@@ -1,5 +1,5 @@
-restore case_4_face.brep a
-restore case_4_edge3.brep b
+restore [locate_data_file case_4_face.brep] a
+restore [locate_data_file case_4_edge3.brep] b
 bop a b
 bopcommon result
 set length 474.547
diff --git a/tests/boolean/bopcommon_2d/H1 b/tests/boolean/bopcommon_2d/H1
index a62580bb83..4edb1be57c 100644
--- a/tests/boolean/bopcommon_2d/H1
+++ b/tests/boolean/bopcommon_2d/H1
@@ -1,5 +1,5 @@
-restore case_4_face.brep a
-restore case_4_wire1.brep b
+restore [locate_data_file case_4_face.brep] a
+restore [locate_data_file case_4_wire1.brep] b
 bop a b
 bopcommon result
 set length 1245.29
diff --git a/tests/boolean/bopcommon_2d/H2 b/tests/boolean/bopcommon_2d/H2
index f0304af19d..6e6e5e526d 100644
--- a/tests/boolean/bopcommon_2d/H2
+++ b/tests/boolean/bopcommon_2d/H2
@@ -1,5 +1,5 @@
-restore case_4_face.brep a
-restore case_4_wire3.brep b
+restore [locate_data_file case_4_face.brep] a
+restore [locate_data_file case_4_wire3.brep] b
 bop a b
 bopcommon result
 set length 1150.78
diff --git a/tests/boolean/bopcommon_2d/H3 b/tests/boolean/bopcommon_2d/H3
index 36d8cb9e38..794b886e6d 100644
--- a/tests/boolean/bopcommon_2d/H3
+++ b/tests/boolean/bopcommon_2d/H3
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_edge1.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_edge1.brep] b
 bop a b
 bopcommon result
 set length 887.185
diff --git a/tests/boolean/bopcommon_2d/H4 b/tests/boolean/bopcommon_2d/H4
index 195958e707..a793fb2d02 100644
--- a/tests/boolean/bopcommon_2d/H4
+++ b/tests/boolean/bopcommon_2d/H4
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_edge2.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_edge2.brep] b
 bop a b
 bopcommon result
 set length 887.185
diff --git a/tests/boolean/bopcommon_2d/H5 b/tests/boolean/bopcommon_2d/H5
index 093eace802..1cd3d224d3 100644
--- a/tests/boolean/bopcommon_2d/H5
+++ b/tests/boolean/bopcommon_2d/H5
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_edge3.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_edge3.brep] b
 bop a b
 bopcommon result
 set length 829.541
diff --git a/tests/boolean/bopcommon_2d/H6 b/tests/boolean/bopcommon_2d/H6
index e1e62ca7c1..f600ec3132 100644
--- a/tests/boolean/bopcommon_2d/H6
+++ b/tests/boolean/bopcommon_2d/H6
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_wire1.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_wire1.brep] b
 bop a b
 bopcommon result
 set length 1747.73
diff --git a/tests/boolean/bopcommon_2d/H7 b/tests/boolean/bopcommon_2d/H7
index 4a3ed434c2..cda7454955 100644
--- a/tests/boolean/bopcommon_2d/H7
+++ b/tests/boolean/bopcommon_2d/H7
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_wire2.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_wire2.brep] b
 bop a b
 bopcommon result
 set length 1747.73
diff --git a/tests/boolean/bopcommon_2d/H8 b/tests/boolean/bopcommon_2d/H8
index eed83b5b24..2df05351b7 100644
--- a/tests/boolean/bopcommon_2d/H8
+++ b/tests/boolean/bopcommon_2d/H8
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_wire3.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_wire3.brep] b
 bop a b
 bopcommon result
 set length 1808.02
diff --git a/tests/boolean/bopcommon_2d/H9 b/tests/boolean/bopcommon_2d/H9
index 8e030872a1..888290d7da 100644
--- a/tests/boolean/bopcommon_2d/H9
+++ b/tests/boolean/bopcommon_2d/H9
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_wire4.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_wire4.brep] b
 bop a b
 bopcommon result
 set length 1808.02
diff --git a/tests/boolean/bopcommon_2d/I1 b/tests/boolean/bopcommon_2d/I1
index 3b5eeeeddd..e7d7f5f0e7 100644
--- a/tests/boolean/bopcommon_2d/I1
+++ b/tests/boolean/bopcommon_2d/I1
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_wire5.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_wire5.brep] b
 bop a b
 bopcommon result
 set length 3000.52
diff --git a/tests/boolean/bopcommon_2d/I2 b/tests/boolean/bopcommon_2d/I2
index 21a3927274..47dca9146b 100644
--- a/tests/boolean/bopcommon_2d/I2
+++ b/tests/boolean/bopcommon_2d/I2
@@ -1,5 +1,5 @@
-restore case_5_shell.brep a
-restore case_5_edge1.brep b
+restore [locate_data_file case_5_shell.brep] a
+restore [locate_data_file case_5_edge1.brep] b
 bop a b
 bopcommon result
 set length 887.185
diff --git a/tests/boolean/bopcommon_2d/I3 b/tests/boolean/bopcommon_2d/I3
index e501c28b80..dee952b4b2 100644
--- a/tests/boolean/bopcommon_2d/I3
+++ b/tests/boolean/bopcommon_2d/I3
@@ -1,5 +1,5 @@
-restore case_5_shell.brep a
-restore case_5_edge3.brep b
+restore [locate_data_file case_5_shell.brep] a
+restore [locate_data_file case_5_edge3.brep] b
 bop a b
 bopcommon result
 set length 829.541
diff --git a/tests/boolean/bopcommon_2d/I4 b/tests/boolean/bopcommon_2d/I4
index 0bba98062e..05a42c3ee9 100644
--- a/tests/boolean/bopcommon_2d/I4
+++ b/tests/boolean/bopcommon_2d/I4
@@ -1,5 +1,5 @@
-restore case_5_shell.brep a
-restore case_5_wire1.brep b
+restore [locate_data_file case_5_shell.brep] a
+restore [locate_data_file case_5_wire1.brep] b
 bop a b
 bopcommon result
 set length 1747.73
diff --git a/tests/boolean/bopcommon_2d/I5 b/tests/boolean/bopcommon_2d/I5
index 66ab4b9f83..d9f12376c9 100644
--- a/tests/boolean/bopcommon_2d/I5
+++ b/tests/boolean/bopcommon_2d/I5
@@ -1,5 +1,5 @@
-restore case_5_shell.brep a
-restore case_5_wire3.brep b
+restore [locate_data_file case_5_shell.brep] a
+restore [locate_data_file case_5_wire3.brep] b
 bop a b
 bopcommon result
 set length 1808.02
diff --git a/tests/boolean/bopcommon_2d/I6 b/tests/boolean/bopcommon_2d/I6
index 78accf7e94..ff6b172a7f 100644
--- a/tests/boolean/bopcommon_2d/I6
+++ b/tests/boolean/bopcommon_2d/I6
@@ -1,5 +1,5 @@
-restore case_5_shell.brep a
-restore case_5_wire5.brep b
+restore [locate_data_file case_5_shell.brep] a
+restore [locate_data_file case_5_wire5.brep] b
 bop a b
 bopcommon result
 set length 3000.52
diff --git a/tests/boolean/bopcommon_2d/I7 b/tests/boolean/bopcommon_2d/I7
index 13c8287c3e..6f592359b4 100644
--- a/tests/boolean/bopcommon_2d/I7
+++ b/tests/boolean/bopcommon_2d/I7
@@ -1,5 +1,5 @@
-restore case_5_face.brep a
-restore case_5_edge1.brep b
+restore [locate_data_file case_5_face.brep] a
+restore [locate_data_file case_5_edge1.brep] b
 bop a b
 bopcommon result
 set length 887.185
diff --git a/tests/boolean/bopcommon_2d/I8 b/tests/boolean/bopcommon_2d/I8
index e18d2dbc5c..f1bac89ece 100644
--- a/tests/boolean/bopcommon_2d/I8
+++ b/tests/boolean/bopcommon_2d/I8
@@ -1,5 +1,5 @@
-restore case_5_face.brep a
-restore case_5_edge3.brep b
+restore [locate_data_file case_5_face.brep] a
+restore [locate_data_file case_5_edge3.brep] b
 bop a b
 bopcommon result
 set length 829.541
diff --git a/tests/boolean/bopcommon_2d/I9 b/tests/boolean/bopcommon_2d/I9
index a828841536..bdfd600a64 100644
--- a/tests/boolean/bopcommon_2d/I9
+++ b/tests/boolean/bopcommon_2d/I9
@@ -1,5 +1,5 @@
-restore case_5_face.brep a
-restore case_5_wire1.brep b
+restore [locate_data_file case_5_face.brep] a
+restore [locate_data_file case_5_wire1.brep] b
 bop a b
 bopcommon result
 set length 1747.73
diff --git a/tests/boolean/bopcommon_2d/J1 b/tests/boolean/bopcommon_2d/J1
index e1e4905616..637bfb0702 100644
--- a/tests/boolean/bopcommon_2d/J1
+++ b/tests/boolean/bopcommon_2d/J1
@@ -1,5 +1,5 @@
-restore case_5_face.brep a
-restore case_5_wire3.brep b
+restore [locate_data_file case_5_face.brep] a
+restore [locate_data_file case_5_wire3.brep] b
 bop a b
 bopcommon result
 set length 1808.02
diff --git a/tests/boolean/bopcommon_2d/J2 b/tests/boolean/bopcommon_2d/J2
index 9fed7a3b5e..167e387c81 100644
--- a/tests/boolean/bopcommon_2d/J2
+++ b/tests/boolean/bopcommon_2d/J2
@@ -1,5 +1,5 @@
-restore case_6_solid.brep a
-restore case_6_edge1.brep b
+restore [locate_data_file case_6_solid.brep] a
+restore [locate_data_file case_6_edge1.brep] b
 bop a b
 bopcommon result
 set length 411.923
diff --git a/tests/boolean/bopcommon_2d/J3 b/tests/boolean/bopcommon_2d/J3
index 1f164f8ee8..e221b6c298 100644
--- a/tests/boolean/bopcommon_2d/J3
+++ b/tests/boolean/bopcommon_2d/J3
@@ -1,5 +1,5 @@
-restore case_6_solid.brep a
-restore case_6_edge2.brep b
+restore [locate_data_file case_6_solid.brep] a
+restore [locate_data_file case_6_edge2.brep] b
 bop a b
 bopcommon result
 set length 615.235
diff --git a/tests/boolean/bopcommon_2d/J4 b/tests/boolean/bopcommon_2d/J4
index 314752fc1f..c3de26f050 100644
--- a/tests/boolean/bopcommon_2d/J4
+++ b/tests/boolean/bopcommon_2d/J4
@@ -1,5 +1,5 @@
-restore case_6_solid.brep a
-restore case_6_edge3.brep b
+restore [locate_data_file case_6_solid.brep] a
+restore [locate_data_file case_6_edge3.brep] b
 bop a b
 bopcommon result
 set length 235.517
diff --git a/tests/boolean/bopcommon_2d/J5 b/tests/boolean/bopcommon_2d/J5
index fc7f157ce4..433ac6381f 100644
--- a/tests/boolean/bopcommon_2d/J5
+++ b/tests/boolean/bopcommon_2d/J5
@@ -1,5 +1,5 @@
-restore case_6_solid.brep a
-restore case_6_wire1.brep b
+restore [locate_data_file case_6_solid.brep] a
+restore [locate_data_file case_6_wire1.brep] b
 bop a b
 bopcommon result
 set length 815.584
diff --git a/tests/boolean/bopcommon_2d/J6 b/tests/boolean/bopcommon_2d/J6
index 6af943ca7f..09edd42f28 100644
--- a/tests/boolean/bopcommon_2d/J6
+++ b/tests/boolean/bopcommon_2d/J6
@@ -1,5 +1,5 @@
-restore case_6_solid.brep a
-restore case_6_wire2.brep b
+restore [locate_data_file case_6_solid.brep] a
+restore [locate_data_file case_6_wire2.brep] b
 bop a b
 bopcommon result
 set length 1245.29
diff --git a/tests/boolean/bopcommon_2d/J7 b/tests/boolean/bopcommon_2d/J7
index 46f46b76dc..285ddae1d1 100644
--- a/tests/boolean/bopcommon_2d/J7
+++ b/tests/boolean/bopcommon_2d/J7
@@ -1,5 +1,5 @@
-restore case_6_solid.brep a
-restore case_6_wire3.brep b
+restore [locate_data_file case_6_solid.brep] a
+restore [locate_data_file case_6_wire3.brep] b
 bop a b
 bopcommon result
 set length 629.671
diff --git a/tests/boolean/bopcommon_2d/J8 b/tests/boolean/bopcommon_2d/J8
index 1ad98d5dba..1be572ec10 100644
--- a/tests/boolean/bopcommon_2d/J8
+++ b/tests/boolean/bopcommon_2d/J8
@@ -1,5 +1,5 @@
-restore case_6_solid.brep a
-restore case_6_wire4.brep b
+restore [locate_data_file case_6_solid.brep] a
+restore [locate_data_file case_6_wire4.brep] b
 bop a b
 bopcommon result
 set length 1150.78
diff --git a/tests/boolean/bopcommon_2d/J9 b/tests/boolean/bopcommon_2d/J9
index 61dc4a9824..9d56528718 100644
--- a/tests/boolean/bopcommon_2d/J9
+++ b/tests/boolean/bopcommon_2d/J9
@@ -1,5 +1,5 @@
-restore case_6_shell.brep a
-restore case_6_edge1.brep b
+restore [locate_data_file case_6_shell.brep] a
+restore [locate_data_file case_6_edge1.brep] b
 bop a b
 bopcommon result
 set length 411.923
diff --git a/tests/boolean/bopcommon_2d/K1 b/tests/boolean/bopcommon_2d/K1
index 4a6d49488e..ee43295fb8 100644
--- a/tests/boolean/bopcommon_2d/K1
+++ b/tests/boolean/bopcommon_2d/K1
@@ -1,5 +1,5 @@
-restore case_6_shell.brep a
-restore case_6_edge3.brep b
+restore [locate_data_file case_6_shell.brep] a
+restore [locate_data_file case_6_edge3.brep] b
 bop a b
 bopcommon result
 set length 235.517
diff --git a/tests/boolean/bopcommon_2d/K2 b/tests/boolean/bopcommon_2d/K2
index a32d78becb..a4e279a3dc 100644
--- a/tests/boolean/bopcommon_2d/K2
+++ b/tests/boolean/bopcommon_2d/K2
@@ -1,5 +1,5 @@
-restore case_6_shell.brep a
-restore case_6_wire1.brep b
+restore [locate_data_file case_6_shell.brep] a
+restore [locate_data_file case_6_wire1.brep] b
 bop a b
 bopcommon result
 set length 815.584
diff --git a/tests/boolean/bopcommon_2d/K3 b/tests/boolean/bopcommon_2d/K3
index 9fbae8e9a3..b5254a621e 100644
--- a/tests/boolean/bopcommon_2d/K3
+++ b/tests/boolean/bopcommon_2d/K3
@@ -1,5 +1,5 @@
-restore case_6_shell.brep a
-restore case_6_wire3.brep b
+restore [locate_data_file case_6_shell.brep] a
+restore [locate_data_file case_6_wire3.brep] b
 bop a b
 bopcommon result
 set length 629.671
diff --git a/tests/boolean/bopcommon_2d/K4 b/tests/boolean/bopcommon_2d/K4
index c34865290c..4bed6e236f 100644
--- a/tests/boolean/bopcommon_2d/K4
+++ b/tests/boolean/bopcommon_2d/K4
@@ -1,5 +1,5 @@
-restore case_6_face.brep a
-restore case_6_edge1.brep b
+restore [locate_data_file case_6_face.brep] a
+restore [locate_data_file case_6_edge1.brep] b
 bop a b
 bopcommon result
 set length 411.923
diff --git a/tests/boolean/bopcommon_2d/K5 b/tests/boolean/bopcommon_2d/K5
index 6fad5b7a47..b8077cf605 100644
--- a/tests/boolean/bopcommon_2d/K5
+++ b/tests/boolean/bopcommon_2d/K5
@@ -1,5 +1,5 @@
-restore case_6_face.brep a
-restore case_6_edge3.brep b
+restore [locate_data_file case_6_face.brep] a
+restore [locate_data_file case_6_edge3.brep] b
 bop a b
 bopcommon result
 set length 235.517
diff --git a/tests/boolean/bopcommon_2d/K6 b/tests/boolean/bopcommon_2d/K6
index 3e446170da..ef21517669 100644
--- a/tests/boolean/bopcommon_2d/K6
+++ b/tests/boolean/bopcommon_2d/K6
@@ -1,5 +1,5 @@
-restore case_6_face.brep a
-restore case_6_wire1.brep b
+restore [locate_data_file case_6_face.brep] a
+restore [locate_data_file case_6_wire1.brep] b
 bop a b
 bopcommon result
 set length 815.584
diff --git a/tests/boolean/bopcommon_2d/K7 b/tests/boolean/bopcommon_2d/K7
index 50db5ab224..d699e9e20a 100644
--- a/tests/boolean/bopcommon_2d/K7
+++ b/tests/boolean/bopcommon_2d/K7
@@ -1,5 +1,5 @@
-restore case_6_face.brep a
-restore case_6_wire3.brep b
+restore [locate_data_file case_6_face.brep] a
+restore [locate_data_file case_6_wire3.brep] b
 bop a b
 bopcommon result
 set length 629.671
diff --git a/tests/boolean/bopcommon_2d/K8 b/tests/boolean/bopcommon_2d/K8
index 842f5e8533..fa9e331fa2 100644
--- a/tests/boolean/bopcommon_2d/K8
+++ b/tests/boolean/bopcommon_2d/K8
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_edge1.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_edge1.brep] b
 bop a b
 bopcommon result
 set length 482.392
diff --git a/tests/boolean/bopcommon_2d/K9 b/tests/boolean/bopcommon_2d/K9
index 9eeff479bf..f4fc917cab 100644
--- a/tests/boolean/bopcommon_2d/K9
+++ b/tests/boolean/bopcommon_2d/K9
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_edge2.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_edge2.brep] b
 bop a b
 bopcommon result
 set length 482.392
diff --git a/tests/boolean/bopcommon_2d/L1 b/tests/boolean/bopcommon_2d/L1
index 5b4c0f72fc..50dc4118a3 100644
--- a/tests/boolean/bopcommon_2d/L1
+++ b/tests/boolean/bopcommon_2d/L1
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_edge3.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_edge3.brep] b
 bop a b
 bopcommon result
 set length 520.393
diff --git a/tests/boolean/bopcommon_2d/L2 b/tests/boolean/bopcommon_2d/L2
index 5650f22c2f..3d10d1b0d9 100644
--- a/tests/boolean/bopcommon_2d/L2
+++ b/tests/boolean/bopcommon_2d/L2
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_edge4.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_edge4.brep] b
 bop a b
 bopcommon result
 set length 520.393
diff --git a/tests/boolean/bopcommon_2d/L3 b/tests/boolean/bopcommon_2d/L3
index b23b648e38..cbb6832aef 100644
--- a/tests/boolean/bopcommon_2d/L3
+++ b/tests/boolean/bopcommon_2d/L3
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_wire1.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_wire1.brep] b
 bop a b
 bopcommon result
 set length 482.392
diff --git a/tests/boolean/bopcommon_2d/L4 b/tests/boolean/bopcommon_2d/L4
index 13c6cbf5ae..8650ac91fa 100644
--- a/tests/boolean/bopcommon_2d/L4
+++ b/tests/boolean/bopcommon_2d/L4
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_wire2.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_wire2.brep] b
 bop a b
 bopcommon result
 set length 482.392
diff --git a/tests/boolean/bopcommon_2d/L5 b/tests/boolean/bopcommon_2d/L5
index 08ca907f98..d866af9345 100644
--- a/tests/boolean/bopcommon_2d/L5
+++ b/tests/boolean/bopcommon_2d/L5
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_wire3.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_wire3.brep] b
 bop a b
 bopcommon result
 set length 520.393
diff --git a/tests/boolean/bopcommon_2d/L6 b/tests/boolean/bopcommon_2d/L6
index ecfbfd6fd3..1c4d39b9c5 100644
--- a/tests/boolean/bopcommon_2d/L6
+++ b/tests/boolean/bopcommon_2d/L6
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_wire4.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_wire4.brep] b
 bop a b
 bopcommon result
 set length 520.393
diff --git a/tests/boolean/bopcommon_2d/L7 b/tests/boolean/bopcommon_2d/L7
index 16497279fc..ada382b5ee 100644
--- a/tests/boolean/bopcommon_2d/L7
+++ b/tests/boolean/bopcommon_2d/L7
@@ -1,5 +1,5 @@
-restore case_7_shell.brep a
-restore case_7_edge1.brep b
+restore [locate_data_file case_7_shell.brep] a
+restore [locate_data_file case_7_edge1.brep] b
 bop a b
 bopcommon result
 set length 482.392
diff --git a/tests/boolean/bopcommon_2d/L8 b/tests/boolean/bopcommon_2d/L8
index f7c1affcb4..523b0dc320 100644
--- a/tests/boolean/bopcommon_2d/L8
+++ b/tests/boolean/bopcommon_2d/L8
@@ -1,5 +1,5 @@
-restore case_7_shell.brep a
-restore case_7_edge3.brep b
+restore [locate_data_file case_7_shell.brep] a
+restore [locate_data_file case_7_edge3.brep] b
 bop a b
 bopcommon result
 set length 520.393
diff --git a/tests/boolean/bopcommon_2d/L9 b/tests/boolean/bopcommon_2d/L9
index 2be8237622..841ef65707 100644
--- a/tests/boolean/bopcommon_2d/L9
+++ b/tests/boolean/bopcommon_2d/L9
@@ -1,5 +1,5 @@
-restore case_7_shell.brep a
-restore case_7_wire1.brep b
+restore [locate_data_file case_7_shell.brep] a
+restore [locate_data_file case_7_wire1.brep] b
 bop a b
 bopcommon result
 set length 482.392
diff --git a/tests/boolean/bopcommon_2d/M1 b/tests/boolean/bopcommon_2d/M1
index 3a8ef29973..42132895dc 100644
--- a/tests/boolean/bopcommon_2d/M1
+++ b/tests/boolean/bopcommon_2d/M1
@@ -1,5 +1,5 @@
-restore case_7_shell.brep a
-restore case_7_wire3.brep b
+restore [locate_data_file case_7_shell.brep] a
+restore [locate_data_file case_7_wire3.brep] b
 bop a b
 bopcommon result
 set length 520.393
diff --git a/tests/boolean/bopcommon_2d/M2 b/tests/boolean/bopcommon_2d/M2
index d8a137b881..b736bf5928 100644
--- a/tests/boolean/bopcommon_2d/M2
+++ b/tests/boolean/bopcommon_2d/M2
@@ -1,5 +1,5 @@
-restore case_7_face.brep a
-restore case_7_edge1.brep b
+restore [locate_data_file case_7_face.brep] a
+restore [locate_data_file case_7_edge1.brep] b
 bop a b
 bopcommon result
 set length 482.392
diff --git a/tests/boolean/bopcommon_2d/M3 b/tests/boolean/bopcommon_2d/M3
index 0cfeabd9f1..9fdeade332 100644
--- a/tests/boolean/bopcommon_2d/M3
+++ b/tests/boolean/bopcommon_2d/M3
@@ -1,5 +1,5 @@
-restore case_7_face.brep a
-restore case_7_edge3.brep b
+restore [locate_data_file case_7_face.brep] a
+restore [locate_data_file case_7_edge3.brep] b
 bop a b
 bopcommon result
 set length 520.393
diff --git a/tests/boolean/bopcommon_2d/M4 b/tests/boolean/bopcommon_2d/M4
index 4f940bb893..a3577cd4ee 100644
--- a/tests/boolean/bopcommon_2d/M4
+++ b/tests/boolean/bopcommon_2d/M4
@@ -1,5 +1,5 @@
-restore case_7_face.brep a
-restore case_7_wire1.brep b
+restore [locate_data_file case_7_face.brep] a
+restore [locate_data_file case_7_wire1.brep] b
 bop a b
 bopcommon result
 set length 482.392
diff --git a/tests/boolean/bopcommon_2d/M5 b/tests/boolean/bopcommon_2d/M5
index 16498b261d..1f4874e784 100644
--- a/tests/boolean/bopcommon_2d/M5
+++ b/tests/boolean/bopcommon_2d/M5
@@ -1,5 +1,5 @@
-restore case_7_face.brep a
-restore case_7_wire3.brep b
+restore [locate_data_file case_7_face.brep] a
+restore [locate_data_file case_7_wire3.brep] b
 bop a b
 bopcommon result
 set length 520.393
diff --git a/tests/boolean/bopcommon_2d/M6 b/tests/boolean/bopcommon_2d/M6
index b2d806947f..e47fbdb94b 100644
--- a/tests/boolean/bopcommon_2d/M6
+++ b/tests/boolean/bopcommon_2d/M6
@@ -1,5 +1,5 @@
-restore case_8_solid_repaired.brep a
-restore case_8_wire1.brep b
+restore [locate_data_file case_8_solid_repaired.brep] a
+restore [locate_data_file case_8_wire1.brep] b
 bop a b
 bopcommon result
 set length 181.079
diff --git a/tests/boolean/bopcommon_2d/M7 b/tests/boolean/bopcommon_2d/M7
index 231b1cf79c..92355097e0 100644
--- a/tests/boolean/bopcommon_2d/M7
+++ b/tests/boolean/bopcommon_2d/M7
@@ -1,5 +1,5 @@
-restore case_8_solid_repaired.brep a
-restore case_8_wire2.brep b
+restore [locate_data_file case_8_solid_repaired.brep] a
+restore [locate_data_file case_8_wire2.brep] b
 bop a b
 bopcommon result
 set length 49.966
diff --git a/tests/boolean/bopcommon_2d/M8 b/tests/boolean/bopcommon_2d/M8
index 081ee3e152..4d957e5559 100644
--- a/tests/boolean/bopcommon_2d/M8
+++ b/tests/boolean/bopcommon_2d/M8
@@ -1,5 +1,5 @@
-restore case_8_solid_repaired.brep a
-restore case_8_wire3.brep b
+restore [locate_data_file case_8_solid_repaired.brep] a
+restore [locate_data_file case_8_wire3.brep] b
 bop a b
 bopcommon result
 set length 3.83899
diff --git a/tests/boolean/bopcommon_2d/M9 b/tests/boolean/bopcommon_2d/M9
index 064ebf775d..9985e51c5e 100644
--- a/tests/boolean/bopcommon_2d/M9
+++ b/tests/boolean/bopcommon_2d/M9
@@ -1,5 +1,5 @@
-restore case_8_solid_repaired.brep a
-restore case_8_wire4.brep b
+restore [locate_data_file case_8_solid_repaired.brep] a
+restore [locate_data_file case_8_wire4.brep] b
 bop a b
 bopcommon result
 set length 36.0874
diff --git a/tests/boolean/bopcommon_2d/N1 b/tests/boolean/bopcommon_2d/N1
index 33c28df589..78b94cb327 100644
--- a/tests/boolean/bopcommon_2d/N1
+++ b/tests/boolean/bopcommon_2d/N1
@@ -1,5 +1,5 @@
-restore case_8_solid_repaired.brep a
-restore case_8_wire5.brep b
+restore [locate_data_file case_8_solid_repaired.brep] a
+restore [locate_data_file case_8_wire5.brep] b
 bop a b
 bopcommon result
 set length 126.81
diff --git a/tests/boolean/bopcommon_2d/N2 b/tests/boolean/bopcommon_2d/N2
index 2945df37ce..caa540b1c3 100644
--- a/tests/boolean/bopcommon_2d/N2
+++ b/tests/boolean/bopcommon_2d/N2
@@ -1,5 +1,5 @@
-restore case_8_solid_repaired.brep a
-restore case_8_wire6.brep b
+restore [locate_data_file case_8_solid_repaired.brep] a
+restore [locate_data_file case_8_wire6.brep] b
 bop a b
 bopcommon result
 set length empty
diff --git a/tests/boolean/bopcommon_2d/N3 b/tests/boolean/bopcommon_2d/N3
index 4df4d41a70..c1444c8152 100644
--- a/tests/boolean/bopcommon_2d/N3
+++ b/tests/boolean/bopcommon_2d/N3
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge1.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge1.brep] b
 bop a b
 bopcommon result
 set length 143.787
diff --git a/tests/boolean/bopcommon_2d/N4 b/tests/boolean/bopcommon_2d/N4
index 2625866016..0514eeae9f 100644
--- a/tests/boolean/bopcommon_2d/N4
+++ b/tests/boolean/bopcommon_2d/N4
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge2.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge2.brep] b
 bop a b
 bopcommon result
 set length empty
diff --git a/tests/boolean/bopcommon_2d/N5 b/tests/boolean/bopcommon_2d/N5
index d64a48a273..aa1dc992c4 100644
--- a/tests/boolean/bopcommon_2d/N5
+++ b/tests/boolean/bopcommon_2d/N5
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge3.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge3.brep] b
 bop a b
 bopcommon result
 set length 143.787
diff --git a/tests/boolean/bopcommon_2d/N6 b/tests/boolean/bopcommon_2d/N6
index 0cf1dc38e8..083aeb26c9 100644
--- a/tests/boolean/bopcommon_2d/N6
+++ b/tests/boolean/bopcommon_2d/N6
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge4.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge4.brep] b
 bop a b
 bopcommon result
 set length empty
diff --git a/tests/boolean/bopcommon_2d/N7 b/tests/boolean/bopcommon_2d/N7
index b2fa80a88a..484e0e13f7 100644
--- a/tests/boolean/bopcommon_2d/N7
+++ b/tests/boolean/bopcommon_2d/N7
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge5.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge5.brep] b
 bop a b
 bopcommon result
 set length 79.9002
diff --git a/tests/boolean/bopcommon_2d/N8 b/tests/boolean/bopcommon_2d/N8
index bd52984569..25f4e583ee 100644
--- a/tests/boolean/bopcommon_2d/N8
+++ b/tests/boolean/bopcommon_2d/N8
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_wire1.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_wire1.brep] b
 bop a b
 bopcommon result
 set length 143.787
diff --git a/tests/boolean/bopcommon_2d/N9 b/tests/boolean/bopcommon_2d/N9
index ab8bc55bea..3aead99ece 100644
--- a/tests/boolean/bopcommon_2d/N9
+++ b/tests/boolean/bopcommon_2d/N9
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_wire2.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_wire2.brep] b
 bop a b
 bopcommon result
 set length 143.787
diff --git a/tests/boolean/bopcommon_2d/O1 b/tests/boolean/bopcommon_2d/O1
index e666ddefd6..4f378fe5fc 100644
--- a/tests/boolean/bopcommon_2d/O1
+++ b/tests/boolean/bopcommon_2d/O1
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_wire3.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_wire3.brep] b
 bop a b
 bopcommon result
 set length 79.9002
diff --git a/tests/boolean/bopcommon_2d/O2 b/tests/boolean/bopcommon_2d/O2
index 029ceab701..bcf8dc9138 100644
--- a/tests/boolean/bopcommon_2d/O2
+++ b/tests/boolean/bopcommon_2d/O2
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge1.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge1.brep] b
 bop a b
 bopcommon result
 set length 143.787
diff --git a/tests/boolean/bopcommon_2d/O3 b/tests/boolean/bopcommon_2d/O3
index 72fac0014b..30fa066a8b 100644
--- a/tests/boolean/bopcommon_2d/O3
+++ b/tests/boolean/bopcommon_2d/O3
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge2.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge2.brep] b
 bop a b
 bopcommon result
 set length empty
diff --git a/tests/boolean/bopcommon_2d/O4 b/tests/boolean/bopcommon_2d/O4
index 7834c44b51..342a533765 100644
--- a/tests/boolean/bopcommon_2d/O4
+++ b/tests/boolean/bopcommon_2d/O4
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge3.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge3.brep] b
 bop a b
 bopcommon result
 set length empty
diff --git a/tests/boolean/bopcommon_2d/O5 b/tests/boolean/bopcommon_2d/O5
index 0991314eb1..42cba299f9 100644
--- a/tests/boolean/bopcommon_2d/O5
+++ b/tests/boolean/bopcommon_2d/O5
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge4.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge4.brep] b
 bop a b
 bopcommon result
 set length empty
diff --git a/tests/boolean/bopcommon_2d/O6 b/tests/boolean/bopcommon_2d/O6
index 19b0529f26..8ad3cef5ff 100644
--- a/tests/boolean/bopcommon_2d/O6
+++ b/tests/boolean/bopcommon_2d/O6
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge5.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge5.brep] b
 bop a b
 bopcommon result
 set length empty
diff --git a/tests/boolean/bopcommon_2d/O7 b/tests/boolean/bopcommon_2d/O7
index dd85697b19..0b59aeef8a 100644
--- a/tests/boolean/bopcommon_2d/O7
+++ b/tests/boolean/bopcommon_2d/O7
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_wire1.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_wire1.brep] b
 bop a b
 bopcommon result
 set length 143.787
diff --git a/tests/boolean/bopcommon_2d/O8 b/tests/boolean/bopcommon_2d/O8
index d4af6a73f3..d07bb3cb0f 100644
--- a/tests/boolean/bopcommon_2d/O8
+++ b/tests/boolean/bopcommon_2d/O8
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_wire2.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_wire2.brep] b
 bop a b
 bopcommon result
 set length empty
diff --git a/tests/boolean/bopcommon_2d/O9 b/tests/boolean/bopcommon_2d/O9
index d849662cfe..39373f57d0 100644
--- a/tests/boolean/bopcommon_2d/O9
+++ b/tests/boolean/bopcommon_2d/O9
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_wire3.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_wire3.brep] b
 bop a b
 bopcommon result
 set length empty
diff --git a/tests/boolean/bopcommon_2d/P1 b/tests/boolean/bopcommon_2d/P1
index 292fecff82..ddcf65f2f8 100644
--- a/tests/boolean/bopcommon_2d/P1
+++ b/tests/boolean/bopcommon_2d/P1
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge1.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge1.brep] b
 bop a b
 bopcommon result
 set length 143.787
diff --git a/tests/boolean/bopcommon_2d/P2 b/tests/boolean/bopcommon_2d/P2
index 0ed904c5e0..251244af55 100644
--- a/tests/boolean/bopcommon_2d/P2
+++ b/tests/boolean/bopcommon_2d/P2
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge2.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge2.brep] b
 bop a b
 bopcommon result
 set length empty
diff --git a/tests/boolean/bopcommon_2d/P3 b/tests/boolean/bopcommon_2d/P3
index 2902076970..bd3d2cec05 100644
--- a/tests/boolean/bopcommon_2d/P3
+++ b/tests/boolean/bopcommon_2d/P3
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge3.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge3.brep] b
 bop a b
 bopcommon result
 set length empty
diff --git a/tests/boolean/bopcommon_2d/P4 b/tests/boolean/bopcommon_2d/P4
index 191075c6d0..16b66e3eba 100644
--- a/tests/boolean/bopcommon_2d/P4
+++ b/tests/boolean/bopcommon_2d/P4
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge4.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge4.brep] b
 bop a b
 bopcommon result
 set length empty
diff --git a/tests/boolean/bopcommon_2d/P5 b/tests/boolean/bopcommon_2d/P5
index 6720021f29..156d7e5ba9 100644
--- a/tests/boolean/bopcommon_2d/P5
+++ b/tests/boolean/bopcommon_2d/P5
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge5.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge5.brep] b
 bop a b
 bopcommon result
 set length empty
diff --git a/tests/boolean/bopcommon_2d/P6 b/tests/boolean/bopcommon_2d/P6
index 031fb69857..955d5fa801 100644
--- a/tests/boolean/bopcommon_2d/P6
+++ b/tests/boolean/bopcommon_2d/P6
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_wire1.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_wire1.brep] b
 bop a b
 bopcommon result
 set length 143.787
diff --git a/tests/boolean/bopcommon_2d/P7 b/tests/boolean/bopcommon_2d/P7
index 142af4acce..28a0205ff1 100644
--- a/tests/boolean/bopcommon_2d/P7
+++ b/tests/boolean/bopcommon_2d/P7
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_wire2.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_wire2.brep] b
 bop a b
 bopcommon result
 set length empty
diff --git a/tests/boolean/bopcommon_2d/P8 b/tests/boolean/bopcommon_2d/P8
index 786b4da305..7066e4a128 100644
--- a/tests/boolean/bopcommon_2d/P8
+++ b/tests/boolean/bopcommon_2d/P8
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_wire3.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_wire3.brep] b
 bop a b
 bopcommon result
 set length empty
diff --git a/tests/boolean/bopcommon_complex/A1 b/tests/boolean/bopcommon_complex/A1
index fa608106d7..a291940cba 100644
--- a/tests/boolean/bopcommon_complex/A1
+++ b/tests/boolean/bopcommon_complex/A1
@@ -2,8 +2,8 @@ puts "====================================="
 puts "COMMON of OCC118-1.brep and  OCC118-2.brep"
 puts "====================================="
 
-restore OCC118-1.brep a
-restore OCC118-2.brep b
+restore [locate_data_file OCC118-1.brep] a
+restore [locate_data_file OCC118-2.brep] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/A2 b/tests/boolean/bopcommon_complex/A2
index a17155a5eb..46fa8810cc 100644
--- a/tests/boolean/bopcommon_complex/A2
+++ b/tests/boolean/bopcommon_complex/A2
@@ -2,8 +2,8 @@ puts "================================"
 puts "COMMON of OCC118-2.brep and  OCC118-1.brep"
 puts "================================"
 
-restore OCC118-1.brep a
-restore OCC118-2.brep b
+restore [locate_data_file OCC118-1.brep] a
+restore [locate_data_file OCC118-2.brep] b
 
 bop b a
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/A3 b/tests/boolean/bopcommon_complex/A3
index b1de3e88f3..dbf05f5ecd 100644
--- a/tests/boolean/bopcommon_complex/A3
+++ b/tests/boolean/bopcommon_complex/A3
@@ -3,8 +3,8 @@ puts "COMMON of OCC212-1.brep and  OCC212-2.brep"
 puts "Case is duplicate of chl 918 A4, bug OCC212 "
 puts "================================="
 
-restore OCC212-1.brep a
-restore OCC212-2.brep b
+restore [locate_data_file OCC212-1.brep] a
+restore [locate_data_file OCC212-2.brep] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/A4 b/tests/boolean/bopcommon_complex/A4
index e1ded124e4..398efcc2f7 100644
--- a/tests/boolean/bopcommon_complex/A4
+++ b/tests/boolean/bopcommon_complex/A4
@@ -3,8 +3,8 @@ puts "COMMON of OCC212-2.brep and  OCC212-1.brep"
 puts "Case is duplicate of chl 918 A5, bug OCC212 "
 puts "================================="
 
-restore OCC212-1.brep a
-restore OCC212-2.brep b
+restore [locate_data_file OCC212-1.brep] a
+restore [locate_data_file OCC212-2.brep] b
 
 bop b a 
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/A5 b/tests/boolean/bopcommon_complex/A5
index 1ba094df55..5b0111c1bc 100644
--- a/tests/boolean/bopcommon_complex/A5
+++ b/tests/boolean/bopcommon_complex/A5
@@ -2,8 +2,8 @@ puts "================================="
 puts "COMMON of OCC213-1.brep and  OCC213-2.brep"
 puts "================================="
 
-restore OCC213-1.brep a
-restore OCC213-2.brep b
+restore [locate_data_file OCC213-1.brep] a
+restore [locate_data_file OCC213-2.brep] b
 
 bop a b 
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/A6 b/tests/boolean/bopcommon_complex/A6
index 96d921adb3..3bb69a7e76 100644
--- a/tests/boolean/bopcommon_complex/A6
+++ b/tests/boolean/bopcommon_complex/A6
@@ -2,8 +2,8 @@ puts "================================="
 puts "COMMON of OCC213-2.brep and  OCC213-1.brep"
 puts "================================="
 
-restore OCC213-1.brep a
-restore OCC213-2.brep b
+restore [locate_data_file OCC213-1.brep] a
+restore [locate_data_file OCC213-2.brep] b
 
 bop b a 
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/A7 b/tests/boolean/bopcommon_complex/A7
index 4def901197..021c6ff968 100644
--- a/tests/boolean/bopcommon_complex/A7
+++ b/tests/boolean/bopcommon_complex/A7
@@ -1,5 +1,5 @@
-restore OCC3-1.brep a
-restore OCC3-2.brep b
+restore [locate_data_file OCC3-1.brep] a
+restore [locate_data_file OCC3-2.brep] b
 
 bop  a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/A8 b/tests/boolean/bopcommon_complex/A8
index 5d8d27575e..0fce34e540 100644
--- a/tests/boolean/bopcommon_complex/A8
+++ b/tests/boolean/bopcommon_complex/A8
@@ -1,5 +1,5 @@
-restore OCC3-1.brep a
-restore OCC3-2.brep b
+restore [locate_data_file OCC3-1.brep] a
+restore [locate_data_file OCC3-2.brep] b
 
 bop b a
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/A9 b/tests/boolean/bopcommon_complex/A9
index bb7c1a8578..4b20576149 100644
--- a/tests/boolean/bopcommon_complex/A9
+++ b/tests/boolean/bopcommon_complex/A9
@@ -1,4 +1,4 @@
-restore OCC37.brep sh
+restore [locate_data_file OCC37.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcommon_complex/B1 b/tests/boolean/bopcommon_complex/B1
index 5d964ddfe6..237af4e5d8 100644
--- a/tests/boolean/bopcommon_complex/B1
+++ b/tests/boolean/bopcommon_complex/B1
@@ -1,4 +1,4 @@
-restore OCC37.brep sh
+restore [locate_data_file OCC37.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcommon_complex/B2 b/tests/boolean/bopcommon_complex/B2
index 9784fafd7d..303ea14dcc 100644
--- a/tests/boolean/bopcommon_complex/B2
+++ b/tests/boolean/bopcommon_complex/B2
@@ -1,4 +1,4 @@
-restore BUC60975.brep sh
+restore [locate_data_file BUC60975.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcommon_complex/B3 b/tests/boolean/bopcommon_complex/B3
index 0e5ed54acb..4e0e410eb3 100644
--- a/tests/boolean/bopcommon_complex/B3
+++ b/tests/boolean/bopcommon_complex/B3
@@ -1,4 +1,4 @@
-restore BUC60975.brep sh
+restore [locate_data_file BUC60975.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcommon_complex/B4 b/tests/boolean/bopcommon_complex/B4
index ced979c42e..162fbc0939 100644
--- a/tests/boolean/bopcommon_complex/B4
+++ b/tests/boolean/bopcommon_complex/B4
@@ -1,4 +1,4 @@
-restore OCC68.brep sh
+restore [locate_data_file OCC68.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcommon_complex/B5 b/tests/boolean/bopcommon_complex/B5
index 0230277ede..95413d6cfb 100644
--- a/tests/boolean/bopcommon_complex/B5
+++ b/tests/boolean/bopcommon_complex/B5
@@ -1,4 +1,4 @@
-restore OCC68.brep sh
+restore [locate_data_file OCC68.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcommon_complex/B6 b/tests/boolean/bopcommon_complex/B6
index 339bd15057..3d8d37b4cd 100644
--- a/tests/boolean/bopcommon_complex/B6
+++ b/tests/boolean/bopcommon_complex/B6
@@ -1,5 +1,5 @@
-restore OCC100_sp.brep a
-restore OCC100_cyl.brep b
+restore [locate_data_file OCC100_sp.brep] a
+restore [locate_data_file OCC100_cyl.brep] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/B7 b/tests/boolean/bopcommon_complex/B7
index ccff124f32..3406fcc42d 100644
--- a/tests/boolean/bopcommon_complex/B7
+++ b/tests/boolean/bopcommon_complex/B7
@@ -1,5 +1,5 @@
-restore OCC100_sp.brep a
-restore OCC100_cyl.brep b
+restore [locate_data_file OCC100_sp.brep] a
+restore [locate_data_file OCC100_cyl.brep] b
 
 bop b a
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/B8 b/tests/boolean/bopcommon_complex/B8
index 7e2e0bf646..02fe65bf87 100644
--- a/tests/boolean/bopcommon_complex/B8
+++ b/tests/boolean/bopcommon_complex/B8
@@ -1,4 +1,4 @@
-restore OCC117.brep sh
+restore [locate_data_file OCC117.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcommon_complex/B9 b/tests/boolean/bopcommon_complex/B9
index d50a3e400a..07f99de117 100644
--- a/tests/boolean/bopcommon_complex/B9
+++ b/tests/boolean/bopcommon_complex/B9
@@ -1,4 +1,4 @@
-restore OCC117.brep sh
+restore [locate_data_file OCC117.brep] sh
 explode sh
 
 bop  sh_2 sh_1
diff --git a/tests/boolean/bopcommon_complex/C1 b/tests/boolean/bopcommon_complex/C1
index 9f8c1891a4..12e806ae89 100644
--- a/tests/boolean/bopcommon_complex/C1
+++ b/tests/boolean/bopcommon_complex/C1
@@ -1,4 +1,4 @@
-restore OCC122.brep sh
+restore [locate_data_file OCC122.brep] sh
 explode sh
 
 bop  sh_1 sh_2
diff --git a/tests/boolean/bopcommon_complex/C2 b/tests/boolean/bopcommon_complex/C2
index e4e5b9f610..8a6cd35ed5 100644
--- a/tests/boolean/bopcommon_complex/C2
+++ b/tests/boolean/bopcommon_complex/C2
@@ -1,4 +1,4 @@
-restore OCC122.brep sh
+restore [locate_data_file OCC122.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcommon_complex/C3 b/tests/boolean/bopcommon_complex/C3
index 984d343bab..745d92c45f 100644
--- a/tests/boolean/bopcommon_complex/C3
+++ b/tests/boolean/bopcommon_complex/C3
@@ -1,4 +1,4 @@
-restore OCC123.brep sh
+restore [locate_data_file OCC123.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcommon_complex/C4 b/tests/boolean/bopcommon_complex/C4
index 984f799230..c49527fa98 100644
--- a/tests/boolean/bopcommon_complex/C4
+++ b/tests/boolean/bopcommon_complex/C4
@@ -1,4 +1,4 @@
-restore OCC123.brep sh
+restore [locate_data_file OCC123.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcommon_complex/C5 b/tests/boolean/bopcommon_complex/C5
index ac4fe19dc6..8abb59841d 100644
--- a/tests/boolean/bopcommon_complex/C5
+++ b/tests/boolean/bopcommon_complex/C5
@@ -1,5 +1,5 @@
 cpulimit 3600
-restore BUC60938.brep sh
+restore [locate_data_file BUC60938.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcommon_complex/C6 b/tests/boolean/bopcommon_complex/C6
index 75fb625b25..784f49d9da 100644
--- a/tests/boolean/bopcommon_complex/C6
+++ b/tests/boolean/bopcommon_complex/C6
@@ -1,5 +1,5 @@
 cpulimit 3600
-restore BUC60938.brep sh
+restore [locate_data_file BUC60938.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcommon_complex/C7 b/tests/boolean/bopcommon_complex/C7
index 986b65c627..47b027ee02 100644
--- a/tests/boolean/bopcommon_complex/C7
+++ b/tests/boolean/bopcommon_complex/C7
@@ -1,4 +1,4 @@
-restore BUC60938.brep sh
+restore [locate_data_file BUC60938.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcommon_complex/C8 b/tests/boolean/bopcommon_complex/C8
index 5c40e20d78..44cbc258c3 100644
--- a/tests/boolean/bopcommon_complex/C8
+++ b/tests/boolean/bopcommon_complex/C8
@@ -1,4 +1,4 @@
-restore BUC60938.brep sh
+restore [locate_data_file BUC60938.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcommon_complex/C9 b/tests/boolean/bopcommon_complex/C9
index 86f8f474da..c174e8be36 100644
--- a/tests/boolean/bopcommon_complex/C9
+++ b/tests/boolean/bopcommon_complex/C9
@@ -1,5 +1,5 @@
 cpulimit 3600
-restore BUC60937.brep sh
+restore [locate_data_file BUC60937.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcommon_complex/D1 b/tests/boolean/bopcommon_complex/D1
index a1aea695eb..846b5340ef 100644
--- a/tests/boolean/bopcommon_complex/D1
+++ b/tests/boolean/bopcommon_complex/D1
@@ -1,5 +1,5 @@
 cpulimit 3600
-restore BUC60937.brep sh
+restore [locate_data_file BUC60937.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcommon_complex/D2 b/tests/boolean/bopcommon_complex/D2
index e4c5d0b484..01293603eb 100644
--- a/tests/boolean/bopcommon_complex/D2
+++ b/tests/boolean/bopcommon_complex/D2
@@ -1,4 +1,4 @@
-restore BUC60937.brep sh
+restore [locate_data_file BUC60937.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcommon_complex/D3 b/tests/boolean/bopcommon_complex/D3
index f70e7b8872..39cc3d9e32 100644
--- a/tests/boolean/bopcommon_complex/D3
+++ b/tests/boolean/bopcommon_complex/D3
@@ -1,4 +1,4 @@
-restore BUC60937.brep sh
+restore [locate_data_file BUC60937.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcommon_complex/D4 b/tests/boolean/bopcommon_complex/D4
index dceea905bf..8661b33928 100644
--- a/tests/boolean/bopcommon_complex/D4
+++ b/tests/boolean/bopcommon_complex/D4
@@ -1,5 +1,5 @@
 cpulimit 3600
-restore BUC60936.brep sh
+restore [locate_data_file BUC60936.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcommon_complex/D5 b/tests/boolean/bopcommon_complex/D5
index ea4c5b24c8..f899d4c08e 100644
--- a/tests/boolean/bopcommon_complex/D5
+++ b/tests/boolean/bopcommon_complex/D5
@@ -1,5 +1,5 @@
 cpulimit 3600
-restore BUC60936.brep sh
+restore [locate_data_file BUC60936.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcommon_complex/D6 b/tests/boolean/bopcommon_complex/D6
index a9c16e0db8..41154b1236 100644
--- a/tests/boolean/bopcommon_complex/D6
+++ b/tests/boolean/bopcommon_complex/D6
@@ -1,4 +1,4 @@
-restore BUC60936.brep sh
+restore [locate_data_file BUC60936.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcommon_complex/D7 b/tests/boolean/bopcommon_complex/D7
index dd8ce3e7c1..24b7d6c393 100644
--- a/tests/boolean/bopcommon_complex/D7
+++ b/tests/boolean/bopcommon_complex/D7
@@ -1,4 +1,4 @@
-restore BUC60936.brep sh
+restore [locate_data_file BUC60936.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcommon_complex/D8 b/tests/boolean/bopcommon_complex/D8
index 99a9c34ef8..3f7c456989 100644
--- a/tests/boolean/bopcommon_complex/D8
+++ b/tests/boolean/bopcommon_complex/D8
@@ -1,7 +1,7 @@
 puts "TODO #22911 ALL: Faulty shapes in variables faulty_1 to faulty_"
 puts "TODO #22911 ALL: Error : The square of result shape is"
 
-restore OCC228.brep sh
+restore [locate_data_file OCC228.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcommon_complex/D9 b/tests/boolean/bopcommon_complex/D9
index 34d8de54b3..bba18702c7 100644
--- a/tests/boolean/bopcommon_complex/D9
+++ b/tests/boolean/bopcommon_complex/D9
@@ -1,7 +1,7 @@
 puts "TODO #22911 ALL: Faulty shapes in variables faulty_1 to faulty_"
 puts "TODO #22911 ALL: Error : The square of result shape is"
 
-restore OCC228.brep sh
+restore [locate_data_file OCC228.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcommon_complex/E1 b/tests/boolean/bopcommon_complex/E1
index a1231d08ca..ebde570375 100644
--- a/tests/boolean/bopcommon_complex/E1
+++ b/tests/boolean/bopcommon_complex/E1
@@ -1,5 +1,5 @@
-restore OCC315-1.brep a
-restore OCC315-2.brep b
+restore [locate_data_file OCC315-1.brep] a
+restore [locate_data_file OCC315-2.brep] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/E2 b/tests/boolean/bopcommon_complex/E2
index e45c9bd990..756d9a09a8 100644
--- a/tests/boolean/bopcommon_complex/E2
+++ b/tests/boolean/bopcommon_complex/E2
@@ -1,5 +1,5 @@
-restore OCC315-1.brep a
-restore OCC315-2.brep b
+restore [locate_data_file OCC315-1.brep] a
+restore [locate_data_file OCC315-2.brep] b
 
 bop b a
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/E3 b/tests/boolean/bopcommon_complex/E3
index b768dace6a..0a0d9ca0f5 100644
--- a/tests/boolean/bopcommon_complex/E3
+++ b/tests/boolean/bopcommon_complex/E3
@@ -1,4 +1,4 @@
-restore BUC60928.brep sh
+restore [locate_data_file BUC60928.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcommon_complex/E4 b/tests/boolean/bopcommon_complex/E4
index 1b5f429d7c..579855658b 100644
--- a/tests/boolean/bopcommon_complex/E4
+++ b/tests/boolean/bopcommon_complex/E4
@@ -1,4 +1,4 @@
-restore BUC60928.brep sh
+restore [locate_data_file BUC60928.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcommon_complex/E5 b/tests/boolean/bopcommon_complex/E5
index 1376d20c5f..172e621938 100644
--- a/tests/boolean/bopcommon_complex/E5
+++ b/tests/boolean/bopcommon_complex/E5
@@ -1,4 +1,4 @@
-restore BUC60931.brep sh
+restore [locate_data_file BUC60931.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcommon_complex/E6 b/tests/boolean/bopcommon_complex/E6
index 80890f86e7..066497995e 100644
--- a/tests/boolean/bopcommon_complex/E6
+++ b/tests/boolean/bopcommon_complex/E6
@@ -1,4 +1,4 @@
-restore BUC60931.brep sh
+restore [locate_data_file BUC60931.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcommon_complex/E7 b/tests/boolean/bopcommon_complex/E7
index 3ce0040404..8c846337b6 100644
--- a/tests/boolean/bopcommon_complex/E7
+++ b/tests/boolean/bopcommon_complex/E7
@@ -1,4 +1,4 @@
-restore BUC60939.brep sh
+restore [locate_data_file BUC60939.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcommon_complex/E8 b/tests/boolean/bopcommon_complex/E8
index 14758f9850..6c9f235f8b 100644
--- a/tests/boolean/bopcommon_complex/E8
+++ b/tests/boolean/bopcommon_complex/E8
@@ -1,4 +1,4 @@
-restore BUC60939.brep sh
+restore [locate_data_file BUC60939.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcommon_complex/E9 b/tests/boolean/bopcommon_complex/E9
index 416dc86f54..ce5c9048ed 100644
--- a/tests/boolean/bopcommon_complex/E9
+++ b/tests/boolean/bopcommon_complex/E9
@@ -1,4 +1,4 @@
-restore OCC337.brep sh
+restore [locate_data_file OCC337.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcommon_complex/F1 b/tests/boolean/bopcommon_complex/F1
index 5b144f6691..043cd81c11 100644
--- a/tests/boolean/bopcommon_complex/F1
+++ b/tests/boolean/bopcommon_complex/F1
@@ -1,4 +1,4 @@
-restore OCC337.brep sh
+restore [locate_data_file OCC337.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcommon_complex/F2 b/tests/boolean/bopcommon_complex/F2
index d00c59e54c..76dd8ac793 100644
--- a/tests/boolean/bopcommon_complex/F2
+++ b/tests/boolean/bopcommon_complex/F2
@@ -1,4 +1,4 @@
-restore buc60996.brep sh
+restore [locate_data_file buc60996.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcommon_complex/F3 b/tests/boolean/bopcommon_complex/F3
index f91eaab367..1f3a590f6e 100644
--- a/tests/boolean/bopcommon_complex/F3
+++ b/tests/boolean/bopcommon_complex/F3
@@ -1,4 +1,4 @@
-restore buc60996.brep sh
+restore [locate_data_file buc60996.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcommon_complex/F4 b/tests/boolean/bopcommon_complex/F4
index a9476ce9e1..948d68f88a 100644
--- a/tests/boolean/bopcommon_complex/F4
+++ b/tests/boolean/bopcommon_complex/F4
@@ -1,4 +1,4 @@
-restore BUC60974.brep sh
+restore [locate_data_file BUC60974.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcommon_complex/F5 b/tests/boolean/bopcommon_complex/F5
index 7552d46b36..f850bcaabf 100644
--- a/tests/boolean/bopcommon_complex/F5
+++ b/tests/boolean/bopcommon_complex/F5
@@ -1,4 +1,4 @@
-restore BUC60974.brep sh
+restore [locate_data_file BUC60974.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcommon_complex/F6 b/tests/boolean/bopcommon_complex/F6
index 5e521e5aba..21f02c030a 100644
--- a/tests/boolean/bopcommon_complex/F6
+++ b/tests/boolean/bopcommon_complex/F6
@@ -1,5 +1,5 @@
-restore a57 a
-restore b57 b
+restore [locate_data_file a57] a
+restore [locate_data_file b57] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/F7 b/tests/boolean/bopcommon_complex/F7
index 44505ac8f4..c1cadb29bf 100644
--- a/tests/boolean/bopcommon_complex/F7
+++ b/tests/boolean/bopcommon_complex/F7
@@ -1,5 +1,5 @@
-restore a58 a
-restore b58 b
+restore [locate_data_file a58] a
+restore [locate_data_file b58] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/F8 b/tests/boolean/bopcommon_complex/F8
index 19f7259815..f25dd8b3fb 100644
--- a/tests/boolean/bopcommon_complex/F8
+++ b/tests/boolean/bopcommon_complex/F8
@@ -1,5 +1,5 @@
-restore a58 a
-restore b60 b
+restore [locate_data_file a58] a
+restore [locate_data_file b60] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/F9 b/tests/boolean/bopcommon_complex/F9
index 135f53af74..ed87840145 100644
--- a/tests/boolean/bopcommon_complex/F9
+++ b/tests/boolean/bopcommon_complex/F9
@@ -1,5 +1,5 @@
-restore a58 a
-restore b62 b
+restore [locate_data_file a58] a
+restore [locate_data_file b62] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/G1 b/tests/boolean/bopcommon_complex/G1
index d526c3c5a6..8c72795640 100644
--- a/tests/boolean/bopcommon_complex/G1
+++ b/tests/boolean/bopcommon_complex/G1
@@ -1,5 +1,5 @@
-restore a58 a
-restore b64 b
+restore [locate_data_file a58] a
+restore [locate_data_file b64] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/G2 b/tests/boolean/bopcommon_complex/G2
index ecde0cb71f..9807fa2d79 100644
--- a/tests/boolean/bopcommon_complex/G2
+++ b/tests/boolean/bopcommon_complex/G2
@@ -1,5 +1,5 @@
-restore a58 a
-restore b66 b
+restore [locate_data_file a58] a
+restore [locate_data_file b66] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/G3 b/tests/boolean/bopcommon_complex/G3
index e69e4d13c6..ce88a2fc2c 100644
--- a/tests/boolean/bopcommon_complex/G3
+++ b/tests/boolean/bopcommon_complex/G3
@@ -1,5 +1,5 @@
-restore a90 a
-restore b90 b
+restore [locate_data_file a90] a
+restore [locate_data_file b90] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/G4 b/tests/boolean/bopcommon_complex/G4
index 9819ffa3b0..b79ecb9850 100644
--- a/tests/boolean/bopcommon_complex/G4
+++ b/tests/boolean/bopcommon_complex/G4
@@ -1,5 +1,5 @@
-restore a102 a
-restore b102 b
+restore [locate_data_file a102] a
+restore [locate_data_file b102] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/G5 b/tests/boolean/bopcommon_complex/G5
index bef712fe3d..ad9c5a7d97 100644
--- a/tests/boolean/bopcommon_complex/G5
+++ b/tests/boolean/bopcommon_complex/G5
@@ -1,5 +1,5 @@
-restore a104 a
-restore b104 b
+restore [locate_data_file a104] a
+restore [locate_data_file b104] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/G6 b/tests/boolean/bopcommon_complex/G6
index 08c14c5e5a..7350d92419 100644
--- a/tests/boolean/bopcommon_complex/G6
+++ b/tests/boolean/bopcommon_complex/G6
@@ -1,5 +1,5 @@
-restore a108 a
-restore b108 b
+restore [locate_data_file a108] a
+restore [locate_data_file b108] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/G7 b/tests/boolean/bopcommon_complex/G7
index 840f883de5..297da10273 100644
--- a/tests/boolean/bopcommon_complex/G7
+++ b/tests/boolean/bopcommon_complex/G7
@@ -1,5 +1,5 @@
-restore a110 a
-restore b110 b
+restore [locate_data_file a110] a
+restore [locate_data_file b110] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/G8 b/tests/boolean/bopcommon_complex/G8
index ef2ca874f3..a66a351a51 100644
--- a/tests/boolean/bopcommon_complex/G8
+++ b/tests/boolean/bopcommon_complex/G8
@@ -1,5 +1,5 @@
-restore a112 a
-restore b112 b
+restore [locate_data_file a112] a
+restore [locate_data_file b112] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/G9 b/tests/boolean/bopcommon_complex/G9
index 316b607814..f3bdb81ca4 100644
--- a/tests/boolean/bopcommon_complex/G9
+++ b/tests/boolean/bopcommon_complex/G9
@@ -1,5 +1,5 @@
-restore a114 a
-restore b114 b
+restore [locate_data_file a114] a
+restore [locate_data_file b114] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/H1 b/tests/boolean/bopcommon_complex/H1
index b036e83159..452e225187 100644
--- a/tests/boolean/bopcommon_complex/H1
+++ b/tests/boolean/bopcommon_complex/H1
@@ -1,5 +1,5 @@
-restore a116 a
-restore b116 b
+restore [locate_data_file a116] a
+restore [locate_data_file b116] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/H2 b/tests/boolean/bopcommon_complex/H2
index 6e5ad1b281..d80be66288 100644
--- a/tests/boolean/bopcommon_complex/H2
+++ b/tests/boolean/bopcommon_complex/H2
@@ -1,5 +1,5 @@
-restore a118 a
-restore b118 b
+restore [locate_data_file a118] a
+restore [locate_data_file b118] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/H3 b/tests/boolean/bopcommon_complex/H3
index 192444f9ec..4c6ad04494 100644
--- a/tests/boolean/bopcommon_complex/H3
+++ b/tests/boolean/bopcommon_complex/H3
@@ -1,5 +1,5 @@
-restore a124 a
-restore b124 b
+restore [locate_data_file a124] a
+restore [locate_data_file b124] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/H4 b/tests/boolean/bopcommon_complex/H4
index 0c9a1569c6..a33ad5e951 100644
--- a/tests/boolean/bopcommon_complex/H4
+++ b/tests/boolean/bopcommon_complex/H4
@@ -1,5 +1,5 @@
-restore a126 a
-restore b126 b
+restore [locate_data_file a126] a
+restore [locate_data_file b126] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/H5 b/tests/boolean/bopcommon_complex/H5
index 29d5eed53d..a7a78c2940 100644
--- a/tests/boolean/bopcommon_complex/H5
+++ b/tests/boolean/bopcommon_complex/H5
@@ -1,5 +1,5 @@
-restore a128 a
-restore b128 b
+restore [locate_data_file a128] a
+restore [locate_data_file b128] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/H6 b/tests/boolean/bopcommon_complex/H6
index 05d3f97bc0..977942325e 100644
--- a/tests/boolean/bopcommon_complex/H6
+++ b/tests/boolean/bopcommon_complex/H6
@@ -1,5 +1,5 @@
-restore a130 a
-restore b130 b
+restore [locate_data_file a130] a
+restore [locate_data_file b130] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/H7 b/tests/boolean/bopcommon_complex/H7
index 8c7c7046d2..fccd216b86 100644
--- a/tests/boolean/bopcommon_complex/H7
+++ b/tests/boolean/bopcommon_complex/H7
@@ -1,5 +1,5 @@
-restore a132 a
-restore b132 b
+restore [locate_data_file a132] a
+restore [locate_data_file b132] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/H8 b/tests/boolean/bopcommon_complex/H8
index 3b7a1a7b18..eb252b10cc 100644
--- a/tests/boolean/bopcommon_complex/H8
+++ b/tests/boolean/bopcommon_complex/H8
@@ -1,5 +1,5 @@
-restore a136 a
-restore b136 b
+restore [locate_data_file a136] a
+restore [locate_data_file b136] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/H9 b/tests/boolean/bopcommon_complex/H9
index a43d759d2c..a71933a140 100644
--- a/tests/boolean/bopcommon_complex/H9
+++ b/tests/boolean/bopcommon_complex/H9
@@ -1,5 +1,5 @@
-restore a138 a
-restore b138 b
+restore [locate_data_file a138] a
+restore [locate_data_file b138] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/I1 b/tests/boolean/bopcommon_complex/I1
index 602c71e917..f840f36de6 100644
--- a/tests/boolean/bopcommon_complex/I1
+++ b/tests/boolean/bopcommon_complex/I1
@@ -1,5 +1,5 @@
-restore a140 a
-restore b140 b
+restore [locate_data_file a140] a
+restore [locate_data_file b140] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/I2 b/tests/boolean/bopcommon_complex/I2
index 0fab80d804..e4f06b571a 100644
--- a/tests/boolean/bopcommon_complex/I2
+++ b/tests/boolean/bopcommon_complex/I2
@@ -1,5 +1,5 @@
-restore a142 a
-restore b142 b
+restore [locate_data_file a142] a
+restore [locate_data_file b142] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/I3 b/tests/boolean/bopcommon_complex/I3
index 9843ccdc23..ee50f729ce 100644
--- a/tests/boolean/bopcommon_complex/I3
+++ b/tests/boolean/bopcommon_complex/I3
@@ -1,5 +1,5 @@
-restore a144 a
-restore b144 b
+restore [locate_data_file a144] a
+restore [locate_data_file b144] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/I4 b/tests/boolean/bopcommon_complex/I4
index 4298e3cd98..f0403dd1b3 100644
--- a/tests/boolean/bopcommon_complex/I4
+++ b/tests/boolean/bopcommon_complex/I4
@@ -1,5 +1,5 @@
-restore a146 a
-restore b146 b
+restore [locate_data_file a146] a
+restore [locate_data_file b146] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/I5 b/tests/boolean/bopcommon_complex/I5
index a842a0261c..2020eb910d 100644
--- a/tests/boolean/bopcommon_complex/I5
+++ b/tests/boolean/bopcommon_complex/I5
@@ -1,5 +1,5 @@
-restore a148 a
-restore b148 b
+restore [locate_data_file a148] a
+restore [locate_data_file b148] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/I6 b/tests/boolean/bopcommon_complex/I6
index 9b291c023e..3460dfb7a9 100644
--- a/tests/boolean/bopcommon_complex/I6
+++ b/tests/boolean/bopcommon_complex/I6
@@ -1,5 +1,5 @@
-restore a150 a
-restore b150 b
+restore [locate_data_file a150] a
+restore [locate_data_file b150] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/I7 b/tests/boolean/bopcommon_complex/I7
index 203466fbc5..028fb88053 100644
--- a/tests/boolean/bopcommon_complex/I7
+++ b/tests/boolean/bopcommon_complex/I7
@@ -1,5 +1,5 @@
-restore a154 a
-restore b154 b
+restore [locate_data_file a154] a
+restore [locate_data_file b154] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/I8 b/tests/boolean/bopcommon_complex/I8
index 99a690008c..58f94bb9f1 100644
--- a/tests/boolean/bopcommon_complex/I8
+++ b/tests/boolean/bopcommon_complex/I8
@@ -1,5 +1,5 @@
-restore a156 a
-restore b156 b
+restore [locate_data_file a156] a
+restore [locate_data_file b156] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/I9 b/tests/boolean/bopcommon_complex/I9
index b6a9561a2f..f4070301d5 100644
--- a/tests/boolean/bopcommon_complex/I9
+++ b/tests/boolean/bopcommon_complex/I9
@@ -1,5 +1,5 @@
-restore a157 a
-restore b157 b
+restore [locate_data_file a157] a
+restore [locate_data_file b157] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/J1 b/tests/boolean/bopcommon_complex/J1
index b795d38183..eb1c20356a 100644
--- a/tests/boolean/bopcommon_complex/J1
+++ b/tests/boolean/bopcommon_complex/J1
@@ -1,5 +1,5 @@
-restore a158 a
-restore b158 b
+restore [locate_data_file a158] a
+restore [locate_data_file b158] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/J2 b/tests/boolean/bopcommon_complex/J2
index 9672db59c3..7275aae55c 100644
--- a/tests/boolean/bopcommon_complex/J2
+++ b/tests/boolean/bopcommon_complex/J2
@@ -1,5 +1,5 @@
-restore a160 a
-restore b160 b
+restore [locate_data_file a160] a
+restore [locate_data_file b160] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/J3 b/tests/boolean/bopcommon_complex/J3
index b31fcbfc48..5a74d9f72f 100644
--- a/tests/boolean/bopcommon_complex/J3
+++ b/tests/boolean/bopcommon_complex/J3
@@ -1,5 +1,5 @@
-restore a164 a
-restore b164 b
+restore [locate_data_file a164] a
+restore [locate_data_file b164] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/J4 b/tests/boolean/bopcommon_complex/J4
index 7762121cfc..433d8f0aaa 100644
--- a/tests/boolean/bopcommon_complex/J4
+++ b/tests/boolean/bopcommon_complex/J4
@@ -1,5 +1,5 @@
-restore a166 a
-restore b166 b
+restore [locate_data_file a166] a
+restore [locate_data_file b166] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/J5 b/tests/boolean/bopcommon_complex/J5
index 3f8f591f65..7c546a028b 100644
--- a/tests/boolean/bopcommon_complex/J5
+++ b/tests/boolean/bopcommon_complex/J5
@@ -1,5 +1,5 @@
-restore a168 a
-restore b168 b
+restore [locate_data_file a168] a
+restore [locate_data_file b168] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/J6 b/tests/boolean/bopcommon_complex/J6
index a42a17c567..f62e4cad97 100644
--- a/tests/boolean/bopcommon_complex/J6
+++ b/tests/boolean/bopcommon_complex/J6
@@ -1,5 +1,5 @@
-restore a170 a
-restore b170 b
+restore [locate_data_file a170] a
+restore [locate_data_file b170] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/J7 b/tests/boolean/bopcommon_complex/J7
index f9e07a8372..268f19b54a 100644
--- a/tests/boolean/bopcommon_complex/J7
+++ b/tests/boolean/bopcommon_complex/J7
@@ -1,5 +1,5 @@
-restore a167 a
-restore b167 b
+restore [locate_data_file a167] a
+restore [locate_data_file b167] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/J8 b/tests/boolean/bopcommon_complex/J8
index dd50034cf6..201901b5c7 100644
--- a/tests/boolean/bopcommon_complex/J8
+++ b/tests/boolean/bopcommon_complex/J8
@@ -1,5 +1,5 @@
-restore a189 a
-restore b189 b
+restore [locate_data_file a189] a
+restore [locate_data_file b189] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/J9 b/tests/boolean/bopcommon_complex/J9
index 46795a09ad..cc47dcd3d4 100644
--- a/tests/boolean/bopcommon_complex/J9
+++ b/tests/boolean/bopcommon_complex/J9
@@ -1,5 +1,5 @@
-restore a197 a
-restore b197 b
+restore [locate_data_file a197] a
+restore [locate_data_file b197] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/K1 b/tests/boolean/bopcommon_complex/K1
index b431e29ff0..57b00e5b7e 100644
--- a/tests/boolean/bopcommon_complex/K1
+++ b/tests/boolean/bopcommon_complex/K1
@@ -1,5 +1,5 @@
-restore a199 a
-restore b199 b
+restore [locate_data_file a199] a
+restore [locate_data_file b199] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/K2 b/tests/boolean/bopcommon_complex/K2
index 057319dac2..31398f565e 100644
--- a/tests/boolean/bopcommon_complex/K2
+++ b/tests/boolean/bopcommon_complex/K2
@@ -1,5 +1,5 @@
-restore a201 a
-restore b201 b
+restore [locate_data_file a201] a
+restore [locate_data_file b201] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/K3 b/tests/boolean/bopcommon_complex/K3
index 227b5de227..a03705e2cd 100644
--- a/tests/boolean/bopcommon_complex/K3
+++ b/tests/boolean/bopcommon_complex/K3
@@ -1,5 +1,5 @@
-restore a203 a
-restore b203 b
+restore [locate_data_file a203] a
+restore [locate_data_file b203] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/K4 b/tests/boolean/bopcommon_complex/K4
index 610829aa8c..ccc6acb39f 100644
--- a/tests/boolean/bopcommon_complex/K4
+++ b/tests/boolean/bopcommon_complex/K4
@@ -1,5 +1,5 @@
-restore a206 a
-restore b206 b
+restore [locate_data_file a206] a
+restore [locate_data_file b206] b
 
 bop a b
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/K5 b/tests/boolean/bopcommon_complex/K5
index 40caadf99c..67ff826fa4 100644
--- a/tests/boolean/bopcommon_complex/K5
+++ b/tests/boolean/bopcommon_complex/K5
@@ -1,8 +1,8 @@
 # Original bug : buc60172
 # Date : 25Mai98
 
-restore buc60172a.rle a
-restore buc60172b.rle b
+restore [locate_data_file buc60172a.rle] a
+restore [locate_data_file buc60172b.rle] b
 
 bop a b
 bopcommon result 
diff --git a/tests/boolean/bopcommon_complex/K6 b/tests/boolean/bopcommon_complex/K6
index b1901d25cc..2e03b9c63e 100644
--- a/tests/boolean/bopcommon_complex/K6
+++ b/tests/boolean/bopcommon_complex/K6
@@ -5,7 +5,7 @@ ttranslate c 3 3 6
 bop b c
 bopfuse rr
 
-restore A1_rr_7.brep A1_rr_7
+restore [locate_data_file A1_rr_7.brep] A1_rr_7
 prism p1 A1_rr_7 0 0 4
 
 bop rr p1
diff --git a/tests/boolean/bopcommon_complex/K7 b/tests/boolean/bopcommon_complex/K7
index 83307dc4f6..4b23516f72 100644
--- a/tests/boolean/bopcommon_complex/K7
+++ b/tests/boolean/bopcommon_complex/K7
@@ -5,7 +5,7 @@ ttranslate c 3 3 6
 
 bfuse rr b c
 
-restore A1_rr_7.brep A1_rr_7
+restore [locate_data_file A1_rr_7.brep] A1_rr_7
 prism p1 A1_rr_7 0 0 -4
 
 explode  rr so
diff --git a/tests/boolean/bopcommon_complex/K8 b/tests/boolean/bopcommon_complex/K8
index e360d8e0f8..35f2345724 100644
--- a/tests/boolean/bopcommon_complex/K8
+++ b/tests/boolean/bopcommon_complex/K8
@@ -5,7 +5,7 @@ ttranslate c 0 0 6
 
 bfuse rr b c
 
-restore C1_rr_8.brep C1_rr_8
+restore [locate_data_file C1_rr_8.brep] C1_rr_8
 prism p1 C1_rr_8 0 0 -4
 
 explode rr so
diff --git a/tests/boolean/bopcommon_complex/K9 b/tests/boolean/bopcommon_complex/K9
index 0e7fb9074a..35897adfac 100644
--- a/tests/boolean/bopcommon_complex/K9
+++ b/tests/boolean/bopcommon_complex/K9
@@ -5,7 +5,7 @@ ttranslate c 0 0 6
 
 bfuse rr b c
 
-restore C1_rr_8.brep C1_rr_8
+restore [locate_data_file C1_rr_8.brep] C1_rr_8
 prism p1 C1_rr_8 0 0 4
 
 explode rr so
diff --git a/tests/boolean/bopcommon_complex/L1 b/tests/boolean/bopcommon_complex/L1
index 7cc16b98f4..770c7a8adf 100644
--- a/tests/boolean/bopcommon_complex/L1
+++ b/tests/boolean/bopcommon_complex/L1
@@ -5,7 +5,7 @@ ttranslate c 0 0 2
 
 bfuse rr b c
 
-restore E1_rr_7.brep E1_rr_7
+restore [locate_data_file E1_rr_7.brep] E1_rr_7
 prism p1 E1_rr_7 0 -4 0
 
 explode rr so
diff --git a/tests/boolean/bopcommon_complex/L2 b/tests/boolean/bopcommon_complex/L2
index 7927cd08cb..c9d8cccdd2 100644
--- a/tests/boolean/bopcommon_complex/L2
+++ b/tests/boolean/bopcommon_complex/L2
@@ -5,7 +5,7 @@ ttranslate c 0 0 2
 
 bfuse rr b c
 
-restore E1_rr_7.brep E1_rr_7
+restore [locate_data_file E1_rr_7.brep] E1_rr_7
 prism p1 E1_rr_7 0 4 0
 
 explode rr so
diff --git a/tests/boolean/bopcommon_complex/L3 b/tests/boolean/bopcommon_complex/L3
index ed713a782a..1f25e16805 100644
--- a/tests/boolean/bopcommon_complex/L3
+++ b/tests/boolean/bopcommon_complex/L3
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh2a b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh2a] b2
 
 bop b1 b2
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/L4 b/tests/boolean/bopcommon_complex/L4
index b0a40b123b..a7c5c49c2b 100644
--- a/tests/boolean/bopcommon_complex/L4
+++ b/tests/boolean/bopcommon_complex/L4
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh3 b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh3] b2
 
 bop b1 b2
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/L5 b/tests/boolean/bopcommon_complex/L5
index 33902d2e65..fb3c531bc7 100644
--- a/tests/boolean/bopcommon_complex/L5
+++ b/tests/boolean/bopcommon_complex/L5
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh4 b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh4] b2
 
 bop b1 b2
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/L6 b/tests/boolean/bopcommon_complex/L6
index 5aae1c6e20..4e43bf7202 100644
--- a/tests/boolean/bopcommon_complex/L6
+++ b/tests/boolean/bopcommon_complex/L6
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh7 b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh7] b2
 
 bop b1 b2
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/L7 b/tests/boolean/bopcommon_complex/L7
index 5a0e8e489d..2aa8d537fe 100644
--- a/tests/boolean/bopcommon_complex/L7
+++ b/tests/boolean/bopcommon_complex/L7
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh8 b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh8] b2
 
 bop b1 b2
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/L8 b/tests/boolean/bopcommon_complex/L8
index 27fcb1ff6a..8a25e0d57c 100644
--- a/tests/boolean/bopcommon_complex/L8
+++ b/tests/boolean/bopcommon_complex/L8
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh9 b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh9] b2
 
 bop b1 b2
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/L9 b/tests/boolean/bopcommon_complex/L9
index c4be304ac6..fccd00ca70 100644
--- a/tests/boolean/bopcommon_complex/L9
+++ b/tests/boolean/bopcommon_complex/L9
@@ -1,5 +1,5 @@
-restore sh10 b1
-restore shx b2
+restore [locate_data_file sh10] b1
+restore [locate_data_file shx] b2
 
 bop b1 b2
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/M1 b/tests/boolean/bopcommon_complex/M1
index e9f14725ed..97353af7e7 100644
--- a/tests/boolean/bopcommon_complex/M1
+++ b/tests/boolean/bopcommon_complex/M1
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh5 b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh5] b2
 
 bop b1 b2
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/M2 b/tests/boolean/bopcommon_complex/M2
index 1083d6eec1..3a72cae12e 100644
--- a/tests/boolean/bopcommon_complex/M2
+++ b/tests/boolean/bopcommon_complex/M2
@@ -1,5 +1,5 @@
-restore g1 b1
-restore g2 b2
+restore [locate_data_file g1] b1
+restore [locate_data_file g2] b2
 
 bop b1 b2
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/M3 b/tests/boolean/bopcommon_complex/M3
index c820cc15e6..7ec7834567 100644
--- a/tests/boolean/bopcommon_complex/M3
+++ b/tests/boolean/bopcommon_complex/M3
@@ -1,5 +1,5 @@
-restore sg1 b1
-restore sg2 b2
+restore [locate_data_file sg1] b1
+restore [locate_data_file sg2] b2
 
 bop b1 b2
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/M4 b/tests/boolean/bopcommon_complex/M4
index f0f3396244..95ed0fe99f 100644
--- a/tests/boolean/bopcommon_complex/M4
+++ b/tests/boolean/bopcommon_complex/M4
@@ -1,5 +1,5 @@
-restore sf4 b1
-restore sf5 b2
+restore [locate_data_file sf4] b1
+restore [locate_data_file sf5] b2
 
 bop b1 b2
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/M5 b/tests/boolean/bopcommon_complex/M5
index 7ed74d8810..1753ee7d16 100644
--- a/tests/boolean/bopcommon_complex/M5
+++ b/tests/boolean/bopcommon_complex/M5
@@ -1,5 +1,5 @@
-restore sf5 b1
-restore sf3 b2
+restore [locate_data_file sf5] b1
+restore [locate_data_file sf3] b2
 
 bop b1 b2
 bopcommon result
diff --git a/tests/boolean/bopcommon_complex/M6 b/tests/boolean/bopcommon_complex/M6
index 0051949890..3e478930e4 100644
--- a/tests/boolean/bopcommon_complex/M6
+++ b/tests/boolean/bopcommon_complex/M6
@@ -1,5 +1,5 @@
-restore sf5 b1
-restore sf55 b2
+restore [locate_data_file sf5] b1
+restore [locate_data_file sf55] b2
 
 bop b1 b2
 bopcommon result
diff --git a/tests/boolean/bopcut_2d/A1 b/tests/boolean/bopcut_2d/A1
index 14019d6002..53853d57f5 100644
--- a/tests/boolean/bopcut_2d/A1
+++ b/tests/boolean/bopcut_2d/A1
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_edge1.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_edge1.brep] b
 bop b a
 bopcut result
 set length 1211.16
diff --git a/tests/boolean/bopcut_2d/A2 b/tests/boolean/bopcut_2d/A2
index a594819aa6..77481859cf 100644
--- a/tests/boolean/bopcut_2d/A2
+++ b/tests/boolean/bopcut_2d/A2
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_edge2.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_edge2.brep] b
 bop b a
 bopcut result
 set length 1211.16
diff --git a/tests/boolean/bopcut_2d/A3 b/tests/boolean/bopcut_2d/A3
index 179201b14d..c19eebb0c5 100644
--- a/tests/boolean/bopcut_2d/A3
+++ b/tests/boolean/bopcut_2d/A3
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_edge3.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_edge3.brep] b
 bop b a
 bopcut result
 set length 1304.85
diff --git a/tests/boolean/bopcut_2d/A4 b/tests/boolean/bopcut_2d/A4
index 740b9c0bcf..bf47aca0ab 100644
--- a/tests/boolean/bopcut_2d/A4
+++ b/tests/boolean/bopcut_2d/A4
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_edge1.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_edge1.brep] b
 bop a b
 bopcut result
 set length 289.851
diff --git a/tests/boolean/bopcut_2d/A5 b/tests/boolean/bopcut_2d/A5
index 223513d0af..30f14f3947 100644
--- a/tests/boolean/bopcut_2d/A5
+++ b/tests/boolean/bopcut_2d/A5
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_wire1.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_wire1.brep] b
 bop a b
 bopcut result
 set length 289.851
diff --git a/tests/boolean/bopcut_2d/A6 b/tests/boolean/bopcut_2d/A6
index 8ced5e13ff..7937f31755 100644
--- a/tests/boolean/bopcut_2d/A6
+++ b/tests/boolean/bopcut_2d/A6
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_wire2.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_wire2.brep] b
 bop a b
 bopcut result
 set length 289.851
diff --git a/tests/boolean/bopcut_2d/A7 b/tests/boolean/bopcut_2d/A7
index 30ea13251f..e6ef12318f 100644
--- a/tests/boolean/bopcut_2d/A7
+++ b/tests/boolean/bopcut_2d/A7
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_wire5.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_wire5.brep] b
 bop a b
 bopcut result
 set length 569.46
diff --git a/tests/boolean/bopcut_2d/A8 b/tests/boolean/bopcut_2d/A8
index af3e890689..2c85e101d5 100644
--- a/tests/boolean/bopcut_2d/A8
+++ b/tests/boolean/bopcut_2d/A8
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge1.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge1.brep] b
 bop a b
 bopcut result
 set length 902.162
diff --git a/tests/boolean/bopcut_2d/A9 b/tests/boolean/bopcut_2d/A9
index d161a2edad..a6e0037fd9 100644
--- a/tests/boolean/bopcut_2d/A9
+++ b/tests/boolean/bopcut_2d/A9
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge2.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge2.brep] b
 bop a b
 bopcut result
 set length 1045.95
diff --git a/tests/boolean/bopcut_2d/B1 b/tests/boolean/bopcut_2d/B1
index 2ac5afed56..24daad6917 100644
--- a/tests/boolean/bopcut_2d/B1
+++ b/tests/boolean/bopcut_2d/B1
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge3.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge3.brep] b
 bop a b
 bopcut result
 set length 902.162
diff --git a/tests/boolean/bopcut_2d/B2 b/tests/boolean/bopcut_2d/B2
index 175dd4a2fa..216e28a8d9 100644
--- a/tests/boolean/bopcut_2d/B2
+++ b/tests/boolean/bopcut_2d/B2
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge4.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge4.brep] b
 bop a b
 bopcut result
 set length 1045.95
diff --git a/tests/boolean/bopcut_2d/B3 b/tests/boolean/bopcut_2d/B3
index 2b7101f70b..4457087e1f 100644
--- a/tests/boolean/bopcut_2d/B3
+++ b/tests/boolean/bopcut_2d/B3
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge5.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge5.brep] b
 bop a b
 bopcut result
 set length 966.049
diff --git a/tests/boolean/bopcut_2d/B4 b/tests/boolean/bopcut_2d/B4
index 26b748968d..9c36d52044 100644
--- a/tests/boolean/bopcut_2d/B4
+++ b/tests/boolean/bopcut_2d/B4
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_wire1.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_wire1.brep] b
 bop a b
 bopcut result
 set length 902.162
diff --git a/tests/boolean/bopcut_2d/B5 b/tests/boolean/bopcut_2d/B5
index 4030fa1cb5..97ef8d00d6 100644
--- a/tests/boolean/bopcut_2d/B5
+++ b/tests/boolean/bopcut_2d/B5
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_wire2.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_wire2.brep] b
 bop a b
 bopcut result
 set length 902.162
diff --git a/tests/boolean/bopcut_2d/B6 b/tests/boolean/bopcut_2d/B6
index a2caf21f3e..ab5838ddb4 100644
--- a/tests/boolean/bopcut_2d/B6
+++ b/tests/boolean/bopcut_2d/B6
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_wire3.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_wire3.brep] b
 bop a b
 bopcut result
 set length 966.049
diff --git a/tests/boolean/bopcut_2d/B7 b/tests/boolean/bopcut_2d/B7
index 1e29b69262..c8dae02708 100644
--- a/tests/boolean/bopcut_2d/B7
+++ b/tests/boolean/bopcut_2d/B7
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge1.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge1.brep] b
 bop a b
 bopcut result
 set length 469.89
diff --git a/tests/boolean/bopcut_2d/B8 b/tests/boolean/bopcut_2d/B8
index ffe61ed221..72b7d78d87 100644
--- a/tests/boolean/bopcut_2d/B8
+++ b/tests/boolean/bopcut_2d/B8
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge2.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge2.brep] b
 bop a b
 bopcut result
 set length 613.678
diff --git a/tests/boolean/bopcut_2d/B9 b/tests/boolean/bopcut_2d/B9
index 68de7fb6a1..6ce6ae153f 100644
--- a/tests/boolean/bopcut_2d/B9
+++ b/tests/boolean/bopcut_2d/B9
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge3.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge3.brep] b
 bop a b
 bopcut result
 set length 613.678
diff --git a/tests/boolean/bopcut_2d/C1 b/tests/boolean/bopcut_2d/C1
index ba38c671b2..bcfc5d5181 100644
--- a/tests/boolean/bopcut_2d/C1
+++ b/tests/boolean/bopcut_2d/C1
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge4.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge4.brep] b
 bop a b
 bopcut result
 set length 613.678
diff --git a/tests/boolean/bopcut_2d/C2 b/tests/boolean/bopcut_2d/C2
index 008519cdd2..c7c6c5f2f0 100644
--- a/tests/boolean/bopcut_2d/C2
+++ b/tests/boolean/bopcut_2d/C2
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge5.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge5.brep] b
 bop a b
 bopcut result
 set length 613.678
diff --git a/tests/boolean/bopcut_2d/C3 b/tests/boolean/bopcut_2d/C3
index b413004d4d..a031d1df3b 100644
--- a/tests/boolean/bopcut_2d/C3
+++ b/tests/boolean/bopcut_2d/C3
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_wire1.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_wire1.brep] b
 bop a b
 bopcut result
 set length 469.89
diff --git a/tests/boolean/bopcut_2d/C4 b/tests/boolean/bopcut_2d/C4
index 6a3d89e331..5fdf31e26d 100644
--- a/tests/boolean/bopcut_2d/C4
+++ b/tests/boolean/bopcut_2d/C4
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_wire2.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_wire2.brep] b
 bop a b
 bopcut result
 set length 613.678
diff --git a/tests/boolean/bopcut_2d/C5 b/tests/boolean/bopcut_2d/C5
index b22182084e..fc13027fc3 100644
--- a/tests/boolean/bopcut_2d/C5
+++ b/tests/boolean/bopcut_2d/C5
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_wire3.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_wire3.brep] b
 bop a b
 bopcut result
 set length 613.678
diff --git a/tests/boolean/bopcut_2d/C6 b/tests/boolean/bopcut_2d/C6
index bfda5b4f7f..b4e67642c0 100644
--- a/tests/boolean/bopcut_2d/C6
+++ b/tests/boolean/bopcut_2d/C6
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge1.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge1.brep] b
 bop a b
 bopcut result
 set length 469.89
diff --git a/tests/boolean/bopcut_2d/C7 b/tests/boolean/bopcut_2d/C7
index 8812533bb3..24ce1152d6 100644
--- a/tests/boolean/bopcut_2d/C7
+++ b/tests/boolean/bopcut_2d/C7
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge2.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge2.brep] b
 bop a b
 bopcut result
 set length 613.678
diff --git a/tests/boolean/bopcut_2d/C8 b/tests/boolean/bopcut_2d/C8
index bbdee35da7..8bb2386a6e 100644
--- a/tests/boolean/bopcut_2d/C8
+++ b/tests/boolean/bopcut_2d/C8
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge3.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge3.brep] b
 bop a b
 bopcut result
 set length 613.678
diff --git a/tests/boolean/bopcut_2d/C9 b/tests/boolean/bopcut_2d/C9
index a2e8f6da03..26404024be 100644
--- a/tests/boolean/bopcut_2d/C9
+++ b/tests/boolean/bopcut_2d/C9
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge4.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge4.brep] b
 bop a b
 bopcut result
 set length 613.678
diff --git a/tests/boolean/bopcut_2d/D1 b/tests/boolean/bopcut_2d/D1
index 14cf6bba78..ef0f29fe65 100644
--- a/tests/boolean/bopcut_2d/D1
+++ b/tests/boolean/bopcut_2d/D1
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge5.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge5.brep] b
 bop a b
 bopcut result
 set length 613.678
diff --git a/tests/boolean/bopcut_2d/D2 b/tests/boolean/bopcut_2d/D2
index d02130bdfa..60ddfbbf09 100644
--- a/tests/boolean/bopcut_2d/D2
+++ b/tests/boolean/bopcut_2d/D2
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_wire1.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_wire1.brep] b
 bop a b
 bopcut result
 set length 469.89
diff --git a/tests/boolean/bopcut_2d/D3 b/tests/boolean/bopcut_2d/D3
index 720d28b3bf..5d987973b5 100644
--- a/tests/boolean/bopcut_2d/D3
+++ b/tests/boolean/bopcut_2d/D3
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_wire2.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_wire2.brep] b
 bop a b
 bopcut result
 set length 613.678
diff --git a/tests/boolean/bopcut_2d/D4 b/tests/boolean/bopcut_2d/D4
index c43ee82782..0341bb03ca 100644
--- a/tests/boolean/bopcut_2d/D4
+++ b/tests/boolean/bopcut_2d/D4
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_wire3.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_wire3.brep] b
 bop a b
 bopcut result
 set length 613.678
diff --git a/tests/boolean/bopcut_complex/A1 b/tests/boolean/bopcut_complex/A1
index b4ddb2847d..3049a903e0 100644
--- a/tests/boolean/bopcut_complex/A1
+++ b/tests/boolean/bopcut_complex/A1
@@ -2,8 +2,8 @@ puts "====================================="
 puts "CUT of OCC118-1.brep and  OCC118-2.brep"
 puts "====================================="
 
-restore OCC118-1.brep a
-restore OCC118-2.brep b
+restore [locate_data_file OCC118-1.brep] a
+restore [locate_data_file OCC118-2.brep] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/A2 b/tests/boolean/bopcut_complex/A2
index d0e372eb21..20e20c8fcd 100644
--- a/tests/boolean/bopcut_complex/A2
+++ b/tests/boolean/bopcut_complex/A2
@@ -2,8 +2,8 @@ puts "================================"
 puts "CUT of OCC118-2.brep and  OCC118-1.brep"
 puts "================================"
 
-restore OCC118-1.brep a
-restore OCC118-2.brep b
+restore [locate_data_file OCC118-1.brep] a
+restore [locate_data_file OCC118-2.brep] b
 
 bop b a
 bopcut result
diff --git a/tests/boolean/bopcut_complex/A3 b/tests/boolean/bopcut_complex/A3
index 64f1a02abf..8b649bf107 100644
--- a/tests/boolean/bopcut_complex/A3
+++ b/tests/boolean/bopcut_complex/A3
@@ -2,8 +2,8 @@ puts "================================="
 puts "CUT of OCC212-2.brep and  OCC212-1.brep"
 puts "================================="
 
-restore OCC212-1.brep a
-restore OCC212-2.brep b
+restore [locate_data_file OCC212-1.brep] a
+restore [locate_data_file OCC212-2.brep] b
 
 bop b a 
 bopcut result
diff --git a/tests/boolean/bopcut_complex/A4 b/tests/boolean/bopcut_complex/A4
index 6b26317b92..4b4d3b4b67 100644
--- a/tests/boolean/bopcut_complex/A4
+++ b/tests/boolean/bopcut_complex/A4
@@ -2,8 +2,8 @@ puts "================================="
 puts "CUT of OCC213-1.brep and  OCC213-2.brep"
 puts "================================="
 
-restore OCC213-1.brep a
-restore OCC213-2.brep b
+restore [locate_data_file OCC213-1.brep] a
+restore [locate_data_file OCC213-2.brep] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/A5 b/tests/boolean/bopcut_complex/A5
index 59f7c2fc5d..af2e325bd4 100644
--- a/tests/boolean/bopcut_complex/A5
+++ b/tests/boolean/bopcut_complex/A5
@@ -2,8 +2,8 @@ puts "================================="
 puts "CUT of OCC213-2.brep and  OCC213-1.brep"
 puts "================================="
 
-restore OCC213-1.brep a
-restore OCC213-2.brep b
+restore [locate_data_file OCC213-1.brep] a
+restore [locate_data_file OCC213-2.brep] b
 
 bop b a
 bopcut result
diff --git a/tests/boolean/bopcut_complex/A6 b/tests/boolean/bopcut_complex/A6
index 7e6293077e..5213b3c364 100644
--- a/tests/boolean/bopcut_complex/A6
+++ b/tests/boolean/bopcut_complex/A6
@@ -7,11 +7,11 @@ puts "========================"
 # XXXXXXXXXXXXXXXXXXXXX  
 #	 D1
 # 
-restore buc60706a.brep f
-restore buc60706b.brep w
+restore [locate_data_file buc60706a.brep] f
+restore [locate_data_file buc60706b.brep] w
 pipe t w f
 
-restore buc60706c.brep s
+restore [locate_data_file buc60706c.brep] s
 
 bop s t
 bopcut res
@@ -21,8 +21,8 @@ tcopy res buc60706f.brep
 # XXXXXXXXXXXXXXXXXXXXX  
 #	 D2
 #
-restore buc60706d.brep f
-restore buc60706e.brep w
+restore [locate_data_file buc60706d.brep] f
+restore [locate_data_file buc60706e.brep] w
 pipe t w f
 
 tcopy buc60706f.brep s
@@ -35,8 +35,8 @@ tcopy res buc60706i.brep
 # XXXXXXXXXXXXXXXXXXXXX  
 #	 D3
 #
-restore buc60706g.brep f
-restore buc60706h.brep w
+restore [locate_data_file buc60706g.brep] f
+restore [locate_data_file buc60706h.brep] w
 
 pipe t w f
 
diff --git a/tests/boolean/bopcut_complex/A7 b/tests/boolean/bopcut_complex/A7
index 5ecc391d2e..fa3b5386f9 100644
--- a/tests/boolean/bopcut_complex/A7
+++ b/tests/boolean/bopcut_complex/A7
@@ -7,12 +7,12 @@ puts "========================"
 # XXXXXXXXXXXXXXXXXXXXX  
 #	 D4
 #
-restore buc60706j.brep f
-restore buc60706k.brep w
+restore [locate_data_file buc60706j.brep] f
+restore [locate_data_file buc60706k.brep] w
 
 pipe t w f
 
-restore buc60706l.brep s
+restore [locate_data_file buc60706l.brep] s
 
 bop s t
 bopcut res
@@ -22,8 +22,8 @@ tcopy res buc60706o.brep
 # XXXXXXXXXXXXXXXXXXXXX  
 #	 D5
 #
-restore buc60706m.brep f
-restore buc60706n.brep w
+restore [locate_data_file buc60706m.brep] f
+restore [locate_data_file buc60706n.brep] w
 pipe t w f
 tcopy buc60706o.brep s
 
@@ -35,9 +35,9 @@ tcopy res buc60706r.brep
 # XXXXXXXXXXXXXXXXXXXXX  
 #	 D6
 #
-restore buc60706p.brep f
+restore [locate_data_file buc60706p.brep] f
 
-restore buc60706q.brep w
+restore [locate_data_file buc60706q.brep] w
 pipe t w f
 
 tcopy buc60706r.brep s
diff --git a/tests/boolean/bopcut_complex/A8 b/tests/boolean/bopcut_complex/A8
index 850b67785f..07b893c904 100644
--- a/tests/boolean/bopcut_complex/A8
+++ b/tests/boolean/bopcut_complex/A8
@@ -7,11 +7,11 @@ puts "========================"
 # XXXXXXXXXXXXXXXXXXXXX  
 #	 D7
 #
-restore buc60706s.brep f
-restore buc60706t.brep w
+restore [locate_data_file buc60706s.brep] f
+restore [locate_data_file buc60706t.brep] w
 pipe t w f
 
-restore buc60706u.brep s
+restore [locate_data_file buc60706u.brep] s
 
 bop s t
 bopcut res 
@@ -21,8 +21,8 @@ tcopy res buc60706y.brep
 # XXXXXXXXXXXXXXXXXXXXX  
 #	 D8
 #
-restore buc60706v.brep f
-restore buc60706w.brep w
+restore [locate_data_file buc60706v.brep] f
+restore [locate_data_file buc60706w.brep] w
 pipe t w f
 
 tcopy buc60706y.brep s
@@ -35,8 +35,8 @@ tcopy res buc60706z1.brep
 # XXXXXXXXXXXXXXXXXXXXX  
 #	 D9
 #
-restore buc60706x.brep f
-restore buc60706z.brep w
+restore [locate_data_file buc60706x.brep] f
+restore [locate_data_file buc60706z.brep] w
 pipe t w f
 tcopy buc60706z1.brep s
 
diff --git a/tests/boolean/bopcut_complex/A9 b/tests/boolean/bopcut_complex/A9
index 1c555555ff..e2a1095bf3 100644
--- a/tests/boolean/bopcut_complex/A9
+++ b/tests/boolean/bopcut_complex/A9
@@ -1,5 +1,5 @@
-restore OCC3-1.brep a
-restore OCC3-2.brep b
+restore [locate_data_file OCC3-1.brep] a
+restore [locate_data_file OCC3-2.brep] b
 
 bop  a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/B1 b/tests/boolean/bopcut_complex/B1
index f858740d14..b674e71a0d 100644
--- a/tests/boolean/bopcut_complex/B1
+++ b/tests/boolean/bopcut_complex/B1
@@ -1,5 +1,5 @@
-restore OCC3-1.brep a
-restore OCC3-2.brep b
+restore [locate_data_file OCC3-1.brep] a
+restore [locate_data_file OCC3-2.brep] b
 
 bop b a
 bopcut result
diff --git a/tests/boolean/bopcut_complex/B2 b/tests/boolean/bopcut_complex/B2
index 8cb509e73c..77acabafc7 100644
--- a/tests/boolean/bopcut_complex/B2
+++ b/tests/boolean/bopcut_complex/B2
@@ -1,4 +1,4 @@
-restore OCC37.brep sh
+restore [locate_data_file OCC37.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcut_complex/B3 b/tests/boolean/bopcut_complex/B3
index ae255b4d90..2527d08d5f 100644
--- a/tests/boolean/bopcut_complex/B3
+++ b/tests/boolean/bopcut_complex/B3
@@ -1,4 +1,4 @@
-restore OCC37.brep sh
+restore [locate_data_file OCC37.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcut_complex/B4 b/tests/boolean/bopcut_complex/B4
index 728bb7ecd5..004ecdf619 100644
--- a/tests/boolean/bopcut_complex/B4
+++ b/tests/boolean/bopcut_complex/B4
@@ -1,4 +1,4 @@
-restore BUC60975.brep sh
+restore [locate_data_file BUC60975.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcut_complex/B5 b/tests/boolean/bopcut_complex/B5
index 74f25ff558..6e37eb0a76 100644
--- a/tests/boolean/bopcut_complex/B5
+++ b/tests/boolean/bopcut_complex/B5
@@ -1,4 +1,4 @@
-restore BUC60975.brep sh
+restore [locate_data_file BUC60975.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcut_complex/B6 b/tests/boolean/bopcut_complex/B6
index 70fc830d05..f9227b501a 100644
--- a/tests/boolean/bopcut_complex/B6
+++ b/tests/boolean/bopcut_complex/B6
@@ -1,4 +1,4 @@
-restore OCC68.brep sh
+restore [locate_data_file OCC68.brep] sh
 explode sh
 
 bop  sh_1 sh_2
diff --git a/tests/boolean/bopcut_complex/B7 b/tests/boolean/bopcut_complex/B7
index 06c3ffb1be..1db8e8b68d 100644
--- a/tests/boolean/bopcut_complex/B7
+++ b/tests/boolean/bopcut_complex/B7
@@ -1,4 +1,4 @@
-restore OCC68.brep sh
+restore [locate_data_file OCC68.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcut_complex/B8 b/tests/boolean/bopcut_complex/B8
index 9409c9b128..bd665b35c3 100644
--- a/tests/boolean/bopcut_complex/B8
+++ b/tests/boolean/bopcut_complex/B8
@@ -1,5 +1,5 @@
-restore OCC100_sp.brep a
-restore OCC100_cyl.brep b
+restore [locate_data_file OCC100_sp.brep] a
+restore [locate_data_file OCC100_cyl.brep] b
 
 bop a b
 bopcut result a b
diff --git a/tests/boolean/bopcut_complex/B9 b/tests/boolean/bopcut_complex/B9
index 5923e945ae..bab2884052 100644
--- a/tests/boolean/bopcut_complex/B9
+++ b/tests/boolean/bopcut_complex/B9
@@ -1,7 +1,7 @@
 puts "TODO #22911 ALL: Error : The bopcut can not be build"
 
-restore OCC100_sp.brep a
-restore OCC100_cyl.brep b
+restore [locate_data_file OCC100_sp.brep] a
+restore [locate_data_file OCC100_cyl.brep] b
 
 bop b a
 bopcut result
diff --git a/tests/boolean/bopcut_complex/C1 b/tests/boolean/bopcut_complex/C1
index bb4036e8df..7e673bba41 100644
--- a/tests/boolean/bopcut_complex/C1
+++ b/tests/boolean/bopcut_complex/C1
@@ -1,4 +1,4 @@
-restore OCC117.brep sh
+restore [locate_data_file OCC117.brep] sh
 explode sh
 
 bop  sh_1 sh_2
diff --git a/tests/boolean/bopcut_complex/C2 b/tests/boolean/bopcut_complex/C2
index 510e97fbf1..39b01d9ebc 100644
--- a/tests/boolean/bopcut_complex/C2
+++ b/tests/boolean/bopcut_complex/C2
@@ -1,4 +1,4 @@
-restore OCC117.brep sh
+restore [locate_data_file OCC117.brep] sh
 explode sh
 
 bop  sh_2 sh_1
diff --git a/tests/boolean/bopcut_complex/C3 b/tests/boolean/bopcut_complex/C3
index 072f202621..7615836970 100644
--- a/tests/boolean/bopcut_complex/C3
+++ b/tests/boolean/bopcut_complex/C3
@@ -1,4 +1,4 @@
-restore OCC122.brep sh
+restore [locate_data_file OCC122.brep] sh
 explode sh
 
 bop  sh_1 sh_2
diff --git a/tests/boolean/bopcut_complex/C4 b/tests/boolean/bopcut_complex/C4
index ad4a12a71e..e9f85a1ae4 100644
--- a/tests/boolean/bopcut_complex/C4
+++ b/tests/boolean/bopcut_complex/C4
@@ -1,4 +1,4 @@
-restore OCC122.brep sh
+restore [locate_data_file OCC122.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcut_complex/C5 b/tests/boolean/bopcut_complex/C5
index 0c7fb9d761..3a3eb3b5c3 100644
--- a/tests/boolean/bopcut_complex/C5
+++ b/tests/boolean/bopcut_complex/C5
@@ -1,4 +1,4 @@
-restore OCC123.brep sh
+restore [locate_data_file OCC123.brep] sh
 explode sh
 
 bop  sh_1 sh_2
diff --git a/tests/boolean/bopcut_complex/C6 b/tests/boolean/bopcut_complex/C6
index 068775e2fd..a958ed0f3a 100644
--- a/tests/boolean/bopcut_complex/C6
+++ b/tests/boolean/bopcut_complex/C6
@@ -1,4 +1,4 @@
-restore OCC123.brep sh
+restore [locate_data_file OCC123.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcut_complex/C7 b/tests/boolean/bopcut_complex/C7
index b0ae192b70..bfbff159a6 100644
--- a/tests/boolean/bopcut_complex/C7
+++ b/tests/boolean/bopcut_complex/C7
@@ -1,5 +1,5 @@
 cpulimit 3600
-restore BUC60938.brep sh
+restore [locate_data_file BUC60938.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcut_complex/C8 b/tests/boolean/bopcut_complex/C8
index 79283da58c..cd322efd55 100644
--- a/tests/boolean/bopcut_complex/C8
+++ b/tests/boolean/bopcut_complex/C8
@@ -1,5 +1,5 @@
 cpulimit 3600
-restore BUC60938.brep sh
+restore [locate_data_file BUC60938.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcut_complex/C9 b/tests/boolean/bopcut_complex/C9
index 74fe70805e..b8f1fecaa2 100644
--- a/tests/boolean/bopcut_complex/C9
+++ b/tests/boolean/bopcut_complex/C9
@@ -1,4 +1,4 @@
-restore BUC60938.brep sh
+restore [locate_data_file BUC60938.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcut_complex/D1 b/tests/boolean/bopcut_complex/D1
index f107eaf430..f2840910e0 100644
--- a/tests/boolean/bopcut_complex/D1
+++ b/tests/boolean/bopcut_complex/D1
@@ -1,4 +1,4 @@
-restore BUC60938.brep sh
+restore [locate_data_file BUC60938.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcut_complex/D2 b/tests/boolean/bopcut_complex/D2
index c2f7ab0c18..e22f763a5c 100644
--- a/tests/boolean/bopcut_complex/D2
+++ b/tests/boolean/bopcut_complex/D2
@@ -1,5 +1,5 @@
 cpulimit 3600
-restore BUC60937.brep sh
+restore [locate_data_file BUC60937.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcut_complex/D3 b/tests/boolean/bopcut_complex/D3
index 401eefb68c..b27f9ae242 100644
--- a/tests/boolean/bopcut_complex/D3
+++ b/tests/boolean/bopcut_complex/D3
@@ -1,5 +1,5 @@
 cpulimit 3600
-restore BUC60937.brep sh
+restore [locate_data_file BUC60937.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcut_complex/D4 b/tests/boolean/bopcut_complex/D4
index 1caaddbfb9..17861dc915 100644
--- a/tests/boolean/bopcut_complex/D4
+++ b/tests/boolean/bopcut_complex/D4
@@ -1,4 +1,4 @@
-restore BUC60937.brep sh
+restore [locate_data_file BUC60937.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcut_complex/D5 b/tests/boolean/bopcut_complex/D5
index da2519c186..9679006cf2 100644
--- a/tests/boolean/bopcut_complex/D5
+++ b/tests/boolean/bopcut_complex/D5
@@ -1,4 +1,4 @@
-restore BUC60937.brep sh
+restore [locate_data_file BUC60937.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcut_complex/D6 b/tests/boolean/bopcut_complex/D6
index cf6f15c817..75404cc000 100644
--- a/tests/boolean/bopcut_complex/D6
+++ b/tests/boolean/bopcut_complex/D6
@@ -1,5 +1,5 @@
 cpulimit 3600
-restore BUC60936.brep sh
+restore [locate_data_file BUC60936.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcut_complex/D7 b/tests/boolean/bopcut_complex/D7
index 30280de730..37d806bbe5 100644
--- a/tests/boolean/bopcut_complex/D7
+++ b/tests/boolean/bopcut_complex/D7
@@ -1,5 +1,5 @@
 cpulimit 3600
-restore BUC60936.brep sh
+restore [locate_data_file BUC60936.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcut_complex/D8 b/tests/boolean/bopcut_complex/D8
index d252769b40..fab4e78f3d 100644
--- a/tests/boolean/bopcut_complex/D8
+++ b/tests/boolean/bopcut_complex/D8
@@ -1,4 +1,4 @@
-restore BUC60936.brep sh
+restore [locate_data_file BUC60936.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcut_complex/D9 b/tests/boolean/bopcut_complex/D9
index ee79e7eb03..934ef7685b 100644
--- a/tests/boolean/bopcut_complex/D9
+++ b/tests/boolean/bopcut_complex/D9
@@ -1,4 +1,4 @@
-restore BUC60936.brep sh
+restore [locate_data_file BUC60936.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcut_complex/E1 b/tests/boolean/bopcut_complex/E1
index 539bfc103f..20f5251813 100644
--- a/tests/boolean/bopcut_complex/E1
+++ b/tests/boolean/bopcut_complex/E1
@@ -1,6 +1,6 @@
 puts "TODO #22911 ALL: Error : The bopcut can not be build"
 
-restore OCC228.brep sh
+restore [locate_data_file OCC228.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcut_complex/E2 b/tests/boolean/bopcut_complex/E2
index 326498fd33..9ebb2dad97 100644
--- a/tests/boolean/bopcut_complex/E2
+++ b/tests/boolean/bopcut_complex/E2
@@ -1,6 +1,6 @@
 puts "TODO #22911 ALL: Error : The bopcut is not valid"
 
-restore OCC228.brep sh
+restore [locate_data_file OCC228.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcut_complex/E3 b/tests/boolean/bopcut_complex/E3
index ac629083bd..7169a280de 100644
--- a/tests/boolean/bopcut_complex/E3
+++ b/tests/boolean/bopcut_complex/E3
@@ -1,5 +1,5 @@
-restore OCC315-1.brep a
-restore OCC315-2.brep b
+restore [locate_data_file OCC315-1.brep] a
+restore [locate_data_file OCC315-2.brep] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/E4 b/tests/boolean/bopcut_complex/E4
index b9c0123ce0..21663faf7a 100644
--- a/tests/boolean/bopcut_complex/E4
+++ b/tests/boolean/bopcut_complex/E4
@@ -1,5 +1,5 @@
-restore OCC315-1.brep a
-restore OCC315-2.brep b
+restore [locate_data_file OCC315-1.brep] a
+restore [locate_data_file OCC315-2.brep] b
 
 bop b a
 bopcut result
diff --git a/tests/boolean/bopcut_complex/E5 b/tests/boolean/bopcut_complex/E5
index ff8c0e89e1..5b21b00715 100644
--- a/tests/boolean/bopcut_complex/E5
+++ b/tests/boolean/bopcut_complex/E5
@@ -1,6 +1,6 @@
 puts "TODO #22911 ALL: Error : The bopcut can not be build"
 
-restore BUC60928.brep sh
+restore [locate_data_file BUC60928.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcut_complex/E6 b/tests/boolean/bopcut_complex/E6
index 430943a0d3..9bd20c991c 100644
--- a/tests/boolean/bopcut_complex/E6
+++ b/tests/boolean/bopcut_complex/E6
@@ -1,4 +1,4 @@
-restore BUC60928.brep sh
+restore [locate_data_file BUC60928.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcut_complex/E7 b/tests/boolean/bopcut_complex/E7
index 5be1e17498..aa7b9097fc 100644
--- a/tests/boolean/bopcut_complex/E7
+++ b/tests/boolean/bopcut_complex/E7
@@ -1,4 +1,4 @@
-restore BUC60931.brep sh
+restore [locate_data_file BUC60931.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcut_complex/E8 b/tests/boolean/bopcut_complex/E8
index 5ac85d8bb0..0e32086f08 100644
--- a/tests/boolean/bopcut_complex/E8
+++ b/tests/boolean/bopcut_complex/E8
@@ -1,6 +1,6 @@
 puts "TODO #22911 ALL: Error : The bopcut can not be build"
 
-restore BUC60931.brep sh
+restore [locate_data_file BUC60931.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcut_complex/E9 b/tests/boolean/bopcut_complex/E9
index 6cbb8a55ff..61617eb0d4 100644
--- a/tests/boolean/bopcut_complex/E9
+++ b/tests/boolean/bopcut_complex/E9
@@ -1,4 +1,4 @@
-restore BUC60939.brep sh
+restore [locate_data_file BUC60939.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcut_complex/F1 b/tests/boolean/bopcut_complex/F1
index baa253907e..68d0387c50 100644
--- a/tests/boolean/bopcut_complex/F1
+++ b/tests/boolean/bopcut_complex/F1
@@ -1,4 +1,4 @@
-restore BUC60939.brep sh
+restore [locate_data_file BUC60939.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcut_complex/F2 b/tests/boolean/bopcut_complex/F2
index 40a4db6494..209cd4e332 100644
--- a/tests/boolean/bopcut_complex/F2
+++ b/tests/boolean/bopcut_complex/F2
@@ -1,4 +1,4 @@
-restore OCC337.brep sh
+restore [locate_data_file OCC337.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcut_complex/F3 b/tests/boolean/bopcut_complex/F3
index 824ea9456e..1b8672acf4 100644
--- a/tests/boolean/bopcut_complex/F3
+++ b/tests/boolean/bopcut_complex/F3
@@ -1,4 +1,4 @@
-restore OCC337.brep sh
+restore [locate_data_file OCC337.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcut_complex/F4 b/tests/boolean/bopcut_complex/F4
index fc52b17f9d..1421425440 100644
--- a/tests/boolean/bopcut_complex/F4
+++ b/tests/boolean/bopcut_complex/F4
@@ -1,4 +1,4 @@
-restore buc60996.brep sh
+restore [locate_data_file buc60996.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcut_complex/F5 b/tests/boolean/bopcut_complex/F5
index 6dbc2f5475..d4d4086499 100644
--- a/tests/boolean/bopcut_complex/F5
+++ b/tests/boolean/bopcut_complex/F5
@@ -1,4 +1,4 @@
-restore buc60996.brep sh
+restore [locate_data_file buc60996.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcut_complex/F6 b/tests/boolean/bopcut_complex/F6
index 817d286113..60276bb73e 100644
--- a/tests/boolean/bopcut_complex/F6
+++ b/tests/boolean/bopcut_complex/F6
@@ -1,4 +1,4 @@
-restore BUC60974.brep sh
+restore [locate_data_file BUC60974.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopcut_complex/F7 b/tests/boolean/bopcut_complex/F7
index be79dd2cc2..d6c8854d61 100644
--- a/tests/boolean/bopcut_complex/F7
+++ b/tests/boolean/bopcut_complex/F7
@@ -1,4 +1,4 @@
-restore BUC60974.brep sh
+restore [locate_data_file BUC60974.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopcut_complex/F8 b/tests/boolean/bopcut_complex/F8
index 497dda198b..f5251ee3ec 100644
--- a/tests/boolean/bopcut_complex/F8
+++ b/tests/boolean/bopcut_complex/F8
@@ -1,5 +1,5 @@
-restore a11 a
-restore b11 b
+restore [locate_data_file a11] a
+restore [locate_data_file b11] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/F9 b/tests/boolean/bopcut_complex/F9
index 4c75877215..690b0e69cf 100644
--- a/tests/boolean/bopcut_complex/F9
+++ b/tests/boolean/bopcut_complex/F9
@@ -1,5 +1,5 @@
-restore a11 a
-restore b13 b
+restore [locate_data_file a11] a
+restore [locate_data_file b13] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/G1 b/tests/boolean/bopcut_complex/G1
index e5807655c0..bfa3fd891a 100644
--- a/tests/boolean/bopcut_complex/G1
+++ b/tests/boolean/bopcut_complex/G1
@@ -1,5 +1,5 @@
-restore a11 a
-restore b15 b
+restore [locate_data_file a11] a
+restore [locate_data_file b15] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/G2 b/tests/boolean/bopcut_complex/G2
index f8e14f547f..e24e6801c4 100644
--- a/tests/boolean/bopcut_complex/G2
+++ b/tests/boolean/bopcut_complex/G2
@@ -1,5 +1,5 @@
-restore a11 a
-restore b17 b
+restore [locate_data_file a11] a
+restore [locate_data_file b17] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/G3 b/tests/boolean/bopcut_complex/G3
index 4141e28dd5..8c90247e1c 100644
--- a/tests/boolean/bopcut_complex/G3
+++ b/tests/boolean/bopcut_complex/G3
@@ -1,5 +1,5 @@
-restore a11 a
-restore b19 b
+restore [locate_data_file a11] a
+restore [locate_data_file b19] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/G4 b/tests/boolean/bopcut_complex/G4
index e971b6d9e2..efe877177b 100644
--- a/tests/boolean/bopcut_complex/G4
+++ b/tests/boolean/bopcut_complex/G4
@@ -1,5 +1,5 @@
-restore a11 a
-restore b21 b
+restore [locate_data_file a11] a
+restore [locate_data_file b21] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/G5 b/tests/boolean/bopcut_complex/G5
index edd4f95ef0..334dace280 100644
--- a/tests/boolean/bopcut_complex/G5
+++ b/tests/boolean/bopcut_complex/G5
@@ -1,5 +1,5 @@
-restore a57 a
-restore b57 b
+restore [locate_data_file a57] a
+restore [locate_data_file b57] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/G6 b/tests/boolean/bopcut_complex/G6
index fd1e88404c..d5419f4df5 100644
--- a/tests/boolean/bopcut_complex/G6
+++ b/tests/boolean/bopcut_complex/G6
@@ -1,5 +1,5 @@
-restore a58 a
-restore b58 b
+restore [locate_data_file a58] a
+restore [locate_data_file b58] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/G7 b/tests/boolean/bopcut_complex/G7
index 06f135ae3a..8d6dbc1c31 100644
--- a/tests/boolean/bopcut_complex/G7
+++ b/tests/boolean/bopcut_complex/G7
@@ -1,5 +1,5 @@
-restore a58 a
-restore b60 b
+restore [locate_data_file a58] a
+restore [locate_data_file b60] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/G8 b/tests/boolean/bopcut_complex/G8
index 4f6db47908..ee5f87d5aa 100644
--- a/tests/boolean/bopcut_complex/G8
+++ b/tests/boolean/bopcut_complex/G8
@@ -1,5 +1,5 @@
-restore a58 a
-restore b62 b
+restore [locate_data_file a58] a
+restore [locate_data_file b62] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/G9 b/tests/boolean/bopcut_complex/G9
index 8fa455e974..57b2d9359f 100644
--- a/tests/boolean/bopcut_complex/G9
+++ b/tests/boolean/bopcut_complex/G9
@@ -1,5 +1,5 @@
-restore a58 a
-restore b64 b
+restore [locate_data_file a58] a
+restore [locate_data_file b64] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/H1 b/tests/boolean/bopcut_complex/H1
index 578117446f..7a22b0c846 100644
--- a/tests/boolean/bopcut_complex/H1
+++ b/tests/boolean/bopcut_complex/H1
@@ -1,5 +1,5 @@
-restore a58 a
-restore b66 b
+restore [locate_data_file a58] a
+restore [locate_data_file b66] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/H2 b/tests/boolean/bopcut_complex/H2
index e75b4effca..bf5669bcd9 100644
--- a/tests/boolean/bopcut_complex/H2
+++ b/tests/boolean/bopcut_complex/H2
@@ -1,5 +1,5 @@
-restore a90 a
-restore b90 b
+restore [locate_data_file a90] a
+restore [locate_data_file b90] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/H3 b/tests/boolean/bopcut_complex/H3
index 36c3b248b3..17326f5f6e 100644
--- a/tests/boolean/bopcut_complex/H3
+++ b/tests/boolean/bopcut_complex/H3
@@ -1,5 +1,5 @@
-restore a102 a
-restore b102 b
+restore [locate_data_file a102] a
+restore [locate_data_file b102] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/H4 b/tests/boolean/bopcut_complex/H4
index e626b9017b..338793acb3 100644
--- a/tests/boolean/bopcut_complex/H4
+++ b/tests/boolean/bopcut_complex/H4
@@ -1,5 +1,5 @@
-restore a104 a
-restore b104 b
+restore [locate_data_file a104] a
+restore [locate_data_file b104] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/H5 b/tests/boolean/bopcut_complex/H5
index fb67fba6fe..2e0978ba79 100644
--- a/tests/boolean/bopcut_complex/H5
+++ b/tests/boolean/bopcut_complex/H5
@@ -1,7 +1,7 @@
 puts "TODO #22911 Debian40 Mandriva2008 Mandriva2010: Faulty shapes in variables faulty_1 to faulty_"
 
-restore a106 a
-restore b106 b
+restore [locate_data_file a106] a
+restore [locate_data_file b106] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/H6 b/tests/boolean/bopcut_complex/H6
index 590cb68215..0e0e8a5319 100644
--- a/tests/boolean/bopcut_complex/H6
+++ b/tests/boolean/bopcut_complex/H6
@@ -1,5 +1,5 @@
-restore a108 a
-restore b108 b
+restore [locate_data_file a108] a
+restore [locate_data_file b108] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/H7 b/tests/boolean/bopcut_complex/H7
index 8c3b63e42b..f21e1cebf2 100644
--- a/tests/boolean/bopcut_complex/H7
+++ b/tests/boolean/bopcut_complex/H7
@@ -1,5 +1,5 @@
-restore a110 a
-restore b110 b
+restore [locate_data_file a110] a
+restore [locate_data_file b110] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/H8 b/tests/boolean/bopcut_complex/H8
index cfd4d1aea8..36542a70d5 100644
--- a/tests/boolean/bopcut_complex/H8
+++ b/tests/boolean/bopcut_complex/H8
@@ -1,5 +1,5 @@
-restore a112 a
-restore b112 b
+restore [locate_data_file a112] a
+restore [locate_data_file b112] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/H9 b/tests/boolean/bopcut_complex/H9
index 57568c854c..60ebe81d3d 100644
--- a/tests/boolean/bopcut_complex/H9
+++ b/tests/boolean/bopcut_complex/H9
@@ -1,5 +1,5 @@
-restore a114 a
-restore b114 b
+restore [locate_data_file a114] a
+restore [locate_data_file b114] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/I1 b/tests/boolean/bopcut_complex/I1
index b5eca17735..d13ffd4f51 100644
--- a/tests/boolean/bopcut_complex/I1
+++ b/tests/boolean/bopcut_complex/I1
@@ -1,5 +1,5 @@
-restore a116 a
-restore b116 b
+restore [locate_data_file a116] a
+restore [locate_data_file b116] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/I2 b/tests/boolean/bopcut_complex/I2
index 485c010edf..214cb81b36 100644
--- a/tests/boolean/bopcut_complex/I2
+++ b/tests/boolean/bopcut_complex/I2
@@ -1,5 +1,5 @@
-restore a118 a
-restore b118 b
+restore [locate_data_file a118] a
+restore [locate_data_file b118] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/I3 b/tests/boolean/bopcut_complex/I3
index 694ff67b46..69271714b7 100644
--- a/tests/boolean/bopcut_complex/I3
+++ b/tests/boolean/bopcut_complex/I3
@@ -1,5 +1,5 @@
-restore a124 a
-restore b124 b
+restore [locate_data_file a124] a
+restore [locate_data_file b124] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/I4 b/tests/boolean/bopcut_complex/I4
index 5453f38a95..532054dd04 100644
--- a/tests/boolean/bopcut_complex/I4
+++ b/tests/boolean/bopcut_complex/I4
@@ -1,5 +1,5 @@
-restore a126 a
-restore b126 b
+restore [locate_data_file a126] a
+restore [locate_data_file b126] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/I5 b/tests/boolean/bopcut_complex/I5
index 59a61d56b9..f5d210afdd 100644
--- a/tests/boolean/bopcut_complex/I5
+++ b/tests/boolean/bopcut_complex/I5
@@ -1,5 +1,5 @@
-restore a128 a
-restore b128 b
+restore [locate_data_file a128] a
+restore [locate_data_file b128] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/I6 b/tests/boolean/bopcut_complex/I6
index 03c06f81d6..648b62b29b 100644
--- a/tests/boolean/bopcut_complex/I6
+++ b/tests/boolean/bopcut_complex/I6
@@ -1,5 +1,5 @@
-restore a130 a
-restore b130 b
+restore [locate_data_file a130] a
+restore [locate_data_file b130] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/I7 b/tests/boolean/bopcut_complex/I7
index 8cca15b7eb..a0ba1ad87f 100644
--- a/tests/boolean/bopcut_complex/I7
+++ b/tests/boolean/bopcut_complex/I7
@@ -1,5 +1,5 @@
-restore a132 a
-restore b132 b
+restore [locate_data_file a132] a
+restore [locate_data_file b132] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/I8 b/tests/boolean/bopcut_complex/I8
index 09c351bed4..d4e36153b8 100644
--- a/tests/boolean/bopcut_complex/I8
+++ b/tests/boolean/bopcut_complex/I8
@@ -1,5 +1,5 @@
-restore a136 a
-restore b136 b
+restore [locate_data_file a136] a
+restore [locate_data_file b136] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/I9 b/tests/boolean/bopcut_complex/I9
index b9b31cfc3c..3fbbe69716 100644
--- a/tests/boolean/bopcut_complex/I9
+++ b/tests/boolean/bopcut_complex/I9
@@ -1,5 +1,5 @@
-restore a138 a
-restore b138 b
+restore [locate_data_file a138] a
+restore [locate_data_file b138] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/J1 b/tests/boolean/bopcut_complex/J1
index e24679451a..eafb999695 100644
--- a/tests/boolean/bopcut_complex/J1
+++ b/tests/boolean/bopcut_complex/J1
@@ -1,5 +1,5 @@
-restore a140 a
-restore b140 b
+restore [locate_data_file a140] a
+restore [locate_data_file b140] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/J2 b/tests/boolean/bopcut_complex/J2
index 10c8798c30..1d706d96b3 100644
--- a/tests/boolean/bopcut_complex/J2
+++ b/tests/boolean/bopcut_complex/J2
@@ -1,5 +1,5 @@
-restore a142 a
-restore b142 b
+restore [locate_data_file a142] a
+restore [locate_data_file b142] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/J3 b/tests/boolean/bopcut_complex/J3
index 60c2e1b7bc..206e7cfc63 100644
--- a/tests/boolean/bopcut_complex/J3
+++ b/tests/boolean/bopcut_complex/J3
@@ -1,5 +1,5 @@
-restore a144 a
-restore b144 b
+restore [locate_data_file a144] a
+restore [locate_data_file b144] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/J4 b/tests/boolean/bopcut_complex/J4
index 69aa6e6bc9..ad0a65a2f5 100644
--- a/tests/boolean/bopcut_complex/J4
+++ b/tests/boolean/bopcut_complex/J4
@@ -1,5 +1,5 @@
-restore a146 a
-restore b146 b
+restore [locate_data_file a146] a
+restore [locate_data_file b146] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/J5 b/tests/boolean/bopcut_complex/J5
index 84b650957f..2397722f6b 100644
--- a/tests/boolean/bopcut_complex/J5
+++ b/tests/boolean/bopcut_complex/J5
@@ -1,5 +1,5 @@
-restore a148 a
-restore b148 b
+restore [locate_data_file a148] a
+restore [locate_data_file b148] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/J6 b/tests/boolean/bopcut_complex/J6
index 01aa18e552..ede3cf025f 100644
--- a/tests/boolean/bopcut_complex/J6
+++ b/tests/boolean/bopcut_complex/J6
@@ -1,5 +1,5 @@
-restore a150 a
-restore b150 b
+restore [locate_data_file a150] a
+restore [locate_data_file b150] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/J7 b/tests/boolean/bopcut_complex/J7
index 416031690b..3165182146 100644
--- a/tests/boolean/bopcut_complex/J7
+++ b/tests/boolean/bopcut_complex/J7
@@ -1,5 +1,5 @@
-restore a154 a
-restore b154 b
+restore [locate_data_file a154] a
+restore [locate_data_file b154] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/J8 b/tests/boolean/bopcut_complex/J8
index 131065df45..e3d37cc443 100644
--- a/tests/boolean/bopcut_complex/J8
+++ b/tests/boolean/bopcut_complex/J8
@@ -1,5 +1,5 @@
-restore a156 a
-restore b156 b
+restore [locate_data_file a156] a
+restore [locate_data_file b156] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/J9 b/tests/boolean/bopcut_complex/J9
index d2fc019d93..c7b6f77930 100644
--- a/tests/boolean/bopcut_complex/J9
+++ b/tests/boolean/bopcut_complex/J9
@@ -1,5 +1,5 @@
-restore a157 a
-restore b157 b
+restore [locate_data_file a157] a
+restore [locate_data_file b157] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/K1 b/tests/boolean/bopcut_complex/K1
index 4f6b03b81f..3c1724ce21 100644
--- a/tests/boolean/bopcut_complex/K1
+++ b/tests/boolean/bopcut_complex/K1
@@ -1,5 +1,5 @@
-restore a158 a
-restore b158 b
+restore [locate_data_file a158] a
+restore [locate_data_file b158] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/K2 b/tests/boolean/bopcut_complex/K2
index b50662f538..6962910a27 100644
--- a/tests/boolean/bopcut_complex/K2
+++ b/tests/boolean/bopcut_complex/K2
@@ -1,5 +1,5 @@
-restore a160 a
-restore b160 b
+restore [locate_data_file a160] a
+restore [locate_data_file b160] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/K3 b/tests/boolean/bopcut_complex/K3
index d4de69601f..abebdca3b2 100644
--- a/tests/boolean/bopcut_complex/K3
+++ b/tests/boolean/bopcut_complex/K3
@@ -1,5 +1,5 @@
-restore a164 a
-restore b164 b
+restore [locate_data_file a164] a
+restore [locate_data_file b164] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/K4 b/tests/boolean/bopcut_complex/K4
index 1fe7ac2767..4adab9005a 100644
--- a/tests/boolean/bopcut_complex/K4
+++ b/tests/boolean/bopcut_complex/K4
@@ -1,5 +1,5 @@
-restore a166 a
-restore b166 b
+restore [locate_data_file a166] a
+restore [locate_data_file b166] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/K5 b/tests/boolean/bopcut_complex/K5
index 42999e769a..8f7b267c3c 100644
--- a/tests/boolean/bopcut_complex/K5
+++ b/tests/boolean/bopcut_complex/K5
@@ -1,5 +1,5 @@
-restore a168 a
-restore b168 b
+restore [locate_data_file a168] a
+restore [locate_data_file b168] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/K6 b/tests/boolean/bopcut_complex/K6
index 75e802cf85..97148d309d 100644
--- a/tests/boolean/bopcut_complex/K6
+++ b/tests/boolean/bopcut_complex/K6
@@ -1,5 +1,5 @@
-restore a170 a
-restore b170 b
+restore [locate_data_file a170] a
+restore [locate_data_file b170] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/K7 b/tests/boolean/bopcut_complex/K7
index 683087abd1..47ea6af676 100644
--- a/tests/boolean/bopcut_complex/K7
+++ b/tests/boolean/bopcut_complex/K7
@@ -1,5 +1,5 @@
-restore a167 a
-restore b167 b
+restore [locate_data_file a167] a
+restore [locate_data_file b167] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/K8 b/tests/boolean/bopcut_complex/K8
index 7235f0c7af..5a06808044 100644
--- a/tests/boolean/bopcut_complex/K8
+++ b/tests/boolean/bopcut_complex/K8
@@ -1,5 +1,5 @@
-restore a189 a
-restore b189 b
+restore [locate_data_file a189] a
+restore [locate_data_file b189] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/K9 b/tests/boolean/bopcut_complex/K9
index 080878ef44..acedeb5b21 100644
--- a/tests/boolean/bopcut_complex/K9
+++ b/tests/boolean/bopcut_complex/K9
@@ -1,5 +1,5 @@
-restore a193 a
-restore b193 b
+restore [locate_data_file a193] a
+restore [locate_data_file b193] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/L1 b/tests/boolean/bopcut_complex/L1
index 0abc39d7d6..26de2d90c6 100644
--- a/tests/boolean/bopcut_complex/L1
+++ b/tests/boolean/bopcut_complex/L1
@@ -1,5 +1,5 @@
-restore a197 a
-restore b197 b
+restore [locate_data_file a197] a
+restore [locate_data_file b197] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/L2 b/tests/boolean/bopcut_complex/L2
index 36e9849cbf..a68e44b34a 100644
--- a/tests/boolean/bopcut_complex/L2
+++ b/tests/boolean/bopcut_complex/L2
@@ -1,5 +1,5 @@
-restore a199 a
-restore b199 b
+restore [locate_data_file a199] a
+restore [locate_data_file b199] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/L3 b/tests/boolean/bopcut_complex/L3
index 4e4d4f955e..0ad4653610 100644
--- a/tests/boolean/bopcut_complex/L3
+++ b/tests/boolean/bopcut_complex/L3
@@ -1,5 +1,5 @@
-restore a206 a
-restore b206 b
+restore [locate_data_file a206] a
+restore [locate_data_file b206] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/L4 b/tests/boolean/bopcut_complex/L4
index b3af315460..f1c9fe557d 100644
--- a/tests/boolean/bopcut_complex/L4
+++ b/tests/boolean/bopcut_complex/L4
@@ -1,5 +1,5 @@
-restore a208 a
-restore b208 b
+restore [locate_data_file a208] a
+restore [locate_data_file b208] b
 
 bop b a
 bopcut result
diff --git a/tests/boolean/bopcut_complex/L5 b/tests/boolean/bopcut_complex/L5
index 0a4d0c35cc..0c4c7c22f0 100644
--- a/tests/boolean/bopcut_complex/L5
+++ b/tests/boolean/bopcut_complex/L5
@@ -1,5 +1,5 @@
-restore a342 a
-restore b342 b
+restore [locate_data_file a342] a
+restore [locate_data_file b342] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/L6 b/tests/boolean/bopcut_complex/L6
index abd30a874b..49d89083f1 100644
--- a/tests/boolean/bopcut_complex/L6
+++ b/tests/boolean/bopcut_complex/L6
@@ -1,5 +1,5 @@
-restore a349 a
-restore b349 b
+restore [locate_data_file a349] a
+restore [locate_data_file b349] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/L7 b/tests/boolean/bopcut_complex/L7
index f9c3cdab0e..73a0d4b376 100644
--- a/tests/boolean/bopcut_complex/L7
+++ b/tests/boolean/bopcut_complex/L7
@@ -1,5 +1,5 @@
-restore a343 a
-restore b343 b
+restore [locate_data_file a343] a
+restore [locate_data_file b343] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/L8 b/tests/boolean/bopcut_complex/L8
index 6b60737970..41f5961e40 100644
--- a/tests/boolean/bopcut_complex/L8
+++ b/tests/boolean/bopcut_complex/L8
@@ -1,8 +1,8 @@
 # Original bug : pro10095
 # Date : 19Mai98
 
-restore pro10095a.rle a
-restore pro10095b.rle b
+restore [locate_data_file pro10095a.rle] a
+restore [locate_data_file pro10095b.rle] b
 
 shape fso so
 add b fso
diff --git a/tests/boolean/bopcut_complex/L9 b/tests/boolean/bopcut_complex/L9
index e2433a37dd..d9198822db 100644
--- a/tests/boolean/bopcut_complex/L9
+++ b/tests/boolean/bopcut_complex/L9
@@ -1,8 +1,8 @@
 # Original bug : pro13075
 # Date : 19Mai98
 
-restore pro13075a.rle a
-restore pro13075b.rle b
+restore [locate_data_file pro13075a.rle] a
+restore [locate_data_file pro13075b.rle] b
 
 bop a b 
 bopcut result
diff --git a/tests/boolean/bopcut_complex/M1 b/tests/boolean/bopcut_complex/M1
index a6efbad0e6..5cb83dec63 100644
--- a/tests/boolean/bopcut_complex/M1
+++ b/tests/boolean/bopcut_complex/M1
@@ -1,8 +1,8 @@
 # Original bug : pro13495
 # Date : 19Mai98
 
-restore pro13495a.rle a
-restore pro13495b.rle b
+restore [locate_data_file pro13495a.rle] a
+restore [locate_data_file pro13495b.rle] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/M2 b/tests/boolean/bopcut_complex/M2
index c7b121437a..cc2203d6be 100644
--- a/tests/boolean/bopcut_complex/M2
+++ b/tests/boolean/bopcut_complex/M2
@@ -1,8 +1,8 @@
 # Original bug : cts20148
 # Date : 19Mai98
 
-restore cts20148a.rle a
-restore cts20148b.rle b
+restore [locate_data_file cts20148a.rle] a
+restore [locate_data_file cts20148b.rle] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/M3 b/tests/boolean/bopcut_complex/M3
index 06519695d4..59a2a00278 100644
--- a/tests/boolean/bopcut_complex/M3
+++ b/tests/boolean/bopcut_complex/M3
@@ -1,8 +1,8 @@
 # Original bug : cts20354
 # Date : 4June98
 
-restore cts20354-part.rle a
-restore cts20354-tool.rle b
+restore [locate_data_file cts20354-part.rle] a
+restore [locate_data_file cts20354-tool.rle] b
 
 bop a b 
 bopcut result
diff --git a/tests/boolean/bopcut_complex/M4 b/tests/boolean/bopcut_complex/M4
index f42d1f99e5..620bd3e9e3 100644
--- a/tests/boolean/bopcut_complex/M4
+++ b/tests/boolean/bopcut_complex/M4
@@ -1,8 +1,8 @@
 # Original bug : cts20975
 # Date : 18Juin98
 
-restore cts20975a.rle a
-restore cts20975b.rle b
+restore [locate_data_file cts20975a.rle] a
+restore [locate_data_file cts20975b.rle] b
 
 bopaddpcs a
 
diff --git a/tests/boolean/bopcut_complex/M5 b/tests/boolean/bopcut_complex/M5
index 1c73fa6df8..a69ad78dcf 100644
--- a/tests/boolean/bopcut_complex/M5
+++ b/tests/boolean/bopcut_complex/M5
@@ -1,8 +1,8 @@
 # Original bug : pro14527
 # Date : 16July98
 
-restore pro14527a.rle a 
-restore pro14527b.rle b
+restore [locate_data_file pro14527a.rle] a 
+restore [locate_data_file pro14527b.rle] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/M6 b/tests/boolean/bopcut_complex/M6
index 11585d4a24..00c5ea66f7 100644
--- a/tests/boolean/bopcut_complex/M6
+++ b/tests/boolean/bopcut_complex/M6
@@ -1,10 +1,10 @@
 # pro17221
 
-restore Jyls3 a
+restore [locate_data_file Jyls3] a
 explode a sh
 copy a_1 a
 
-restore Jyls4 b
+restore [locate_data_file Jyls4] b
 explode b sh
 copy b_1 b
 
diff --git a/tests/boolean/bopcut_complex/M7 b/tests/boolean/bopcut_complex/M7
index a0705cd21e..a745b40695 100644
--- a/tests/boolean/bopcut_complex/M7
+++ b/tests/boolean/bopcut_complex/M7
@@ -1,7 +1,7 @@
 #cts21527
 
-restore bad_cut_outil.brep a
-restore bad_cut_part.brep b
+restore [locate_data_file bad_cut_outil.brep] a
+restore [locate_data_file bad_cut_part.brep] b
 
 bop b a
 bopcut result
diff --git a/tests/boolean/bopcut_complex/M8 b/tests/boolean/bopcut_complex/M8
index 8fccb67858..ec9d52e8fd 100644
--- a/tests/boolean/bopcut_complex/M8
+++ b/tests/boolean/bopcut_complex/M8
@@ -1,7 +1,7 @@
 #uki60922
 
-restore uki60922_part.brep a
-restore uki60922_tool.brep b
+restore [locate_data_file uki60922_part.brep] a
+restore [locate_data_file uki60922_tool.brep] b
 
 bop a b
 bopcut result
diff --git a/tests/boolean/bopcut_complex/M9 b/tests/boolean/bopcut_complex/M9
index 77ae76102d..c6a7271198 100644
--- a/tests/boolean/bopcut_complex/M9
+++ b/tests/boolean/bopcut_complex/M9
@@ -1,7 +1,7 @@
 # Original bug : pro10095
 
-restore pro10095a.rle a
-restore pro10095b.rle b
+restore [locate_data_file pro10095a.rle] a
+restore [locate_data_file pro10095b.rle] b
 
 shape fso so
 add b fso
diff --git a/tests/boolean/bopcut_complex/N2 b/tests/boolean/bopcut_complex/N2
index 729c4a7adb..a88a3b1880 100644
--- a/tests/boolean/bopcut_complex/N2
+++ b/tests/boolean/bopcut_complex/N2
@@ -1,7 +1,7 @@
 ## pro16129
 
-restore CSRESULT-ORISHAPE.brep a
-restore CSRESULT-PRISM.brep c
+restore [locate_data_file CSRESULT-ORISHAPE.brep] a
+restore [locate_data_file CSRESULT-PRISM.brep] c
 
 #pkv f
 btolx a
diff --git a/tests/boolean/bopcut_complex/N3 b/tests/boolean/bopcut_complex/N3
index 02f51f8244..e0a12534de 100644
--- a/tests/boolean/bopcut_complex/N3
+++ b/tests/boolean/bopcut_complex/N3
@@ -1,7 +1,7 @@
 #pro16955
 
-restore m2_o
-restore m2_t
+restore [locate_data_file m2_o] m2_o
+restore [locate_data_file m2_t] m2_t
 
 bop m2_o m2_t
 bopcut result
diff --git a/tests/boolean/bopcut_complex/N4 b/tests/boolean/bopcut_complex/N4
index 8bbb71c375..3a33d649dc 100644
--- a/tests/boolean/bopcut_complex/N4
+++ b/tests/boolean/bopcut_complex/N4
@@ -1,7 +1,7 @@
 ## fra60812
 #
-restore Bug3_Tr_obj_1.rle a
-restore Bug3_Tr_outil.rle b
+restore [locate_data_file Bug3_Tr_obj_1.rle] a
+restore [locate_data_file Bug3_Tr_outil.rle] b
 
 fsameparameter a
 
diff --git a/tests/boolean/bopcut_complex/N5 b/tests/boolean/bopcut_complex/N5
index 9f3d3683dd..9e6f633bf3 100644
--- a/tests/boolean/bopcut_complex/N5
+++ b/tests/boolean/bopcut_complex/N5
@@ -5,7 +5,7 @@ ttranslate c 3 3 6
 bop b c
 bopfuse rr
 
-restore A1_rr_7.brep A1_rr_7
+restore [locate_data_file A1_rr_7.brep] A1_rr_7
 prism p1 A1_rr_7 0 0 4
 
 bop rr p1
diff --git a/tests/boolean/bopcut_complex/N6 b/tests/boolean/bopcut_complex/N6
index 041364067b..5642cd8c1d 100644
--- a/tests/boolean/bopcut_complex/N6
+++ b/tests/boolean/bopcut_complex/N6
@@ -5,7 +5,7 @@ ttranslate c 3 3 6
 
 bfuse rr b c
 
-restore A1_rr_7.brep A1_rr_7
+restore [locate_data_file A1_rr_7.brep] A1_rr_7
 prism p1 A1_rr_7 0 0 -4
 
 explode  rr so
diff --git a/tests/boolean/bopcut_complex/N7 b/tests/boolean/bopcut_complex/N7
index f34074c4c4..c81b9b76f0 100644
--- a/tests/boolean/bopcut_complex/N7
+++ b/tests/boolean/bopcut_complex/N7
@@ -5,7 +5,7 @@ ttranslate c 0 0 6
 
 bfuse rr b c
 
-restore C1_rr_8.brep C1_rr_8
+restore [locate_data_file C1_rr_8.brep] C1_rr_8
 prism p1 C1_rr_8 0 0 -4
 
 explode rr so
diff --git a/tests/boolean/bopcut_complex/N8 b/tests/boolean/bopcut_complex/N8
index 12e98c0297..961f3c481d 100644
--- a/tests/boolean/bopcut_complex/N8
+++ b/tests/boolean/bopcut_complex/N8
@@ -5,7 +5,7 @@ ttranslate c 0 0 6
 
 bfuse rr b c
 
-restore C1_rr_8.brep C1_rr_8
+restore [locate_data_file C1_rr_8.brep] C1_rr_8
 prism p1 C1_rr_8 0 0 4
 
 explode rr so
diff --git a/tests/boolean/bopcut_complex/N9 b/tests/boolean/bopcut_complex/N9
index 0dda905aba..1c51a5990b 100644
--- a/tests/boolean/bopcut_complex/N9
+++ b/tests/boolean/bopcut_complex/N9
@@ -5,7 +5,7 @@ ttranslate c 0 0 2
 
 bfuse rr b c
 
-restore E1_rr_7.brep E1_rr_7
+restore [locate_data_file E1_rr_7.brep] E1_rr_7
 prism p1 E1_rr_7 0 -4 0
 
 explode rr so
diff --git a/tests/boolean/bopcut_complex/O1 b/tests/boolean/bopcut_complex/O1
index 2ef6531aa7..ace75d4d2c 100644
--- a/tests/boolean/bopcut_complex/O1
+++ b/tests/boolean/bopcut_complex/O1
@@ -5,7 +5,7 @@ ttranslate c 0 0 2
 
 bfuse rr b c
 
-restore E1_rr_7.brep E1_rr_7
+restore [locate_data_file E1_rr_7.brep] E1_rr_7
 prism p1 E1_rr_7 0 4 0
 
 explode rr so
diff --git a/tests/boolean/bopcut_complex/O2 b/tests/boolean/bopcut_complex/O2
index b12b4d8ef5..dfda9941dd 100644
--- a/tests/boolean/bopcut_complex/O2
+++ b/tests/boolean/bopcut_complex/O2
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh2a b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh2a] b2
 
 bop b1 b2
 bopcut result
diff --git a/tests/boolean/bopcut_complex/O3 b/tests/boolean/bopcut_complex/O3
index 82f55338e0..74c8140c23 100644
--- a/tests/boolean/bopcut_complex/O3
+++ b/tests/boolean/bopcut_complex/O3
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh3 b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh3] b2
 
 bop b1 b2
 bopcut result
diff --git a/tests/boolean/bopcut_complex/O4 b/tests/boolean/bopcut_complex/O4
index 3357f8d6b5..5a5cdfc256 100644
--- a/tests/boolean/bopcut_complex/O4
+++ b/tests/boolean/bopcut_complex/O4
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh4 b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh4] b2
 
 bop b1 b2
 bopcut result
diff --git a/tests/boolean/bopcut_complex/O5 b/tests/boolean/bopcut_complex/O5
index 096ebee7e9..a182e935d4 100644
--- a/tests/boolean/bopcut_complex/O5
+++ b/tests/boolean/bopcut_complex/O5
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh7 b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh7] b2
 
 bop b1 b2
 bopcut result
diff --git a/tests/boolean/bopcut_complex/O6 b/tests/boolean/bopcut_complex/O6
index 0a86cd9fd4..c8f798c301 100644
--- a/tests/boolean/bopcut_complex/O6
+++ b/tests/boolean/bopcut_complex/O6
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh8 b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh8] b2
 
 bop b1 b2
 bopcut result
diff --git a/tests/boolean/bopcut_complex/O7 b/tests/boolean/bopcut_complex/O7
index 1c6c1cb200..41829f2c55 100644
--- a/tests/boolean/bopcut_complex/O7
+++ b/tests/boolean/bopcut_complex/O7
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh9 b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh9] b2
 
 bop b1 b2
 bopcut result
diff --git a/tests/boolean/bopcut_complex/O8 b/tests/boolean/bopcut_complex/O8
index 61a4e350ba..a849b0cd3a 100644
--- a/tests/boolean/bopcut_complex/O8
+++ b/tests/boolean/bopcut_complex/O8
@@ -1,5 +1,5 @@
-restore sh10 b1
-restore shx b2
+restore [locate_data_file sh10] b1
+restore [locate_data_file shx] b2
 
 bop b1 b2
 bopcut result
diff --git a/tests/boolean/bopcut_complex/O9 b/tests/boolean/bopcut_complex/O9
index 63d8119817..7e0af5de46 100644
--- a/tests/boolean/bopcut_complex/O9
+++ b/tests/boolean/bopcut_complex/O9
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh5 b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh5] b2
 
 bop b1 b2
 bopcut result
diff --git a/tests/boolean/bopcut_complex/P1 b/tests/boolean/bopcut_complex/P1
index 633ab60aed..3b43b0db12 100644
--- a/tests/boolean/bopcut_complex/P1
+++ b/tests/boolean/bopcut_complex/P1
@@ -1,5 +1,5 @@
-restore g1 b1
-restore g2 b2
+restore [locate_data_file g1] b1
+restore [locate_data_file g2] b2
 
 bop b1 b2
 bopcut result
diff --git a/tests/boolean/bopcut_complex/P2 b/tests/boolean/bopcut_complex/P2
index 8ce98a6113..3630ac3a23 100644
--- a/tests/boolean/bopcut_complex/P2
+++ b/tests/boolean/bopcut_complex/P2
@@ -1,5 +1,5 @@
-restore sg1 b1
-restore sg2 b2
+restore [locate_data_file sg1] b1
+restore [locate_data_file sg2] b2
 
 bop b1 b2
 bopcut result
diff --git a/tests/boolean/bopcut_complex/P3 b/tests/boolean/bopcut_complex/P3
index 3e3631d01a..74a2adbb96 100644
--- a/tests/boolean/bopcut_complex/P3
+++ b/tests/boolean/bopcut_complex/P3
@@ -1,5 +1,5 @@
-restore sf4 b1
-restore sf5 b2
+restore [locate_data_file sf4] b1
+restore [locate_data_file sf5] b2
 
 bop b1 b2
 bopcut result
diff --git a/tests/boolean/bopcut_complex/P4 b/tests/boolean/bopcut_complex/P4
index fc717eca80..a49a51e927 100644
--- a/tests/boolean/bopcut_complex/P4
+++ b/tests/boolean/bopcut_complex/P4
@@ -1,5 +1,5 @@
-restore sf5 b1
-restore sf3 b2
+restore [locate_data_file sf5] b1
+restore [locate_data_file sf3] b2
 
 bop b1 b2
 bopcut result
diff --git a/tests/boolean/bopcut_complex/P5 b/tests/boolean/bopcut_complex/P5
index fd640ce11e..cd070f933f 100644
--- a/tests/boolean/bopcut_complex/P5
+++ b/tests/boolean/bopcut_complex/P5
@@ -1,5 +1,5 @@
-restore sf5 b1
-restore sf55 b2
+restore [locate_data_file sf5] b1
+restore [locate_data_file sf55] b2
 
 bop b1 b2
 bopcut result
diff --git a/tests/boolean/bopfuse_2d/A1 b/tests/boolean/bopfuse_2d/A1
index d37bde6fff..4c2b980fc0 100644
--- a/tests/boolean/bopfuse_2d/A1
+++ b/tests/boolean/bopfuse_2d/A1
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_edge1.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_edge1.brep] b
 bop a b
 bopfuse result
 set length 635.826
diff --git a/tests/boolean/bopfuse_2d/A2 b/tests/boolean/bopfuse_2d/A2
index c6a3502c8d..f715bad21a 100644
--- a/tests/boolean/bopfuse_2d/A2
+++ b/tests/boolean/bopfuse_2d/A2
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_wire1.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_wire1.brep] b
 bop a b
 bopfuse result
 set length 739.311
diff --git a/tests/boolean/bopfuse_2d/A3 b/tests/boolean/bopfuse_2d/A3
index 67e5a95e80..e87725cb01 100644
--- a/tests/boolean/bopfuse_2d/A3
+++ b/tests/boolean/bopfuse_2d/A3
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_wire2.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_wire2.brep] b
 bop a b
 bopfuse result
 set length 739.311
diff --git a/tests/boolean/bopfuse_2d/A4 b/tests/boolean/bopfuse_2d/A4
index c1a3fba660..0e314f0bf8 100644
--- a/tests/boolean/bopfuse_2d/A4
+++ b/tests/boolean/bopfuse_2d/A4
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_wire5.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_wire5.brep] b
 bop a b
 bopfuse result
 set length 862.192
diff --git a/tests/boolean/bopfuse_2d/A5 b/tests/boolean/bopfuse_2d/A5
index 62bc80c610..c9fe93fedd 100644
--- a/tests/boolean/bopfuse_2d/A5
+++ b/tests/boolean/bopfuse_2d/A5
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge1.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge1.brep] b
 bop a b
 bopfuse result
 set length 1045.95
diff --git a/tests/boolean/bopfuse_2d/A6 b/tests/boolean/bopfuse_2d/A6
index e005ea6898..209d89f633 100644
--- a/tests/boolean/bopfuse_2d/A6
+++ b/tests/boolean/bopfuse_2d/A6
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge2.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge2.brep] b
 bop a b
 bopfuse result
 set length 1157.7
diff --git a/tests/boolean/bopfuse_2d/A7 b/tests/boolean/bopfuse_2d/A7
index e7bf3e66e5..e2e2e2b78a 100644
--- a/tests/boolean/bopfuse_2d/A7
+++ b/tests/boolean/bopfuse_2d/A7
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge3.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge3.brep] b
 bop a b
 bopfuse result
 set length 1252.16
diff --git a/tests/boolean/bopfuse_2d/A8 b/tests/boolean/bopfuse_2d/A8
index 6762f1624d..748b784b4d 100644
--- a/tests/boolean/bopfuse_2d/A8
+++ b/tests/boolean/bopfuse_2d/A8
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge4.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge4.brep] b
 bop a b
 bopfuse result
 set length 1127.57
diff --git a/tests/boolean/bopfuse_2d/A9 b/tests/boolean/bopfuse_2d/A9
index 4f973b89f3..783446ce23 100644
--- a/tests/boolean/bopfuse_2d/A9
+++ b/tests/boolean/bopfuse_2d/A9
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge5.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge5.brep] b
 bop a b
 bopfuse result
 set length 1316.05
diff --git a/tests/boolean/bopfuse_2d/B1 b/tests/boolean/bopfuse_2d/B1
index 1ba6504d56..71bf6121c7 100644
--- a/tests/boolean/bopfuse_2d/B1
+++ b/tests/boolean/bopfuse_2d/B1
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_wire1.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_wire1.brep] b
 bop a b
 bopfuse result
 set length 1809.78
diff --git a/tests/boolean/bopfuse_2d/B2 b/tests/boolean/bopfuse_2d/B2
index 83ac987843..b9e8aaed03 100644
--- a/tests/boolean/bopfuse_2d/B2
+++ b/tests/boolean/bopfuse_2d/B2
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_wire2.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_wire2.brep] b
 bop a b
 bopfuse result
 set length 1982.81
diff --git a/tests/boolean/bopfuse_2d/B3 b/tests/boolean/bopfuse_2d/B3
index e8742ca430..f4e0b3383a 100644
--- a/tests/boolean/bopfuse_2d/B3
+++ b/tests/boolean/bopfuse_2d/B3
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_wire3.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_wire3.brep] b
 bop a b
 bopfuse result
 set length 2046.69
diff --git a/tests/boolean/bopfuse_2d/B4 b/tests/boolean/bopfuse_2d/B4
index ba9ba7a221..a102957b14 100644
--- a/tests/boolean/bopfuse_2d/B4
+++ b/tests/boolean/bopfuse_2d/B4
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge1.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge1.brep] b
 bop a b
 bopfuse result
 set length 613.678
diff --git a/tests/boolean/bopfuse_2d/B5 b/tests/boolean/bopfuse_2d/B5
index 9c26514784..bd77f92dcf 100644
--- a/tests/boolean/bopfuse_2d/B5
+++ b/tests/boolean/bopfuse_2d/B5
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge2.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge2.brep] b
 bop a b
 bopfuse result
 set length 725.427
diff --git a/tests/boolean/bopfuse_2d/B6 b/tests/boolean/bopfuse_2d/B6
index d7c0e6855c..03050cb740 100644
--- a/tests/boolean/bopfuse_2d/B6
+++ b/tests/boolean/bopfuse_2d/B6
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge3.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge3.brep] b
 bop a b
 bopfuse result
 set length 963.678
diff --git a/tests/boolean/bopfuse_2d/B7 b/tests/boolean/bopfuse_2d/B7
index 656cc31a24..aea9f31e0b 100644
--- a/tests/boolean/bopfuse_2d/B7
+++ b/tests/boolean/bopfuse_2d/B7
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge4.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge4.brep] b
 bop a b
 bopfuse result
 set length 695.295
diff --git a/tests/boolean/bopfuse_2d/B8 b/tests/boolean/bopfuse_2d/B8
index 7916688d30..9b9b30544a 100644
--- a/tests/boolean/bopfuse_2d/B8
+++ b/tests/boolean/bopfuse_2d/B8
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge5.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge5.brep] b
 bop a b
 bopfuse result
 set length 963.678
diff --git a/tests/boolean/bopfuse_2d/B9 b/tests/boolean/bopfuse_2d/B9
index 537a3aacc7..9902578f82 100644
--- a/tests/boolean/bopfuse_2d/B9
+++ b/tests/boolean/bopfuse_2d/B9
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_wire1.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_wire1.brep] b
 bop a b
 bopfuse result
 set length 1377.51
diff --git a/tests/boolean/bopfuse_2d/C1 b/tests/boolean/bopfuse_2d/C1
index 3232b816c5..8cbe4c023a 100644
--- a/tests/boolean/bopfuse_2d/C1
+++ b/tests/boolean/bopfuse_2d/C1
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_wire2.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_wire2.brep] b
 bop a b
 bopfuse result
 set length 1694.32
diff --git a/tests/boolean/bopfuse_2d/C2 b/tests/boolean/bopfuse_2d/C2
index ff283b238e..12d5f14d8c 100644
--- a/tests/boolean/bopfuse_2d/C2
+++ b/tests/boolean/bopfuse_2d/C2
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_wire3.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_wire3.brep] b
 bop a b
 bopfuse result
 set length 1694.32
diff --git a/tests/boolean/bopfuse_2d/C3 b/tests/boolean/bopfuse_2d/C3
index aa40001d95..7ec53b6818 100644
--- a/tests/boolean/bopfuse_2d/C3
+++ b/tests/boolean/bopfuse_2d/C3
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge1.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge1.brep] b
 bop a b
 bopfuse result
 set length 613.678
diff --git a/tests/boolean/bopfuse_2d/C4 b/tests/boolean/bopfuse_2d/C4
index 0f6e74749a..882cfcde0a 100644
--- a/tests/boolean/bopfuse_2d/C4
+++ b/tests/boolean/bopfuse_2d/C4
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge2.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge2.brep] b
 bop a b
 bopfuse result
 set length 725.427
diff --git a/tests/boolean/bopfuse_2d/C5 b/tests/boolean/bopfuse_2d/C5
index 54c4516ca5..ee470cca4c 100644
--- a/tests/boolean/bopfuse_2d/C5
+++ b/tests/boolean/bopfuse_2d/C5
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge3.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge3.brep] b
 bop a b
 bopfuse result
 set length 963.678
diff --git a/tests/boolean/bopfuse_2d/C6 b/tests/boolean/bopfuse_2d/C6
index da047603a0..e591fbff23 100644
--- a/tests/boolean/bopfuse_2d/C6
+++ b/tests/boolean/bopfuse_2d/C6
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge4.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge4.brep] b
 bop a b
 bopfuse result
 set length 695.295
diff --git a/tests/boolean/bopfuse_2d/C7 b/tests/boolean/bopfuse_2d/C7
index 28f72d67f0..13662cf319 100644
--- a/tests/boolean/bopfuse_2d/C7
+++ b/tests/boolean/bopfuse_2d/C7
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge5.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge5.brep] b
 bop a b
 bopfuse result
 set length 963.678
diff --git a/tests/boolean/bopfuse_2d/C8 b/tests/boolean/bopfuse_2d/C8
index be15c065af..f87502bcce 100644
--- a/tests/boolean/bopfuse_2d/C8
+++ b/tests/boolean/bopfuse_2d/C8
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_wire1.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_wire1.brep] b
 bop a b
 bopfuse result
 set length 1377.51
diff --git a/tests/boolean/bopfuse_2d/C9 b/tests/boolean/bopfuse_2d/C9
index a289eaed80..02c65a5127 100644
--- a/tests/boolean/bopfuse_2d/C9
+++ b/tests/boolean/bopfuse_2d/C9
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_wire2.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_wire2.brep] b
 bop a b
 bopfuse result
 set length 1694.32
diff --git a/tests/boolean/bopfuse_2d/D1 b/tests/boolean/bopfuse_2d/D1
index fec2657f5b..1a4ceb5c09 100644
--- a/tests/boolean/bopfuse_2d/D1
+++ b/tests/boolean/bopfuse_2d/D1
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_wire3.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_wire3.brep] b
 bop a b
 bopfuse result
 set length 1694.32
diff --git a/tests/boolean/bopfuse_complex/A1 b/tests/boolean/bopfuse_complex/A1
index b4e3b94711..b8d1dc36dd 100644
--- a/tests/boolean/bopfuse_complex/A1
+++ b/tests/boolean/bopfuse_complex/A1
@@ -3,8 +3,8 @@ puts "FUSE of OCC118-1.brep and  OCC118-2.brep"
 puts "Case is duplicate of chl 918 A2, bug OCC118 "
 puts "================================="
 
-restore OCC118-1.brep a
-restore OCC118-2.brep b
+restore [locate_data_file OCC118-1.brep] a
+restore [locate_data_file OCC118-2.brep] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/A2 b/tests/boolean/bopfuse_complex/A2
index 12262933c8..af81b253d3 100644
--- a/tests/boolean/bopfuse_complex/A2
+++ b/tests/boolean/bopfuse_complex/A2
@@ -3,8 +3,8 @@ puts "FUSE of OCC118-2.brep and  OCC118-1.brep"
 puts "Case is duplicate of chl 918 A3, bug OCC118 "
 puts "================================"
 
-restore OCC118-1.brep a
-restore OCC118-2.brep b
+restore [locate_data_file OCC118-1.brep] a
+restore [locate_data_file OCC118-2.brep] b
 
 bop b a
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/A3 b/tests/boolean/bopfuse_complex/A3
index 7a7a88d819..d6351b2265 100644
--- a/tests/boolean/bopfuse_complex/A3
+++ b/tests/boolean/bopfuse_complex/A3
@@ -3,8 +3,8 @@ puts "FUSE of OCC213-1.brep and  OCC213-2.brep"
 puts "Case is duplicate of chl 918 A6, bug OCC213 "
 puts "================================="
 
-restore OCC213-1.brep a
-restore OCC213-2.brep b
+restore [locate_data_file OCC213-1.brep] a
+restore [locate_data_file OCC213-2.brep] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/A4 b/tests/boolean/bopfuse_complex/A4
index a1186e1fe4..62c20ef0a2 100644
--- a/tests/boolean/bopfuse_complex/A4
+++ b/tests/boolean/bopfuse_complex/A4
@@ -3,8 +3,8 @@ puts "FUSE of OCC213-2.brep and  OCC213-1.brep"
 puts "Case is duplicate of chl 918 A7, bug OCC213 "
 puts "================================="
 
-restore OCC213-1.brep a
-restore OCC213-2.brep b
+restore [locate_data_file OCC213-1.brep] a
+restore [locate_data_file OCC213-2.brep] b
 
 bop b a
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/A5 b/tests/boolean/bopfuse_complex/A5
index 751ab36de1..e30e555645 100644
--- a/tests/boolean/bopfuse_complex/A5
+++ b/tests/boolean/bopfuse_complex/A5
@@ -1,5 +1,5 @@
-restore OCC3-1.brep a
-restore OCC3-2.brep b
+restore [locate_data_file OCC3-1.brep] a
+restore [locate_data_file OCC3-2.brep] b
 
 bop  a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/A6 b/tests/boolean/bopfuse_complex/A6
index bb97604549..2264bb94b1 100644
--- a/tests/boolean/bopfuse_complex/A6
+++ b/tests/boolean/bopfuse_complex/A6
@@ -1,5 +1,5 @@
-restore OCC3-1.brep a
-restore OCC3-2.brep b
+restore [locate_data_file OCC3-1.brep] a
+restore [locate_data_file OCC3-2.brep] b
 
 bop  b a
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/A7 b/tests/boolean/bopfuse_complex/A7
index 71600d2a7a..62ef9948e6 100644
--- a/tests/boolean/bopfuse_complex/A7
+++ b/tests/boolean/bopfuse_complex/A7
@@ -1,4 +1,4 @@
-restore OCC37.brep sh
+restore [locate_data_file OCC37.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopfuse_complex/A8 b/tests/boolean/bopfuse_complex/A8
index c913d63999..5e54bacd5e 100644
--- a/tests/boolean/bopfuse_complex/A8
+++ b/tests/boolean/bopfuse_complex/A8
@@ -1,4 +1,4 @@
-restore OCC37.brep sh
+restore [locate_data_file OCC37.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopfuse_complex/A9 b/tests/boolean/bopfuse_complex/A9
index f01110f6a9..09bbcc32b5 100644
--- a/tests/boolean/bopfuse_complex/A9
+++ b/tests/boolean/bopfuse_complex/A9
@@ -1,4 +1,4 @@
-restore BUC60975.brep sh
+restore [locate_data_file BUC60975.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopfuse_complex/B1 b/tests/boolean/bopfuse_complex/B1
index 104f524804..25999cb099 100644
--- a/tests/boolean/bopfuse_complex/B1
+++ b/tests/boolean/bopfuse_complex/B1
@@ -1,4 +1,4 @@
-restore BUC60975.brep sh
+restore [locate_data_file BUC60975.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopfuse_complex/B2 b/tests/boolean/bopfuse_complex/B2
index 48e3251334..649eff4799 100644
--- a/tests/boolean/bopfuse_complex/B2
+++ b/tests/boolean/bopfuse_complex/B2
@@ -1,4 +1,4 @@
-restore OCC68.brep sh
+restore [locate_data_file OCC68.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopfuse_complex/B3 b/tests/boolean/bopfuse_complex/B3
index 591cb99e32..603adccc30 100644
--- a/tests/boolean/bopfuse_complex/B3
+++ b/tests/boolean/bopfuse_complex/B3
@@ -1,4 +1,4 @@
-restore OCC68.brep sh
+restore [locate_data_file OCC68.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopfuse_complex/B4 b/tests/boolean/bopfuse_complex/B4
index c59935a115..f130a73a44 100644
--- a/tests/boolean/bopfuse_complex/B4
+++ b/tests/boolean/bopfuse_complex/B4
@@ -1,7 +1,7 @@
 puts "TODO #22911 ALL: Error : The bopfuse can not be build"
 
-restore OCC100_sp.brep a
-restore OCC100_cyl.brep b
+restore [locate_data_file OCC100_sp.brep] a
+restore [locate_data_file OCC100_cyl.brep] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/B5 b/tests/boolean/bopfuse_complex/B5
index 067809332f..3ce848ee90 100644
--- a/tests/boolean/bopfuse_complex/B5
+++ b/tests/boolean/bopfuse_complex/B5
@@ -1,7 +1,7 @@
 puts "TODO #22911 ALL: Error : The bopfuse can not be build"
 
-restore OCC100_sp.brep a
-restore OCC100_cyl.brep b
+restore [locate_data_file OCC100_sp.brep] a
+restore [locate_data_file OCC100_cyl.brep] b
 
 bop b a
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/B6 b/tests/boolean/bopfuse_complex/B6
index 15f46b4bf6..b9a2bf460a 100644
--- a/tests/boolean/bopfuse_complex/B6
+++ b/tests/boolean/bopfuse_complex/B6
@@ -1,4 +1,4 @@
-restore OCC117.brep sh
+restore [locate_data_file OCC117.brep] sh
 explode sh
 
 bop  sh_1 sh_2
diff --git a/tests/boolean/bopfuse_complex/B7 b/tests/boolean/bopfuse_complex/B7
index 495ae61e1c..7fc38a71db 100644
--- a/tests/boolean/bopfuse_complex/B7
+++ b/tests/boolean/bopfuse_complex/B7
@@ -1,4 +1,4 @@
-restore OCC117.brep sh
+restore [locate_data_file OCC117.brep] sh
 explode sh
 
 bop  sh_2 sh_1
diff --git a/tests/boolean/bopfuse_complex/B8 b/tests/boolean/bopfuse_complex/B8
index b704d88f3d..d34b5732e8 100644
--- a/tests/boolean/bopfuse_complex/B8
+++ b/tests/boolean/bopfuse_complex/B8
@@ -1,4 +1,4 @@
-restore OCC122.brep sh
+restore [locate_data_file OCC122.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopfuse_complex/B9 b/tests/boolean/bopfuse_complex/B9
index d835549d20..f231cf7c72 100644
--- a/tests/boolean/bopfuse_complex/B9
+++ b/tests/boolean/bopfuse_complex/B9
@@ -1,4 +1,4 @@
-restore OCC122.brep sh
+restore [locate_data_file OCC122.brep] sh
 explode sh
 
 bop  sh_2 sh_1
diff --git a/tests/boolean/bopfuse_complex/C1 b/tests/boolean/bopfuse_complex/C1
index b6c5b26e4f..8313726c82 100644
--- a/tests/boolean/bopfuse_complex/C1
+++ b/tests/boolean/bopfuse_complex/C1
@@ -1,4 +1,4 @@
-restore OCC123.brep sh
+restore [locate_data_file OCC123.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopfuse_complex/C2 b/tests/boolean/bopfuse_complex/C2
index 2cfdd5cbd7..f55d37a766 100644
--- a/tests/boolean/bopfuse_complex/C2
+++ b/tests/boolean/bopfuse_complex/C2
@@ -1,4 +1,4 @@
-restore OCC123.brep sh
+restore [locate_data_file OCC123.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopfuse_complex/C3 b/tests/boolean/bopfuse_complex/C3
index 934268e5bd..ebd9a8e316 100644
--- a/tests/boolean/bopfuse_complex/C3
+++ b/tests/boolean/bopfuse_complex/C3
@@ -1,5 +1,5 @@
 cpulimit 3600
-restore BUC60938.brep sh
+restore [locate_data_file BUC60938.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopfuse_complex/C4 b/tests/boolean/bopfuse_complex/C4
index 11bb6efd97..f0368b2091 100644
--- a/tests/boolean/bopfuse_complex/C4
+++ b/tests/boolean/bopfuse_complex/C4
@@ -1,5 +1,5 @@
 cpulimit 3600
-restore BUC60938.brep sh
+restore [locate_data_file BUC60938.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopfuse_complex/C5 b/tests/boolean/bopfuse_complex/C5
index 7e3ee26aa8..b01efa7fd9 100644
--- a/tests/boolean/bopfuse_complex/C5
+++ b/tests/boolean/bopfuse_complex/C5
@@ -1,5 +1,5 @@
 cpulimit 3600
-restore BUC60937.brep sh
+restore [locate_data_file BUC60937.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopfuse_complex/C6 b/tests/boolean/bopfuse_complex/C6
index 68172076ce..747600de0d 100644
--- a/tests/boolean/bopfuse_complex/C6
+++ b/tests/boolean/bopfuse_complex/C6
@@ -1,5 +1,5 @@
 cpulimit 3600
-restore BUC60937.brep sh
+restore [locate_data_file BUC60937.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopfuse_complex/C7 b/tests/boolean/bopfuse_complex/C7
index 635b26ceb9..e1dc8061fa 100644
--- a/tests/boolean/bopfuse_complex/C7
+++ b/tests/boolean/bopfuse_complex/C7
@@ -1,5 +1,5 @@
 cpulimit 3600
-restore BUC60936.brep sh
+restore [locate_data_file BUC60936.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopfuse_complex/C8 b/tests/boolean/bopfuse_complex/C8
index 92f0bdbff4..829c7ca88e 100644
--- a/tests/boolean/bopfuse_complex/C8
+++ b/tests/boolean/bopfuse_complex/C8
@@ -1,5 +1,5 @@
 cpulimit 3600
-restore BUC60936.brep sh
+restore [locate_data_file BUC60936.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopfuse_complex/C9 b/tests/boolean/bopfuse_complex/C9
index 1d56cf166c..4091609275 100644
--- a/tests/boolean/bopfuse_complex/C9
+++ b/tests/boolean/bopfuse_complex/C9
@@ -1,6 +1,6 @@
 puts "TODO #22911 ALL: Error : The bopfuse can not be build"
 
-restore OCC228.brep sh
+restore [locate_data_file OCC228.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopfuse_complex/D1 b/tests/boolean/bopfuse_complex/D1
index 0e9c9bc0eb..625c4cb73c 100644
--- a/tests/boolean/bopfuse_complex/D1
+++ b/tests/boolean/bopfuse_complex/D1
@@ -1,6 +1,6 @@
 puts "TODO #22911 ALL: Error : The bopfuse can not be build"
 
-restore OCC228.brep sh
+restore [locate_data_file OCC228.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopfuse_complex/D2 b/tests/boolean/bopfuse_complex/D2
index e950dde58d..21f7b6b8e7 100644
--- a/tests/boolean/bopfuse_complex/D2
+++ b/tests/boolean/bopfuse_complex/D2
@@ -1,5 +1,5 @@
-restore OCC315-1.brep a
-restore OCC315-2.brep b
+restore [locate_data_file OCC315-1.brep] a
+restore [locate_data_file OCC315-2.brep] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/D3 b/tests/boolean/bopfuse_complex/D3
index 6240a4a306..f1f64e8042 100644
--- a/tests/boolean/bopfuse_complex/D3
+++ b/tests/boolean/bopfuse_complex/D3
@@ -1,5 +1,5 @@
-restore OCC315-1.brep a
-restore OCC315-2.brep b
+restore [locate_data_file OCC315-1.brep] a
+restore [locate_data_file OCC315-2.brep] b
 
 bop b a
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/D4 b/tests/boolean/bopfuse_complex/D4
index a6105b0a19..78d145a81f 100644
--- a/tests/boolean/bopfuse_complex/D4
+++ b/tests/boolean/bopfuse_complex/D4
@@ -1,6 +1,6 @@
 puts "TODO #22911 ALL: Error : The bopfuse can not be build"
 
-restore BUC60928.brep sh
+restore [locate_data_file BUC60928.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopfuse_complex/D5 b/tests/boolean/bopfuse_complex/D5
index b25fff65d7..f04a0effdb 100644
--- a/tests/boolean/bopfuse_complex/D5
+++ b/tests/boolean/bopfuse_complex/D5
@@ -1,6 +1,6 @@
 puts "TODO #22911 ALL: Error : The bopfuse can not be build"
 
-restore BUC60928.brep sh
+restore [locate_data_file BUC60928.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopfuse_complex/D6 b/tests/boolean/bopfuse_complex/D6
index 6d5531646d..c280dab3dd 100644
--- a/tests/boolean/bopfuse_complex/D6
+++ b/tests/boolean/bopfuse_complex/D6
@@ -1,6 +1,6 @@
 puts "TODO #22911 ALL: Error : The bopfuse can not be build"
 
-restore BUC60931.brep sh
+restore [locate_data_file BUC60931.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopfuse_complex/D7 b/tests/boolean/bopfuse_complex/D7
index 5dba147f89..9b9a97d399 100644
--- a/tests/boolean/bopfuse_complex/D7
+++ b/tests/boolean/bopfuse_complex/D7
@@ -1,6 +1,6 @@
 puts "TODO #22911 ALL: Error : The bopfuse can not be build"
 
-restore BUC60931.brep sh
+restore [locate_data_file BUC60931.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopfuse_complex/D8 b/tests/boolean/bopfuse_complex/D8
index 96028e64cc..5319d1945d 100644
--- a/tests/boolean/bopfuse_complex/D8
+++ b/tests/boolean/bopfuse_complex/D8
@@ -1,4 +1,4 @@
-restore BUC60939.brep sh
+restore [locate_data_file BUC60939.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopfuse_complex/D9 b/tests/boolean/bopfuse_complex/D9
index 3b17490e70..21915f2560 100644
--- a/tests/boolean/bopfuse_complex/D9
+++ b/tests/boolean/bopfuse_complex/D9
@@ -1,4 +1,4 @@
-restore BUC60939.brep sh
+restore [locate_data_file BUC60939.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopfuse_complex/E1 b/tests/boolean/bopfuse_complex/E1
index 5714b40aea..5cbc776112 100644
--- a/tests/boolean/bopfuse_complex/E1
+++ b/tests/boolean/bopfuse_complex/E1
@@ -1,4 +1,4 @@
-restore OCC337.brep sh
+restore [locate_data_file OCC337.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopfuse_complex/E2 b/tests/boolean/bopfuse_complex/E2
index 95685ce9bc..35b1ff4470 100644
--- a/tests/boolean/bopfuse_complex/E2
+++ b/tests/boolean/bopfuse_complex/E2
@@ -1,4 +1,4 @@
-restore OCC337.brep sh
+restore [locate_data_file OCC337.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopfuse_complex/E3 b/tests/boolean/bopfuse_complex/E3
index fe604d46b7..c7219982b3 100644
--- a/tests/boolean/bopfuse_complex/E3
+++ b/tests/boolean/bopfuse_complex/E3
@@ -1,4 +1,4 @@
-restore buc60996.brep sh
+restore [locate_data_file buc60996.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopfuse_complex/E4 b/tests/boolean/bopfuse_complex/E4
index 22719da23b..42500c1122 100644
--- a/tests/boolean/bopfuse_complex/E4
+++ b/tests/boolean/bopfuse_complex/E4
@@ -1,4 +1,4 @@
-restore buc60996.brep sh
+restore [locate_data_file buc60996.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopfuse_complex/E5 b/tests/boolean/bopfuse_complex/E5
index b87d0e2266..a4dc4b76b6 100644
--- a/tests/boolean/bopfuse_complex/E5
+++ b/tests/boolean/bopfuse_complex/E5
@@ -1,4 +1,4 @@
-restore OCC62.brep sh
+restore [locate_data_file OCC62.brep] sh
 explode sh
 
 bop sh_1 sh_3
diff --git a/tests/boolean/bopfuse_complex/E6 b/tests/boolean/bopfuse_complex/E6
index 25cd0165d6..12601e3783 100644
--- a/tests/boolean/bopfuse_complex/E6
+++ b/tests/boolean/bopfuse_complex/E6
@@ -1,4 +1,4 @@
-restore BUC60974.brep sh
+restore [locate_data_file BUC60974.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/bopfuse_complex/E7 b/tests/boolean/bopfuse_complex/E7
index 5c27e738d0..26d2c2f8dd 100644
--- a/tests/boolean/bopfuse_complex/E7
+++ b/tests/boolean/bopfuse_complex/E7
@@ -1,4 +1,4 @@
-restore BUC60974.brep sh
+restore [locate_data_file BUC60974.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/bopfuse_complex/E8 b/tests/boolean/bopfuse_complex/E8
index 41a66d8520..eb783a6aa9 100644
--- a/tests/boolean/bopfuse_complex/E8
+++ b/tests/boolean/bopfuse_complex/E8
@@ -1,5 +1,5 @@
-restore a57 a
-restore b57 b
+restore [locate_data_file a57] a
+restore [locate_data_file b57] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/E9 b/tests/boolean/bopfuse_complex/E9
index f1f0071511..328bc5e1f6 100644
--- a/tests/boolean/bopfuse_complex/E9
+++ b/tests/boolean/bopfuse_complex/E9
@@ -1,5 +1,5 @@
-restore a58 a
-restore b58 b
+restore [locate_data_file a58] a
+restore [locate_data_file b58] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/F1 b/tests/boolean/bopfuse_complex/F1
index 6c7c9100b6..f6832a774d 100644
--- a/tests/boolean/bopfuse_complex/F1
+++ b/tests/boolean/bopfuse_complex/F1
@@ -1,5 +1,5 @@
-restore a58 a
-restore b60 b
+restore [locate_data_file a58] a
+restore [locate_data_file b60] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/F2 b/tests/boolean/bopfuse_complex/F2
index 6baab3c78d..4cdddbf912 100644
--- a/tests/boolean/bopfuse_complex/F2
+++ b/tests/boolean/bopfuse_complex/F2
@@ -1,5 +1,5 @@
-restore a58 a
-restore b62 b
+restore [locate_data_file a58] a
+restore [locate_data_file b62] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/F3 b/tests/boolean/bopfuse_complex/F3
index 5837a7e510..78af5e7b89 100644
--- a/tests/boolean/bopfuse_complex/F3
+++ b/tests/boolean/bopfuse_complex/F3
@@ -1,5 +1,5 @@
-restore a58 a
-restore b64 b
+restore [locate_data_file a58] a
+restore [locate_data_file b64] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/F4 b/tests/boolean/bopfuse_complex/F4
index 677ce4dd59..69153fedc9 100644
--- a/tests/boolean/bopfuse_complex/F4
+++ b/tests/boolean/bopfuse_complex/F4
@@ -1,5 +1,5 @@
-restore a58 a
-restore b66 b
+restore [locate_data_file a58] a
+restore [locate_data_file b66] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/F5 b/tests/boolean/bopfuse_complex/F5
index 007b9fa7a2..0adb9f0df2 100644
--- a/tests/boolean/bopfuse_complex/F5
+++ b/tests/boolean/bopfuse_complex/F5
@@ -1,5 +1,5 @@
-restore a90 a
-restore b90 b
+restore [locate_data_file a90] a
+restore [locate_data_file b90] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/F6 b/tests/boolean/bopfuse_complex/F6
index 1d590238d1..8fb87dc85d 100644
--- a/tests/boolean/bopfuse_complex/F6
+++ b/tests/boolean/bopfuse_complex/F6
@@ -1,5 +1,5 @@
-restore a102 a
-restore b102 b
+restore [locate_data_file a102] a
+restore [locate_data_file b102] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/F7 b/tests/boolean/bopfuse_complex/F7
index bd795d8302..5e56a64608 100644
--- a/tests/boolean/bopfuse_complex/F7
+++ b/tests/boolean/bopfuse_complex/F7
@@ -1,5 +1,5 @@
-restore a104 a
-restore b104 b
+restore [locate_data_file a104] a
+restore [locate_data_file b104] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/F8 b/tests/boolean/bopfuse_complex/F8
index a75dbc36e6..db7a874dfa 100644
--- a/tests/boolean/bopfuse_complex/F8
+++ b/tests/boolean/bopfuse_complex/F8
@@ -1,5 +1,5 @@
-restore a108 a
-restore b108 b
+restore [locate_data_file a108] a
+restore [locate_data_file b108] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/F9 b/tests/boolean/bopfuse_complex/F9
index 844cf1348e..8f8db37e79 100644
--- a/tests/boolean/bopfuse_complex/F9
+++ b/tests/boolean/bopfuse_complex/F9
@@ -1,5 +1,5 @@
-restore a110 a
-restore b110 b
+restore [locate_data_file a110] a
+restore [locate_data_file b110] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/G1 b/tests/boolean/bopfuse_complex/G1
index 3a39b376c4..d1a76040a7 100644
--- a/tests/boolean/bopfuse_complex/G1
+++ b/tests/boolean/bopfuse_complex/G1
@@ -1,5 +1,5 @@
-restore a112 a
-restore b112 b
+restore [locate_data_file a112] a
+restore [locate_data_file b112] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/G2 b/tests/boolean/bopfuse_complex/G2
index e5c61585d2..9e96528ff5 100644
--- a/tests/boolean/bopfuse_complex/G2
+++ b/tests/boolean/bopfuse_complex/G2
@@ -1,5 +1,5 @@
-restore a114 a
-restore b114 b
+restore [locate_data_file a114] a
+restore [locate_data_file b114] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/G3 b/tests/boolean/bopfuse_complex/G3
index 1dac0891d0..37bb7c065a 100644
--- a/tests/boolean/bopfuse_complex/G3
+++ b/tests/boolean/bopfuse_complex/G3
@@ -1,5 +1,5 @@
-restore a116 a
-restore b116 b
+restore [locate_data_file a116] a
+restore [locate_data_file b116] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/G4 b/tests/boolean/bopfuse_complex/G4
index f86bb5f5b5..a57695f0e2 100644
--- a/tests/boolean/bopfuse_complex/G4
+++ b/tests/boolean/bopfuse_complex/G4
@@ -1,5 +1,5 @@
-restore a118 a
-restore b118 b
+restore [locate_data_file a118] a
+restore [locate_data_file b118] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/G5 b/tests/boolean/bopfuse_complex/G5
index 9824bd4a98..6820dcfe8d 100644
--- a/tests/boolean/bopfuse_complex/G5
+++ b/tests/boolean/bopfuse_complex/G5
@@ -1,5 +1,5 @@
-restore a124 a
-restore b124 b
+restore [locate_data_file a124] a
+restore [locate_data_file b124] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/G6 b/tests/boolean/bopfuse_complex/G6
index 642b9d909e..688b409590 100644
--- a/tests/boolean/bopfuse_complex/G6
+++ b/tests/boolean/bopfuse_complex/G6
@@ -1,5 +1,5 @@
-restore a126 a
-restore b126 b
+restore [locate_data_file a126] a
+restore [locate_data_file b126] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/G7 b/tests/boolean/bopfuse_complex/G7
index 44d19eb973..dad5c31b45 100644
--- a/tests/boolean/bopfuse_complex/G7
+++ b/tests/boolean/bopfuse_complex/G7
@@ -1,5 +1,5 @@
-restore a128 a
-restore b128 b
+restore [locate_data_file a128] a
+restore [locate_data_file b128] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/G8 b/tests/boolean/bopfuse_complex/G8
index bb8319c839..aa302c9647 100644
--- a/tests/boolean/bopfuse_complex/G8
+++ b/tests/boolean/bopfuse_complex/G8
@@ -1,5 +1,5 @@
-restore a130 a
-restore b130 b
+restore [locate_data_file a130] a
+restore [locate_data_file b130] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/G9 b/tests/boolean/bopfuse_complex/G9
index e29aaebb82..e7b5275b1b 100644
--- a/tests/boolean/bopfuse_complex/G9
+++ b/tests/boolean/bopfuse_complex/G9
@@ -1,5 +1,5 @@
-restore a132 a
-restore b132 b
+restore [locate_data_file a132] a
+restore [locate_data_file b132] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/H1 b/tests/boolean/bopfuse_complex/H1
index 120d2f391c..168e0ab3e2 100644
--- a/tests/boolean/bopfuse_complex/H1
+++ b/tests/boolean/bopfuse_complex/H1
@@ -1,8 +1,8 @@
 puts "TODO #22911 ALL: Faulty shapes in variables faulty_1 to faulty_2"
 puts "TODO #22911 ALL: Error : The square of result shape is"
 
-restore a136 a
-restore b136 b
+restore [locate_data_file a136] a
+restore [locate_data_file b136] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/H2 b/tests/boolean/bopfuse_complex/H2
index b820626f39..72b94a79f1 100644
--- a/tests/boolean/bopfuse_complex/H2
+++ b/tests/boolean/bopfuse_complex/H2
@@ -1,5 +1,5 @@
-restore a138 a
-restore b138 b
+restore [locate_data_file a138] a
+restore [locate_data_file b138] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/H3 b/tests/boolean/bopfuse_complex/H3
index 85748670d1..9cdcb22850 100644
--- a/tests/boolean/bopfuse_complex/H3
+++ b/tests/boolean/bopfuse_complex/H3
@@ -1,5 +1,5 @@
-restore a140 a
-restore b140 b
+restore [locate_data_file a140] a
+restore [locate_data_file b140] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/H4 b/tests/boolean/bopfuse_complex/H4
index 7e3c49ecd4..f5b118737a 100644
--- a/tests/boolean/bopfuse_complex/H4
+++ b/tests/boolean/bopfuse_complex/H4
@@ -1,5 +1,5 @@
-restore a142 a
-restore b142 b
+restore [locate_data_file a142] a
+restore [locate_data_file b142] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/H5 b/tests/boolean/bopfuse_complex/H5
index b64a433593..f52997b6a8 100644
--- a/tests/boolean/bopfuse_complex/H5
+++ b/tests/boolean/bopfuse_complex/H5
@@ -1,5 +1,5 @@
-restore a144 a
-restore b144 b
+restore [locate_data_file a144] a
+restore [locate_data_file b144] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/H6 b/tests/boolean/bopfuse_complex/H6
index 8997ed493d..841fa80703 100644
--- a/tests/boolean/bopfuse_complex/H6
+++ b/tests/boolean/bopfuse_complex/H6
@@ -1,5 +1,5 @@
-restore a146 a
-restore b146 b
+restore [locate_data_file a146] a
+restore [locate_data_file b146] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/H7 b/tests/boolean/bopfuse_complex/H7
index a1759e0ea6..2547beb4e2 100644
--- a/tests/boolean/bopfuse_complex/H7
+++ b/tests/boolean/bopfuse_complex/H7
@@ -1,5 +1,5 @@
-restore a148 a
-restore b148 b
+restore [locate_data_file a148] a
+restore [locate_data_file b148] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/H8 b/tests/boolean/bopfuse_complex/H8
index ffba056bdc..6096fcdfc9 100644
--- a/tests/boolean/bopfuse_complex/H8
+++ b/tests/boolean/bopfuse_complex/H8
@@ -1,5 +1,5 @@
-restore a150 a
-restore b150 b
+restore [locate_data_file a150] a
+restore [locate_data_file b150] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/H9 b/tests/boolean/bopfuse_complex/H9
index 3ea7dadb94..8327e00f16 100644
--- a/tests/boolean/bopfuse_complex/H9
+++ b/tests/boolean/bopfuse_complex/H9
@@ -1,5 +1,5 @@
-restore a154 a
-restore b154 b
+restore [locate_data_file a154] a
+restore [locate_data_file b154] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/I1 b/tests/boolean/bopfuse_complex/I1
index c1647a717b..f36438a3a4 100644
--- a/tests/boolean/bopfuse_complex/I1
+++ b/tests/boolean/bopfuse_complex/I1
@@ -1,5 +1,5 @@
-restore a156 a
-restore b156 b
+restore [locate_data_file a156] a
+restore [locate_data_file b156] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/I2 b/tests/boolean/bopfuse_complex/I2
index cdf97fca8d..a071f330ea 100644
--- a/tests/boolean/bopfuse_complex/I2
+++ b/tests/boolean/bopfuse_complex/I2
@@ -1,5 +1,5 @@
-restore a157 a
-restore b157 b
+restore [locate_data_file a157] a
+restore [locate_data_file b157] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/I3 b/tests/boolean/bopfuse_complex/I3
index ae90e79379..818046470c 100644
--- a/tests/boolean/bopfuse_complex/I3
+++ b/tests/boolean/bopfuse_complex/I3
@@ -1,5 +1,5 @@
-restore a158 a
-restore b158 b
+restore [locate_data_file a158] a
+restore [locate_data_file b158] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/I4 b/tests/boolean/bopfuse_complex/I4
index 9eb838a863..e36466f1bf 100644
--- a/tests/boolean/bopfuse_complex/I4
+++ b/tests/boolean/bopfuse_complex/I4
@@ -1,5 +1,5 @@
-restore a160 a
-restore b160 b
+restore [locate_data_file a160] a
+restore [locate_data_file b160] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/I5 b/tests/boolean/bopfuse_complex/I5
index 66f653ac01..3a7d6e2b3e 100644
--- a/tests/boolean/bopfuse_complex/I5
+++ b/tests/boolean/bopfuse_complex/I5
@@ -1,5 +1,5 @@
-restore a164 a
-restore b164 b
+restore [locate_data_file a164] a
+restore [locate_data_file b164] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/I6 b/tests/boolean/bopfuse_complex/I6
index f91b3633f5..40f58f2ec6 100644
--- a/tests/boolean/bopfuse_complex/I6
+++ b/tests/boolean/bopfuse_complex/I6
@@ -1,5 +1,5 @@
-restore a166 a
-restore b166 b
+restore [locate_data_file a166] a
+restore [locate_data_file b166] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/I7 b/tests/boolean/bopfuse_complex/I7
index 8786cca064..ffe5dd7b97 100644
--- a/tests/boolean/bopfuse_complex/I7
+++ b/tests/boolean/bopfuse_complex/I7
@@ -1,5 +1,5 @@
-restore a168 a
-restore b168 b
+restore [locate_data_file a168] a
+restore [locate_data_file b168] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/I8 b/tests/boolean/bopfuse_complex/I8
index 64d1c9cb48..2c3d51aadd 100644
--- a/tests/boolean/bopfuse_complex/I8
+++ b/tests/boolean/bopfuse_complex/I8
@@ -1,5 +1,5 @@
-restore a170 a
-restore b170 b
+restore [locate_data_file a170] a
+restore [locate_data_file b170] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/I9 b/tests/boolean/bopfuse_complex/I9
index af7f9ae0ca..cfbfe9ff53 100644
--- a/tests/boolean/bopfuse_complex/I9
+++ b/tests/boolean/bopfuse_complex/I9
@@ -1,5 +1,5 @@
-restore a167 a
-restore b167 b
+restore [locate_data_file a167] a
+restore [locate_data_file b167] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/J1 b/tests/boolean/bopfuse_complex/J1
index d94a19953e..c25104ff06 100644
--- a/tests/boolean/bopfuse_complex/J1
+++ b/tests/boolean/bopfuse_complex/J1
@@ -1,5 +1,5 @@
-restore a189 a
-restore b189 b
+restore [locate_data_file a189] a
+restore [locate_data_file b189] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/J2 b/tests/boolean/bopfuse_complex/J2
index 7dbc096430..a3cc574c8b 100644
--- a/tests/boolean/bopfuse_complex/J2
+++ b/tests/boolean/bopfuse_complex/J2
@@ -1,5 +1,5 @@
-restore a197 a
-restore b197 b
+restore [locate_data_file a197] a
+restore [locate_data_file b197] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/J3 b/tests/boolean/bopfuse_complex/J3
index 3666595061..7d3d421a53 100644
--- a/tests/boolean/bopfuse_complex/J3
+++ b/tests/boolean/bopfuse_complex/J3
@@ -1,5 +1,5 @@
-restore a199 a
-restore b199 b
+restore [locate_data_file a199] a
+restore [locate_data_file b199] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/J4 b/tests/boolean/bopfuse_complex/J4
index bbcad417d3..a74bd6af20 100644
--- a/tests/boolean/bopfuse_complex/J4
+++ b/tests/boolean/bopfuse_complex/J4
@@ -1,5 +1,5 @@
-restore a206 a
-restore b206 b
+restore [locate_data_file a206] a
+restore [locate_data_file b206] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/J5 b/tests/boolean/bopfuse_complex/J5
index 9428d8d831..33e0ed30ce 100644
--- a/tests/boolean/bopfuse_complex/J5
+++ b/tests/boolean/bopfuse_complex/J5
@@ -1,10 +1,10 @@
-restore a346 a
-restore b346 b
+restore [locate_data_file a346] a
+restore [locate_data_file b346] b
 
 bop a b
 bopfuse r
 
-restore b347 b
+restore [locate_data_file b347] b
 
 bop r b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/J6 b/tests/boolean/bopfuse_complex/J6
index b30370f349..510c93d05e 100644
--- a/tests/boolean/bopfuse_complex/J6
+++ b/tests/boolean/bopfuse_complex/J6
@@ -1,8 +1,8 @@
 puts "TODO #22911 ALL: Faulty shapes in variables faulty_1 to faulty_"
 puts "TODO #22911 ALL: Error : The square of result shape is"
 
-restore a350 a
-restore b350 b
+restore [locate_data_file a350] a
+restore [locate_data_file b350] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/J7 b/tests/boolean/bopfuse_complex/J7
index 2abe2fd3f8..8d272d073d 100644
--- a/tests/boolean/bopfuse_complex/J7
+++ b/tests/boolean/bopfuse_complex/J7
@@ -1,8 +1,8 @@
 # Original bug : pro12660
 # Date : 24mar98
 
-restore pro12660a.rle a
-restore pro12660b.rle b
+restore [locate_data_file pro12660a.rle] a
+restore [locate_data_file pro12660b.rle] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/J8 b/tests/boolean/bopfuse_complex/J8
index 76bd0e8fe3..30f0be41ce 100644
--- a/tests/boolean/bopfuse_complex/J8
+++ b/tests/boolean/bopfuse_complex/J8
@@ -1,8 +1,8 @@
 # Original bug : fra60275
 # Date : 19Mai98
 
-restore fra60275a.rle a
-restore fra60275b.rle b
+restore [locate_data_file fra60275a.rle] a
+restore [locate_data_file fra60275b.rle] b
 tcopy  b w
 mkplane f w
 
diff --git a/tests/boolean/bopfuse_complex/J9 b/tests/boolean/bopfuse_complex/J9
index 881c2505e7..ee1c5f1640 100644
--- a/tests/boolean/bopfuse_complex/J9
+++ b/tests/boolean/bopfuse_complex/J9
@@ -1,8 +1,8 @@
 # Original bug : cts20578
 # Date : 19Mai98
 
-restore cts20578a.rle a
-restore cts20578b.rle b
+restore [locate_data_file cts20578a.rle] a
+restore [locate_data_file cts20578b.rle] b
 
 bop a b 
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/K1 b/tests/boolean/bopfuse_complex/K1
index 12f4e2c921..707340321e 100644
--- a/tests/boolean/bopfuse_complex/K1
+++ b/tests/boolean/bopfuse_complex/K1
@@ -1,8 +1,8 @@
 # Original bug : buc60093
 # Date : 25Mai98
 
-restore buc60093a.rle a
-restore buc60093b.rle b
+restore [locate_data_file buc60093a.rle] a
+restore [locate_data_file buc60093b.rle] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/K2 b/tests/boolean/bopfuse_complex/K2
index b78b890b13..c86610a06e 100644
--- a/tests/boolean/bopfuse_complex/K2
+++ b/tests/boolean/bopfuse_complex/K2
@@ -1,8 +1,8 @@
 # Original bug : pro11615
 # Date : 25Mai98
 
-restore pro11615a.rle a
-restore pro11615b.rle b
+restore [locate_data_file pro11615a.rle] a
+restore [locate_data_file pro11615b.rle] b
 
 bop a b
 bopfuse result 
diff --git a/tests/boolean/bopfuse_complex/K3 b/tests/boolean/bopfuse_complex/K3
index 866f727bf3..a0094a6a75 100644
--- a/tests/boolean/bopfuse_complex/K3
+++ b/tests/boolean/bopfuse_complex/K3
@@ -1,8 +1,8 @@
 # Original bug : cts17786 
 # Date : 25Mai98
 
-restore cts17786a.rle a
-restore cts17786b.rle b
+restore [locate_data_file cts17786a.rle] a
+restore [locate_data_file cts17786b.rle] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/K4 b/tests/boolean/bopfuse_complex/K4
index acc31278f5..b0ba57346d 100644
--- a/tests/boolean/bopfuse_complex/K4
+++ b/tests/boolean/bopfuse_complex/K4
@@ -1,8 +1,8 @@
 # Original bug : fra50047
 # Date : 25Mai98
 
-restore fra50047a.rle a
-restore fra50047b.rle b
+restore [locate_data_file fra50047a.rle] a
+restore [locate_data_file fra50047b.rle] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/K5 b/tests/boolean/bopfuse_complex/K5
index 791da0ce82..ff78e41522 100644
--- a/tests/boolean/bopfuse_complex/K5
+++ b/tests/boolean/bopfuse_complex/K5
@@ -1,8 +1,8 @@
 # Original bug : pro9481
 # Date : 19Mai98
 
-restore pro9481a.rle a
-restore pro9481b.rle b
+restore [locate_data_file pro9481a.rle] a
+restore [locate_data_file pro9481b.rle] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/K6 b/tests/boolean/bopfuse_complex/K6
index 166fa46c9d..678b28aac5 100644
--- a/tests/boolean/bopfuse_complex/K6
+++ b/tests/boolean/bopfuse_complex/K6
@@ -1,8 +1,8 @@
 # Original bug : cts20280
 # Date : 4June98
 
-restore cts20280a.rle a
-restore cts20280b.rle b
+restore [locate_data_file cts20280a.rle] a
+restore [locate_data_file cts20280b.rle] b
 
 bop a b 
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/K7 b/tests/boolean/bopfuse_complex/K7
index def958191e..01af7c5f6d 100644
--- a/tests/boolean/bopfuse_complex/K7
+++ b/tests/boolean/bopfuse_complex/K7
@@ -1,8 +1,8 @@
 # Original bug : cts21143
 # Date : 16July98
 
-restore cts21143a.rle a 
-restore cts21143b.rle b
+restore [locate_data_file cts21143a.rle] a 
+restore [locate_data_file cts21143b.rle] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/K8 b/tests/boolean/bopfuse_complex/K8
index c781409f39..42cc7a4c33 100644
--- a/tests/boolean/bopfuse_complex/K8
+++ b/tests/boolean/bopfuse_complex/K8
@@ -1,7 +1,7 @@
 #clear
 #dall
-restore topo002-o1.brep coque1
-restore topo002-o2.brep coque2
+restore [locate_data_file topo002-o1.brep] coque1
+restore [locate_data_file topo002-o2.brep] coque2
 
 ## pkv f
 explode coque1 sh
diff --git a/tests/boolean/bopfuse_complex/K9 b/tests/boolean/bopfuse_complex/K9
index e4cde6f457..4775fe7bef 100644
--- a/tests/boolean/bopfuse_complex/K9
+++ b/tests/boolean/bopfuse_complex/K9
@@ -1,8 +1,7 @@
 ## pro16343
-## datadir /dp_25/IBug/pro/16343
 
-restore fus-object1.brep a
-restore fus-object2.brep b
+restore [locate_data_file fus-object1.brep] a
+restore [locate_data_file fus-object2.brep] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/L1 b/tests/boolean/bopfuse_complex/L1
index 02abc46a4f..708e47eb49 100644
--- a/tests/boolean/bopfuse_complex/L1
+++ b/tests/boolean/bopfuse_complex/L1
@@ -1,10 +1,10 @@
 # pro17221
 
-restore Jyls3 a
+restore [locate_data_file Jyls3] a
 explode a sh
 copy a_1 a
 
-restore Jyls4 b
+restore [locate_data_file Jyls4] b
 explode b sh
 copy b_1 b
 
diff --git a/tests/boolean/bopfuse_complex/L2 b/tests/boolean/bopfuse_complex/L2
index 664ed75b7c..adbbc05ced 100644
--- a/tests/boolean/bopfuse_complex/L2
+++ b/tests/boolean/bopfuse_complex/L2
@@ -1,8 +1,8 @@
 # Original bug : cts20769
 # Date : 4June98
 
-restore cts20769a.rle a
-restore cts20769b.rle b
+restore [locate_data_file cts20769a.rle] a
+restore [locate_data_file cts20769b.rle] b
 
 bop a b
 bopfuse result 
diff --git a/tests/boolean/bopfuse_complex/L5 b/tests/boolean/bopfuse_complex/L5
index 83c737430d..dd0dea0602 100644
--- a/tests/boolean/bopfuse_complex/L5
+++ b/tests/boolean/bopfuse_complex/L5
@@ -1,9 +1,9 @@
 # Original bug : pro15203
 ###########################
-restore cq11.brep c1
+restore [locate_data_file cq11.brep] c1
 explode c1 f
 copy c1_1 c1
-restore cq21.brep c2
+restore [locate_data_file cq21.brep] c2
 explode c2 f
 copy c2_1 c2
 
diff --git a/tests/boolean/bopfuse_complex/L6 b/tests/boolean/bopfuse_complex/L6
index dad153b954..97d26ed834 100644
--- a/tests/boolean/bopfuse_complex/L6
+++ b/tests/boolean/bopfuse_complex/L6
@@ -1,9 +1,9 @@
 # Original bug : pro15203
 ###########################
-restore cq11.brep c1
+restore [locate_data_file cq11.brep] c1
 explode c1 f
 copy c1_1 c1
-restore cq22.brep c2
+restore [locate_data_file cq22.brep] c2
 
 explode c2 f
 
diff --git a/tests/boolean/bopfuse_complex/L7 b/tests/boolean/bopfuse_complex/L7
index bde35b897f..67d7f73ac6 100644
--- a/tests/boolean/bopfuse_complex/L7
+++ b/tests/boolean/bopfuse_complex/L7
@@ -1,7 +1,7 @@
 ## cts20528
 
-restore outil_pkv.brep a
-restore piece.brep b
+restore [locate_data_file outil_pkv.brep] a
+restore [locate_data_file piece.brep] b
 
 bop a b
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/L8 b/tests/boolean/bopfuse_complex/L8
index 21da7cfb37..121cd23ced 100644
--- a/tests/boolean/bopfuse_complex/L8
+++ b/tests/boolean/bopfuse_complex/L8
@@ -1,7 +1,7 @@
 #pro16303
 
-restore b1
-restore b2
+restore [locate_data_file b1] b1
+restore [locate_data_file b2] b2
 
 bop b1 b2
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/L9 b/tests/boolean/bopfuse_complex/L9
index 28000ee40e..6582bc2f2f 100644
--- a/tests/boolean/bopfuse_complex/L9
+++ b/tests/boolean/bopfuse_complex/L9
@@ -4,8 +4,8 @@ puts ""
 puts ""
 #axo
 
-restore cts22187a.brep o1
-restore cts22187b.brep o2
+restore [locate_data_file cts22187a.brep] o1
+restore [locate_data_file cts22187b.brep] o2
 
 bop o1 o2
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/M1 b/tests/boolean/bopfuse_complex/M1
index 16b88f39ab..e6b0c2e717 100644
--- a/tests/boolean/bopfuse_complex/M1
+++ b/tests/boolean/bopfuse_complex/M1
@@ -2,8 +2,8 @@ puts "GER60861"
 puts "Cut"
 puts ""
 
-restore ger60861a.brep a
-restore ger60861b.brep b
+restore [locate_data_file ger60861a.brep] a
+restore [locate_data_file ger60861b.brep] b
 
 ##mod by pkv f
 ## a, b are shells but not solids !
diff --git a/tests/boolean/bopfuse_complex/M2 b/tests/boolean/bopfuse_complex/M2
index d2b193e54f..faa37c238c 100644
--- a/tests/boolean/bopfuse_complex/M2
+++ b/tests/boolean/bopfuse_complex/M2
@@ -2,8 +2,8 @@
 puts "PRO15946"
 puts "Fuse"
 puts ""
-restore pro15946c.rle c
-restore pro15946d.rle d
+restore [locate_data_file pro15946c.rle] c
+restore [locate_data_file pro15946d.rle] d
 
 explode c so
 
diff --git a/tests/boolean/bopfuse_complex/M3 b/tests/boolean/bopfuse_complex/M3
index 2679fccdff..0ca1a9f943 100644
--- a/tests/boolean/bopfuse_complex/M3
+++ b/tests/boolean/bopfuse_complex/M3
@@ -2,8 +2,8 @@ puts "PRO15203"
 puts "Fuse"
 puts ""
 
-restore pro15203_11.brep c1
-restore pro15203_21.brep c2
+restore [locate_data_file pro15203_11.brep] c1
+restore [locate_data_file pro15203_21.brep] c2
 
 ########################mod by pkv f
 explode c1 f
diff --git a/tests/boolean/bopfuse_complex/M4 b/tests/boolean/bopfuse_complex/M4
index 2064f15047..4975b52443 100644
--- a/tests/boolean/bopfuse_complex/M4
+++ b/tests/boolean/bopfuse_complex/M4
@@ -2,8 +2,8 @@ puts "PRO15203"
 puts "Fuse"
 puts ""
 
-restore pro15203_11.brep c1
-restore pro15203_22.brep c2
+restore [locate_data_file pro15203_11.brep] c1
+restore [locate_data_file pro15203_22.brep] c2
 ########################mod by pkv f
 explode c1 f
 copy c1_1 c1
diff --git a/tests/boolean/bopfuse_complex/M5 b/tests/boolean/bopfuse_complex/M5
index 7a3c1f99d0..061428ad93 100644
--- a/tests/boolean/bopfuse_complex/M5
+++ b/tests/boolean/bopfuse_complex/M5
@@ -5,7 +5,7 @@ ttranslate c 3 3 6
 bop b c
 bopfuse rr
 
-restore A1_rr_7.brep A1_rr_7
+restore [locate_data_file A1_rr_7.brep] A1_rr_7
 prism p1 A1_rr_7 0 0 4
 
 bop rr p1
diff --git a/tests/boolean/bopfuse_complex/M6 b/tests/boolean/bopfuse_complex/M6
index 656be0e421..e23e4b4b85 100644
--- a/tests/boolean/bopfuse_complex/M6
+++ b/tests/boolean/bopfuse_complex/M6
@@ -5,7 +5,7 @@ ttranslate c 3 3 6
 
 bfuse rr b c
 
-restore A1_rr_7.brep A1_rr_7
+restore [locate_data_file A1_rr_7.brep] A1_rr_7
 prism p1 A1_rr_7 0 0 -4
 
 explode  rr so
diff --git a/tests/boolean/bopfuse_complex/M7 b/tests/boolean/bopfuse_complex/M7
index 401ceb6f07..3178e02219 100644
--- a/tests/boolean/bopfuse_complex/M7
+++ b/tests/boolean/bopfuse_complex/M7
@@ -5,7 +5,7 @@ ttranslate c 0 0 6
 
 bfuse rr b c
 
-restore C1_rr_8.brep C1_rr_8
+restore [locate_data_file C1_rr_8.brep] C1_rr_8
 prism p1 C1_rr_8 0 0 -4
 
 explode rr so
diff --git a/tests/boolean/bopfuse_complex/M8 b/tests/boolean/bopfuse_complex/M8
index ed8345718c..bc04c65ab2 100644
--- a/tests/boolean/bopfuse_complex/M8
+++ b/tests/boolean/bopfuse_complex/M8
@@ -5,7 +5,7 @@ ttranslate c 0 0 6
 
 bfuse rr b c
 
-restore C1_rr_8.brep C1_rr_8
+restore [locate_data_file C1_rr_8.brep] C1_rr_8
 prism p1 C1_rr_8 0 0 4
 
 explode rr so
diff --git a/tests/boolean/bopfuse_complex/M9 b/tests/boolean/bopfuse_complex/M9
index c312c6e790..679a1b3ed0 100644
--- a/tests/boolean/bopfuse_complex/M9
+++ b/tests/boolean/bopfuse_complex/M9
@@ -5,7 +5,7 @@ ttranslate c 0 0 2
 
 bfuse rr b c
 
-restore E1_rr_7.brep E1_rr_7
+restore [locate_data_file E1_rr_7.brep] E1_rr_7
 prism p1 E1_rr_7 0 -4 0
 
 explode rr so
diff --git a/tests/boolean/bopfuse_complex/N1 b/tests/boolean/bopfuse_complex/N1
index ff007ce958..24ea7fdcfd 100644
--- a/tests/boolean/bopfuse_complex/N1
+++ b/tests/boolean/bopfuse_complex/N1
@@ -5,7 +5,7 @@ ttranslate c 0 0 2
 
 bfuse rr b c
 
-restore E1_rr_7.brep E1_rr_7
+restore [locate_data_file E1_rr_7.brep] E1_rr_7
 prism p1 E1_rr_7 0 4 0
 
 explode rr so
diff --git a/tests/boolean/bopfuse_complex/N2 b/tests/boolean/bopfuse_complex/N2
index 8f23649ab9..3ed1a0c924 100644
--- a/tests/boolean/bopfuse_complex/N2
+++ b/tests/boolean/bopfuse_complex/N2
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh2a b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh2a] b2
 
 bop b1 b2
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/N3 b/tests/boolean/bopfuse_complex/N3
index 4f24ea3a0f..d7e19f7cc1 100644
--- a/tests/boolean/bopfuse_complex/N3
+++ b/tests/boolean/bopfuse_complex/N3
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh3 b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh3] b2
 
 bop b1 b2
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/N4 b/tests/boolean/bopfuse_complex/N4
index 5d03e7cde5..75c30cfc1e 100644
--- a/tests/boolean/bopfuse_complex/N4
+++ b/tests/boolean/bopfuse_complex/N4
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh4 b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh4] b2
 
 bop b1 b2
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/N5 b/tests/boolean/bopfuse_complex/N5
index 6f9cc21733..10fbb77471 100644
--- a/tests/boolean/bopfuse_complex/N5
+++ b/tests/boolean/bopfuse_complex/N5
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh9 b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh9] b2
 
 bop b1 b2
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/N6 b/tests/boolean/bopfuse_complex/N6
index 74c404d72c..644c869162 100644
--- a/tests/boolean/bopfuse_complex/N6
+++ b/tests/boolean/bopfuse_complex/N6
@@ -1,5 +1,5 @@
-restore sh10 b1
-restore shx b2
+restore [locate_data_file sh10] b1
+restore [locate_data_file shx] b2
 
 bop b1 b2
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/N7 b/tests/boolean/bopfuse_complex/N7
index 0b6b04b6cf..2cb3a154a0 100644
--- a/tests/boolean/bopfuse_complex/N7
+++ b/tests/boolean/bopfuse_complex/N7
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh5 b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh5] b2
 
 bop b1 b2
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/N8 b/tests/boolean/bopfuse_complex/N8
index 8b560c692a..f17ca6f815 100644
--- a/tests/boolean/bopfuse_complex/N8
+++ b/tests/boolean/bopfuse_complex/N8
@@ -1,10 +1,10 @@
-restore af b1
-restore bf b2
+restore [locate_data_file af] b1
+restore [locate_data_file bf] b2
 
 bop b1 b2
 bopfuse result
 
-restore cf b3
+restore [locate_data_file cf] b3
 
 bop result b3
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/N9 b/tests/boolean/bopfuse_complex/N9
index 3e93f0ebaf..15954d2e04 100644
--- a/tests/boolean/bopfuse_complex/N9
+++ b/tests/boolean/bopfuse_complex/N9
@@ -1,5 +1,5 @@
-restore g1 b1
-restore g2 b2
+restore [locate_data_file g1] b1
+restore [locate_data_file g2] b2
 
 bop b1 b2
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/O1 b/tests/boolean/bopfuse_complex/O1
index 39e6912b69..de370311c9 100644
--- a/tests/boolean/bopfuse_complex/O1
+++ b/tests/boolean/bopfuse_complex/O1
@@ -1,5 +1,5 @@
-restore sg1 b1
-restore sg2 b2
+restore [locate_data_file sg1] b1
+restore [locate_data_file sg2] b2
 
 bop b1 b2
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/O2 b/tests/boolean/bopfuse_complex/O2
index 5dfcaccc3e..b4b6b36eec 100644
--- a/tests/boolean/bopfuse_complex/O2
+++ b/tests/boolean/bopfuse_complex/O2
@@ -1,5 +1,5 @@
-restore sf4 b1
-restore sf5 b2
+restore [locate_data_file sf4] b1
+restore [locate_data_file sf5] b2
 
 bop b1 b2
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/O3 b/tests/boolean/bopfuse_complex/O3
index bfdcb9d358..cb71773651 100644
--- a/tests/boolean/bopfuse_complex/O3
+++ b/tests/boolean/bopfuse_complex/O3
@@ -1,5 +1,5 @@
-restore sf5 b1
-restore sf3 b2
+restore [locate_data_file sf5] b1
+restore [locate_data_file sf3] b2
 
 bop b1 b2
 bopfuse result
diff --git a/tests/boolean/bopfuse_complex/O4 b/tests/boolean/bopfuse_complex/O4
index e4b8f92939..f8e4ad24da 100644
--- a/tests/boolean/bopfuse_complex/O4
+++ b/tests/boolean/bopfuse_complex/O4
@@ -1,5 +1,5 @@
-restore sf5 b1
-restore sf55 b2
+restore [locate_data_file sf5] b1
+restore [locate_data_file sf55] b2
 
 bop b1 b2
 bopfuse result
diff --git a/tests/boolean/bopfuse_simple/ZP6 b/tests/boolean/bopfuse_simple/ZP6
index c83cb9ccd1..34b16d8a1f 100644
--- a/tests/boolean/bopfuse_simple/ZP6
+++ b/tests/boolean/bopfuse_simple/ZP6
@@ -9,6 +9,9 @@ if {[array get env os_type] != ""} {
 if {[string compare $os "Debian50-64"] != 0 && [string compare $os "Debian60-64"] != 0 && [string compare $os "Mandriva2010-64"] != 0} {
   puts "TODO #22911 ${os}: Faulty shapes in variables faulty_1 to faulty_"
 }
+if { [regexp -nocase {Windows} $os] == 1 } {
+  puts "TODO ?#22911 ${os}: Faulty shapes in variables faulty_1 to faulty_"
+}
 
 ptorus a0 100 20
 tcopy a0 a1
diff --git a/tests/boolean/bopsection/A2 b/tests/boolean/bopsection/A2
index f41d6fbc34..9e71659af9 100644
--- a/tests/boolean/bopsection/A2
+++ b/tests/boolean/bopsection/A2
@@ -1,8 +1,8 @@
 # Original bug : fra60275
 # Date : 19Mai98
 
-restore fra60275a.rle a
-restore fra60275b.rle b
+restore [locate_data_file fra60275a.rle] a
+restore [locate_data_file fra60275b.rle] b
 tcopy  b w
 mkplane f w
 
diff --git a/tests/boolean/bopsection/A3 b/tests/boolean/bopsection/A3
index dfd4a53ef5..b0e37474ae 100644
--- a/tests/boolean/bopsection/A3
+++ b/tests/boolean/bopsection/A3
@@ -1,8 +1,8 @@
 # Original bug : pro10095
 # Date : 19Mai98
 
-restore pro10095a.rle a
-restore pro10095b.rle b
+restore [locate_data_file pro10095a.rle] a
+restore [locate_data_file pro10095b.rle] b
 
 shape fso so
 add b fso
diff --git a/tests/boolean/bopsection/A4 b/tests/boolean/bopsection/A4
index a74f539106..2fab9de43c 100644
--- a/tests/boolean/bopsection/A4
+++ b/tests/boolean/bopsection/A4
@@ -1,8 +1,8 @@
 # Original bug : pro13075
 # Date : 19Mai98
 
-restore pro13075a.rle a
-restore pro13075b.rle b
+restore [locate_data_file pro13075a.rle] a
+restore [locate_data_file pro13075b.rle] b
 
 bop a b 
 bopsection result
diff --git a/tests/boolean/bopsection/A5 b/tests/boolean/bopsection/A5
index 5b18173e20..34a0e56e73 100644
--- a/tests/boolean/bopsection/A5
+++ b/tests/boolean/bopsection/A5
@@ -1,8 +1,8 @@
 # Original bug : pro13495
 # Date : 19Mai98
 
-restore pro13495a.rle a
-restore pro13495b.rle b
+restore [locate_data_file pro13495a.rle] a
+restore [locate_data_file pro13495b.rle] b
 
 bop a b
 bopsection result
diff --git a/tests/boolean/bopsection/A6 b/tests/boolean/bopsection/A6
index a9c2e04f62..de449b4f5b 100644
--- a/tests/boolean/bopsection/A6
+++ b/tests/boolean/bopsection/A6
@@ -1,8 +1,8 @@
 # Original bug : cts20148
 # Date : 19Mai98
 
-restore cts20148a.rle a
-restore cts20148b.rle b
+restore [locate_data_file cts20148a.rle] a
+restore [locate_data_file cts20148b.rle] b
 
 bop a b
 bopsection result
diff --git a/tests/boolean/bopsection/A7 b/tests/boolean/bopsection/A7
index 78da0072a6..bb97ba8a74 100644
--- a/tests/boolean/bopsection/A7
+++ b/tests/boolean/bopsection/A7
@@ -1,8 +1,8 @@
 # Original bug : cts20578
 # Date : 19Mai98
 
-restore cts20578a.rle a
-restore cts20578b.rle b
+restore [locate_data_file cts20578a.rle] a
+restore [locate_data_file cts20578b.rle] b
 
 bop a b 
 bopsection result
diff --git a/tests/boolean/bopsection/A8 b/tests/boolean/bopsection/A8
index 2cae7eb279..45adecb3ca 100644
--- a/tests/boolean/bopsection/A8
+++ b/tests/boolean/bopsection/A8
@@ -1,8 +1,8 @@
 # Original bug : buc60093
 # Date : 25Mai98
 
-restore buc60093a.rle a
-restore buc60093b.rle b
+restore [locate_data_file buc60093a.rle] a
+restore [locate_data_file buc60093b.rle] b
 
 bop a b
 bopsection result
diff --git a/tests/boolean/bopsection/A9 b/tests/boolean/bopsection/A9
index 8cd96b1337..fc21cb0b99 100644
--- a/tests/boolean/bopsection/A9
+++ b/tests/boolean/bopsection/A9
@@ -1,8 +1,8 @@
 # Original bug : buc60172
 # Date : 25Mai98
 
-restore buc60172a.rle a
-restore buc60172b.rle b
+restore [locate_data_file buc60172a.rle] a
+restore [locate_data_file buc60172b.rle] b
 
 bop a b
 bopsection result
diff --git a/tests/boolean/bopsection/B1 b/tests/boolean/bopsection/B1
index 3d74959296..3e2013833d 100644
--- a/tests/boolean/bopsection/B1
+++ b/tests/boolean/bopsection/B1
@@ -2,8 +2,8 @@
 # Date : 25Mai98
 
 
-restore pro11615a.rle a
-restore pro11615b.rle b
+restore [locate_data_file pro11615a.rle] a
+restore [locate_data_file pro11615b.rle] b
 
 bop a b
 bopsection result
diff --git a/tests/boolean/bopsection/B2 b/tests/boolean/bopsection/B2
index e555cc5975..a1bef613cb 100644
--- a/tests/boolean/bopsection/B2
+++ b/tests/boolean/bopsection/B2
@@ -1,8 +1,8 @@
 # Original bug : cts17786 
 # Date : 25Mai98
 
-restore cts17786a.rle a
-restore cts17786b.rle b
+restore [locate_data_file cts17786a.rle] a
+restore [locate_data_file cts17786b.rle] b
 
 bop a b
 bopsection result
diff --git a/tests/boolean/bopsection/B3 b/tests/boolean/bopsection/B3
index 78a8d3ca1d..f0d4a81208 100644
--- a/tests/boolean/bopsection/B3
+++ b/tests/boolean/bopsection/B3
@@ -1,8 +1,8 @@
 # Original bug : fra50047
 # Date : 25Mai98
 
-restore fra50047a.rle a
-restore fra50047b.rle b
+restore [locate_data_file fra50047a.rle] a
+restore [locate_data_file fra50047b.rle] b
 
 bop a b
 bopsection result
diff --git a/tests/boolean/bopsection/B4 b/tests/boolean/bopsection/B4
index b4b354804d..a3e8475f99 100644
--- a/tests/boolean/bopsection/B4
+++ b/tests/boolean/bopsection/B4
@@ -1,8 +1,8 @@
 # Original bug : pro9481
 # Date : 19Mai98
 
-restore pro9481a.rle a
-restore pro9481b.rle b
+restore [locate_data_file pro9481a.rle] a
+restore [locate_data_file pro9481b.rle] b
 
 bop a b
 bopsection result
diff --git a/tests/boolean/bopsection/B5 b/tests/boolean/bopsection/B5
index 074cb3e53a..5f3250558a 100644
--- a/tests/boolean/bopsection/B5
+++ b/tests/boolean/bopsection/B5
@@ -1,8 +1,8 @@
 # Original bug : cts20280
 # Date : 4June98
 
-restore cts20280a.rle a
-restore cts20280b.rle b
+restore [locate_data_file cts20280a.rle] a
+restore [locate_data_file cts20280b.rle] b
 
 bop a b 
 bopsection result
diff --git a/tests/boolean/bopsection/B6 b/tests/boolean/bopsection/B6
index 2f7d87c77c..255dde1355 100644
--- a/tests/boolean/bopsection/B6
+++ b/tests/boolean/bopsection/B6
@@ -1,8 +1,8 @@
 # Original bug : cts20975
 # Date : 18Juin98
 
-restore cts20975a.rle a
-restore cts20975b.rle b
+restore [locate_data_file cts20975a.rle] a
+restore [locate_data_file cts20975b.rle] b
 
 bopaddpcs a
 
diff --git a/tests/boolean/bopsection/B7 b/tests/boolean/bopsection/B7
index 3a4a9b7387..a50ba116f1 100644
--- a/tests/boolean/bopsection/B7
+++ b/tests/boolean/bopsection/B7
@@ -1,8 +1,8 @@
 # Original bug : cts21143
 # Date : 16July98
 
-restore cts21143a.rle a 
-restore cts21143b.rle b
+restore [locate_data_file cts21143a.rle] a 
+restore [locate_data_file cts21143b.rle] b
 
 bop a b
 bopsection result
diff --git a/tests/boolean/bopsection/B8 b/tests/boolean/bopsection/B8
index 702aea8bbe..b0add55dcd 100644
--- a/tests/boolean/bopsection/B8
+++ b/tests/boolean/bopsection/B8
@@ -1,8 +1,8 @@
 # Original bug : pro14527
 # Date : 16July98
 
-restore pro14527a.rle a 
-restore pro14527b.rle b
+restore [locate_data_file pro14527a.rle] a 
+restore [locate_data_file pro14527b.rle] b
 
 bop a b
 bopsection result
diff --git a/tests/boolean/bopsection/B9 b/tests/boolean/bopsection/B9
index 9482bae205..636b97a2b8 100644
--- a/tests/boolean/bopsection/B9
+++ b/tests/boolean/bopsection/B9
@@ -1,4 +1,4 @@
-restore topo100.brep m
+restore [locate_data_file topo100.brep] m
 
 explode m
 renamevar m_3 coque
diff --git a/tests/boolean/bopsection/C1 b/tests/boolean/bopsection/C1
index affa1e3970..6bda618a99 100644
--- a/tests/boolean/bopsection/C1
+++ b/tests/boolean/bopsection/C1
@@ -1,4 +1,4 @@
-restore topo100.brep m
+restore [locate_data_file topo100.brep] m
 
 explode m
 renamevar m_3 coque
diff --git a/tests/boolean/bopsection/C2 b/tests/boolean/bopsection/C2
index ebb64cfcc0..018624689f 100644
--- a/tests/boolean/bopsection/C2
+++ b/tests/boolean/bopsection/C2
@@ -1,8 +1,7 @@
 ## pro16343
-## datadir /dp_25/IBug/pro/16343
 
-restore fus-object1.brep a
-restore fus-object2.brep b
+restore [locate_data_file fus-object1.brep] a
+restore [locate_data_file fus-object2.brep] b
 
 bop a b
 bopsection result
diff --git a/tests/boolean/bopsection/C3 b/tests/boolean/bopsection/C3
index 16d493848e..b443c8a364 100644
--- a/tests/boolean/bopsection/C3
+++ b/tests/boolean/bopsection/C3
@@ -1,7 +1,7 @@
 #cts21527
 
-restore bad_cut_outil.brep a
-restore bad_cut_part.brep b
+restore [locate_data_file bad_cut_outil.brep] a
+restore [locate_data_file bad_cut_part.brep] b
 
 bop b a
 bopsection result
diff --git a/tests/boolean/bopsection/C4 b/tests/boolean/bopsection/C4
index 828483d916..2f3dbf1d5c 100644
--- a/tests/boolean/bopsection/C4
+++ b/tests/boolean/bopsection/C4
@@ -1,7 +1,7 @@
 #uki60922
 
-restore uki60922_part.brep a
-restore uki60922_tool.brep b
+restore [locate_data_file uki60922_part.brep] a
+restore [locate_data_file uki60922_tool.brep] b
 
 bop a b
 bopsection result
diff --git a/tests/boolean/bopsection/C5 b/tests/boolean/bopsection/C5
index bddc2e47fc..eeef37f11b 100644
--- a/tests/boolean/bopsection/C5
+++ b/tests/boolean/bopsection/C5
@@ -1,8 +1,8 @@
 # Original bug : cts20769
 # Date : 4June98
 
-restore cts20769a.rle a
-restore cts20769b.rle b
+restore [locate_data_file cts20769a.rle] a
+restore [locate_data_file cts20769b.rle] b
 
 bop a b
 bopsection result
diff --git a/tests/boolean/bopsection/C6 b/tests/boolean/bopsection/C6
index 2a481b0bfe..f3c703202b 100644
--- a/tests/boolean/bopsection/C6
+++ b/tests/boolean/bopsection/C6
@@ -1,7 +1,7 @@
 # Original bug : pro10095
 
-restore pro10095a.rle a
-restore pro10095b.rle b
+restore [locate_data_file pro10095a.rle] a
+restore [locate_data_file pro10095b.rle] b
 
 shape fso so
 add b fso
diff --git a/tests/boolean/bopsection/C7 b/tests/boolean/bopsection/C7
index 78f99c460f..8c947ca1cb 100644
--- a/tests/boolean/bopsection/C7
+++ b/tests/boolean/bopsection/C7
@@ -1,9 +1,9 @@
 # Original bug : pro15203
 ###########################
-restore cq11.brep c1
+restore [locate_data_file cq11.brep] c1
 explode c1 f
 copy c1_1 c1
-restore cq21.brep c2
+restore [locate_data_file cq21.brep] c2
 explode c2 f
 copy c2_1 c2
 
diff --git a/tests/boolean/bopsection/C8 b/tests/boolean/bopsection/C8
index 555e126f22..1dbb30657c 100644
--- a/tests/boolean/bopsection/C8
+++ b/tests/boolean/bopsection/C8
@@ -1,7 +1,7 @@
 ## cts20528
 
-restore outil_pkv.brep a
-restore piece.brep b
+restore [locate_data_file outil_pkv.brep] a
+restore [locate_data_file piece.brep] b
 
 bop a b
 bopsection result
diff --git a/tests/boolean/bopsection/D1 b/tests/boolean/bopsection/D1
index d5e67d2091..a1111c3f79 100644
--- a/tests/boolean/bopsection/D1
+++ b/tests/boolean/bopsection/D1
@@ -1,7 +1,7 @@
 ## pro16129
 
-restore CSRESULT-ORISHAPE.brep a
-restore CSRESULT-PRISM.brep c
+restore [locate_data_file CSRESULT-ORISHAPE.brep] a
+restore [locate_data_file CSRESULT-PRISM.brep] c
 
 #pkv f
 btolx a
diff --git a/tests/boolean/bopsection/D2 b/tests/boolean/bopsection/D2
index e9c96a719e..efc14c847e 100644
--- a/tests/boolean/bopsection/D2
+++ b/tests/boolean/bopsection/D2
@@ -1,7 +1,7 @@
 #pro16303
 
-restore b1
-restore b2
+restore [locate_data_file b1] b1
+restore [locate_data_file b2] b2
 
 bop b1 b2
 
diff --git a/tests/boolean/bopsection/D3 b/tests/boolean/bopsection/D3
index f112d085cc..1f07e6bd62 100644
--- a/tests/boolean/bopsection/D3
+++ b/tests/boolean/bopsection/D3
@@ -1,7 +1,7 @@
 #pro16955
 
-restore m2_o
-restore m2_t
+restore [locate_data_file m2_o] m2_o
+restore [locate_data_file m2_t] m2_t
 
 bop m2_o m2_t
 
diff --git a/tests/boolean/bopsection/D4 b/tests/boolean/bopsection/D4
index 3e5e1e61a5..294350eea3 100644
--- a/tests/boolean/bopsection/D4
+++ b/tests/boolean/bopsection/D4
@@ -1,7 +1,7 @@
 ## fra60812
 #
-restore Bug3_Tr_obj_1.rle a
-restore Bug3_Tr_outil.rle b
+restore [locate_data_file Bug3_Tr_obj_1.rle] a
+restore [locate_data_file Bug3_Tr_outil.rle] b
 
 fsameparameter a
 
diff --git a/tests/boolean/bopsection/D5 b/tests/boolean/bopsection/D5
index acac95e693..8f75279464 100644
--- a/tests/boolean/bopsection/D5
+++ b/tests/boolean/bopsection/D5
@@ -1,8 +1,8 @@
 puts "CTS22135"
 puts "Generation of micro-edges during section."
 puts ""
-restore cts21135a.brep o
-restore cts21135b.brep t
+restore [locate_data_file cts21135a.brep] o
+restore [locate_data_file cts21135b.brep] t
 bop o t
 bopsection result
 
diff --git a/tests/boolean/bopsection/D6 b/tests/boolean/bopsection/D6
index e4bf8b1237..239cfef3dd 100644
--- a/tests/boolean/bopsection/D6
+++ b/tests/boolean/bopsection/D6
@@ -2,8 +2,8 @@ puts "CTS22135"
 puts "Generation of micro-edges during cut. "
 puts ""
 #axo
-restore cts21135a.brep o
-restore cts21135b.brep t
+restore [locate_data_file cts21135a.brep] o
+restore [locate_data_file cts21135b.brep] t
 
 bop o t
 
diff --git a/tests/boolean/bopsection/D7 b/tests/boolean/bopsection/D7
index a663702cf9..75850b4ab2 100644
--- a/tests/boolean/bopsection/D7
+++ b/tests/boolean/bopsection/D7
@@ -1,8 +1,8 @@
 puts "GER60861"
 puts "Section"
 puts ""
-restore ger60861a.brep a
-restore ger60861b.brep b
+restore [locate_data_file ger60861a.brep] a
+restore [locate_data_file ger60861b.brep] b
 
 explode a sh
 explode b sh
diff --git a/tests/boolean/bopsection/D8 b/tests/boolean/bopsection/D8
index d0ea5c077e..3ca48d1cd4 100644
--- a/tests/boolean/bopsection/D8
+++ b/tests/boolean/bopsection/D8
@@ -4,8 +4,8 @@ puts "Cut"
 puts ""
 
 # mod by pkv f
-restore pro12675a.brep obj
-restore pro12675b.brep out 
+restore [locate_data_file pro12675a.brep] obj
+restore [locate_data_file pro12675b.brep] out 
 #
 # mod by pkv f
 
diff --git a/tests/boolean/bopsection/D9 b/tests/boolean/bopsection/D9
index fc793ced54..5c63de6c06 100644
--- a/tests/boolean/bopsection/D9
+++ b/tests/boolean/bopsection/D9
@@ -2,8 +2,8 @@
 puts "PRO15946"
 puts "Fuse"
 puts ""
-restore pro15946c.rle c
-restore pro15946d.rle d
+restore [locate_data_file pro15946c.rle] c
+restore [locate_data_file pro15946d.rle] d
 
 explode c so
 
diff --git a/tests/boolean/bopsection/E1 b/tests/boolean/bopsection/E1
index a85f730540..8f4b404989 100644
--- a/tests/boolean/bopsection/E1
+++ b/tests/boolean/bopsection/E1
@@ -2,8 +2,8 @@ puts "PRO15203"
 puts "Fuse"
 puts ""
 
-restore pro15203_11.brep c1
-restore pro15203_21.brep c2
+restore [locate_data_file pro15203_11.brep] c1
+restore [locate_data_file pro15203_21.brep] c2
 
 ########################mod by pkv f
 explode c1 f
diff --git a/tests/boolean/bopsection/E2 b/tests/boolean/bopsection/E2
index a521c6a5e6..4c2d9a7722 100644
--- a/tests/boolean/bopsection/E2
+++ b/tests/boolean/bopsection/E2
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh2a b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh2a] b2
 
 bop b1 b2
 bopsection result
diff --git a/tests/boolean/bopsection/E3 b/tests/boolean/bopsection/E3
index ad731bc39f..c49593ba39 100644
--- a/tests/boolean/bopsection/E3
+++ b/tests/boolean/bopsection/E3
@@ -1,7 +1,7 @@
 cpulimit 600
 
-restore sh2 b1
-restore sh3 b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh3] b2
 
 bop b1 b2
 bopsection result
diff --git a/tests/boolean/bopsection/E4 b/tests/boolean/bopsection/E4
index b25ad6b5bd..fbcc533081 100644
--- a/tests/boolean/bopsection/E4
+++ b/tests/boolean/bopsection/E4
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh4 b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh4] b2
 
 bop b1 b2
 bopsection result
diff --git a/tests/boolean/bopsection/E5 b/tests/boolean/bopsection/E5
index 2372df1c2b..95d547cc60 100644
--- a/tests/boolean/bopsection/E5
+++ b/tests/boolean/bopsection/E5
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh7 b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh7] b2
 
 bop b1 b2
 bopsection result
diff --git a/tests/boolean/bopsection/E6 b/tests/boolean/bopsection/E6
index 3dfd9ed14b..e8de3e7210 100644
--- a/tests/boolean/bopsection/E6
+++ b/tests/boolean/bopsection/E6
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh8 b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh8] b2
 
 bop b1 b2
 bopsection result
diff --git a/tests/boolean/bopsection/E7 b/tests/boolean/bopsection/E7
index 11b1987eff..b2ea408950 100644
--- a/tests/boolean/bopsection/E7
+++ b/tests/boolean/bopsection/E7
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh9 b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh9] b2
 
 bop b1 b2
 bopsection result
diff --git a/tests/boolean/bopsection/E8 b/tests/boolean/bopsection/E8
index 8fcff140a0..fe891e304a 100644
--- a/tests/boolean/bopsection/E8
+++ b/tests/boolean/bopsection/E8
@@ -1,5 +1,5 @@
-restore sh10 b1
-restore shx b2
+restore [locate_data_file sh10] b1
+restore [locate_data_file shx] b2
 
 bop b1 b2
 bopsection result
diff --git a/tests/boolean/bopsection/E9 b/tests/boolean/bopsection/E9
index 43bcb55310..fe85653171 100644
--- a/tests/boolean/bopsection/E9
+++ b/tests/boolean/bopsection/E9
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh5 b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh5] b2
 
 bop b1 b2
 bopsection result
diff --git a/tests/boolean/bopsection/F1 b/tests/boolean/bopsection/F1
index 030f8e8389..835b83777e 100644
--- a/tests/boolean/bopsection/F1
+++ b/tests/boolean/bopsection/F1
@@ -1,5 +1,5 @@
-restore g1 b1
-restore g2 b2
+restore [locate_data_file g1] b1
+restore [locate_data_file g2] b2
 
 bop b1 b2
 bopsection result
diff --git a/tests/boolean/bopsection/F2 b/tests/boolean/bopsection/F2
index a184ae1a32..67c63d3779 100644
--- a/tests/boolean/bopsection/F2
+++ b/tests/boolean/bopsection/F2
@@ -1,5 +1,5 @@
-restore sg1 b1
-restore sg2 b2
+restore [locate_data_file sg1] b1
+restore [locate_data_file sg2] b2
 
 bop b1 b2
 bopsection result
diff --git a/tests/boolean/bopsection/F3 b/tests/boolean/bopsection/F3
index eb3cebecff..9478f024fd 100644
--- a/tests/boolean/bopsection/F3
+++ b/tests/boolean/bopsection/F3
@@ -1,5 +1,5 @@
-restore sf4 b1
-restore sf5 b2
+restore [locate_data_file sf4] b1
+restore [locate_data_file sf5] b2
 
 bop b1 b2
 bopsection result
diff --git a/tests/boolean/bopsection/F4 b/tests/boolean/bopsection/F4
index 72e97d97ab..a78e924cb6 100644
--- a/tests/boolean/bopsection/F4
+++ b/tests/boolean/bopsection/F4
@@ -1,5 +1,5 @@
-restore sf5 b1
-restore sf3 b2
+restore [locate_data_file sf5] b1
+restore [locate_data_file sf3] b2
 
 bop b1 b2
 bopsection result
diff --git a/tests/boolean/bopsection/F5 b/tests/boolean/bopsection/F5
index bd5d64f210..b4b0f63419 100644
--- a/tests/boolean/bopsection/F5
+++ b/tests/boolean/bopsection/F5
@@ -1,5 +1,5 @@
-restore sf5 b1
-restore sf55 b2
+restore [locate_data_file sf5] b1
+restore [locate_data_file sf55] b2
 
 bop b1 b2
 bopsection result
diff --git a/tests/boolean/boptuc_2d/A1 b/tests/boolean/boptuc_2d/A1
index a40f457ad2..24fa2fd021 100644
--- a/tests/boolean/boptuc_2d/A1
+++ b/tests/boolean/boptuc_2d/A1
@@ -1,5 +1,5 @@
-restore case_1_solid.brep a
-restore case_1_edge1.brep b
+restore [locate_data_file case_1_solid.brep] a
+restore [locate_data_file case_1_edge1.brep] b
 bop a b
 boptuc result
 set length 292.229
diff --git a/tests/boolean/boptuc_2d/A2 b/tests/boolean/boptuc_2d/A2
index 9ac0fcf78d..300a6847af 100644
--- a/tests/boolean/boptuc_2d/A2
+++ b/tests/boolean/boptuc_2d/A2
@@ -1,5 +1,5 @@
-restore case_1_solid.brep a
-restore case_1_edge2.brep b
+restore [locate_data_file case_1_solid.brep] a
+restore [locate_data_file case_1_edge2.brep] b
 bop a b
 boptuc result
 set length 392.231
diff --git a/tests/boolean/boptuc_2d/A3 b/tests/boolean/boptuc_2d/A3
index 4e6c24003e..2e3abf9a28 100644
--- a/tests/boolean/boptuc_2d/A3
+++ b/tests/boolean/boptuc_2d/A3
@@ -1,5 +1,5 @@
-restore case_1_solid.brep a
-restore case_1_edge3.brep b
+restore [locate_data_file case_1_solid.brep] a
+restore [locate_data_file case_1_edge3.brep] b
 bop a b
 boptuc result
 set length 46.1869
diff --git a/tests/boolean/boptuc_2d/A4 b/tests/boolean/boptuc_2d/A4
index 92eb919278..f3d4333202 100644
--- a/tests/boolean/boptuc_2d/A4
+++ b/tests/boolean/boptuc_2d/A4
@@ -1,5 +1,5 @@
-restore case_1_solid.brep a
-restore case_1_edge4.brep b
+restore [locate_data_file case_1_solid.brep] a
+restore [locate_data_file case_1_edge4.brep] b
 bop a b
 boptuc result
 set length empty
diff --git a/tests/boolean/boptuc_2d/A5 b/tests/boolean/boptuc_2d/A5
index 090d9e4812..09ecbbfab1 100644
--- a/tests/boolean/boptuc_2d/A5
+++ b/tests/boolean/boptuc_2d/A5
@@ -1,5 +1,5 @@
-restore case_1_solid.brep a
-restore case_1_wire1.brep b
+restore [locate_data_file case_1_solid.brep] a
+restore [locate_data_file case_1_wire1.brep] b
 bop a b
 boptuc result
 set length 984.459
diff --git a/tests/boolean/boptuc_2d/A6 b/tests/boolean/boptuc_2d/A6
index 9740a21721..52591a2c35 100644
--- a/tests/boolean/boptuc_2d/A6
+++ b/tests/boolean/boptuc_2d/A6
@@ -1,5 +1,5 @@
-restore case_1_solid.brep a
-restore case_1_wire2.brep b
+restore [locate_data_file case_1_solid.brep] a
+restore [locate_data_file case_1_wire2.brep] b
 bop a b
 boptuc result
 set length 926.59
diff --git a/tests/boolean/boptuc_2d/A7 b/tests/boolean/boptuc_2d/A7
index 8ee149defa..ac921ec326 100644
--- a/tests/boolean/boptuc_2d/A7
+++ b/tests/boolean/boptuc_2d/A7
@@ -1,5 +1,5 @@
-restore case_1_solid.brep a
-restore case_1_wire3.brep b
+restore [locate_data_file case_1_solid.brep] a
+restore [locate_data_file case_1_wire3.brep] b
 bop a b
 boptuc result
 set length empty
diff --git a/tests/boolean/boptuc_2d/A8 b/tests/boolean/boptuc_2d/A8
index 66e06742e8..6a3011b71a 100644
--- a/tests/boolean/boptuc_2d/A8
+++ b/tests/boolean/boptuc_2d/A8
@@ -1,5 +1,5 @@
-restore case_1_shell.brep a
-restore case_1_edge2.brep b
+restore [locate_data_file case_1_shell.brep] a
+restore [locate_data_file case_1_edge2.brep] b
 bop a b
 boptuc result
 set length 392.231
diff --git a/tests/boolean/boptuc_2d/A9 b/tests/boolean/boptuc_2d/A9
index 9ee6bab29d..ca31ebb4d6 100644
--- a/tests/boolean/boptuc_2d/A9
+++ b/tests/boolean/boptuc_2d/A9
@@ -1,5 +1,5 @@
-restore case_1_shell.brep a
-restore case_1_edge4.brep b
+restore [locate_data_file case_1_shell.brep] a
+restore [locate_data_file case_1_edge4.brep] b
 bop a b
 boptuc result
 set length empty
diff --git a/tests/boolean/boptuc_2d/B1 b/tests/boolean/boptuc_2d/B1
index bd3e44ee65..8f94ff0f06 100644
--- a/tests/boolean/boptuc_2d/B1
+++ b/tests/boolean/boptuc_2d/B1
@@ -1,5 +1,5 @@
-restore case_1_shell.brep a
-restore case_1_wire3.brep b
+restore [locate_data_file case_1_shell.brep] a
+restore [locate_data_file case_1_wire3.brep] b
 bop a b
 boptuc result
 set length empty
diff --git a/tests/boolean/boptuc_2d/B2 b/tests/boolean/boptuc_2d/B2
index af1aea6350..a517650b3d 100644
--- a/tests/boolean/boptuc_2d/B2
+++ b/tests/boolean/boptuc_2d/B2
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_edge4.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_edge4.brep] b
 bop a b
 boptuc result
 set length 1304.85
diff --git a/tests/boolean/boptuc_2d/B3 b/tests/boolean/boptuc_2d/B3
index 022bdf875a..911c030f1a 100644
--- a/tests/boolean/boptuc_2d/B3
+++ b/tests/boolean/boptuc_2d/B3
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_wire1.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_wire1.brep] b
 bop a b
 boptuc result
 set length 2302.78
diff --git a/tests/boolean/boptuc_2d/B4 b/tests/boolean/boptuc_2d/B4
index f024b35b3e..0ec2b9efc6 100644
--- a/tests/boolean/boptuc_2d/B4
+++ b/tests/boolean/boptuc_2d/B4
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_wire2.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_wire2.brep] b
 bop a b
 boptuc result
 set length 2302.78
diff --git a/tests/boolean/boptuc_2d/B5 b/tests/boolean/boptuc_2d/B5
index eb7b7b8440..74ccc987de 100644
--- a/tests/boolean/boptuc_2d/B5
+++ b/tests/boolean/boptuc_2d/B5
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_wire3.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_wire3.brep] b
 bop a b
 boptuc result
 set length 2329.96
diff --git a/tests/boolean/boptuc_2d/B6 b/tests/boolean/boptuc_2d/B6
index 399662d387..436d7b739a 100644
--- a/tests/boolean/boptuc_2d/B6
+++ b/tests/boolean/boptuc_2d/B6
@@ -1,5 +1,5 @@
-restore case_2_solid_r.brep a
-restore case_2_wire4.brep b
+restore [locate_data_file case_2_solid_r.brep] a
+restore [locate_data_file case_2_wire4.brep] b
 bop a b
 boptuc result
 set length 2408.18
diff --git a/tests/boolean/boptuc_2d/B7 b/tests/boolean/boptuc_2d/B7
index 6a7ab8fd77..d3245b9c69 100644
--- a/tests/boolean/boptuc_2d/B7
+++ b/tests/boolean/boptuc_2d/B7
@@ -1,5 +1,5 @@
-restore case_2_shell_r.brep a
-restore case_2_edge1.brep b
+restore [locate_data_file case_2_shell_r.brep] a
+restore [locate_data_file case_2_edge1.brep] b
 bop a b
 boptuc result
 #set length 2058.17
diff --git a/tests/boolean/boptuc_2d/B8 b/tests/boolean/boptuc_2d/B8
index 4468027e81..2bc5ff3c0f 100644
--- a/tests/boolean/boptuc_2d/B8
+++ b/tests/boolean/boptuc_2d/B8
@@ -1,5 +1,5 @@
-restore case_2_shell_r.brep a
-restore case_2_edge2.brep b
+restore [locate_data_file case_2_shell_r.brep] a
+restore [locate_data_file case_2_edge2.brep] b
 bop a b
 boptuc result
 #set length 2058.17
diff --git a/tests/boolean/boptuc_2d/B9 b/tests/boolean/boptuc_2d/B9
index 3b219ac990..e5cc8755ce 100644
--- a/tests/boolean/boptuc_2d/B9
+++ b/tests/boolean/boptuc_2d/B9
@@ -1,5 +1,5 @@
-restore case_2_shell_r.brep a
-restore case_2_edge3.brep b
+restore [locate_data_file case_2_shell_r.brep] a
+restore [locate_data_file case_2_edge3.brep] b
 bop a b
 boptuc result
 set length 1304.85
diff --git a/tests/boolean/boptuc_2d/C1 b/tests/boolean/boptuc_2d/C1
index e72e4a8f00..ce369f6580 100644
--- a/tests/boolean/boptuc_2d/C1
+++ b/tests/boolean/boptuc_2d/C1
@@ -1,5 +1,5 @@
-restore case_2_shell_r.brep a
-restore case_2_wire1.brep b
+restore [locate_data_file case_2_shell_r.brep] a
+restore [locate_data_file case_2_wire1.brep] b
 bop a b
 boptuc result
 #set length 3176.78
diff --git a/tests/boolean/boptuc_2d/C2 b/tests/boolean/boptuc_2d/C2
index 50fc676af3..244473d9b7 100644
--- a/tests/boolean/boptuc_2d/C2
+++ b/tests/boolean/boptuc_2d/C2
@@ -1,5 +1,5 @@
-restore case_2_shell_r.brep a
-restore case_2_wire2.brep b
+restore [locate_data_file case_2_shell_r.brep] a
+restore [locate_data_file case_2_wire2.brep] b
 bop a b
 boptuc result
 set length 3176.78
diff --git a/tests/boolean/boptuc_2d/C3 b/tests/boolean/boptuc_2d/C3
index fef74cc7f2..a77f1d3737 100644
--- a/tests/boolean/boptuc_2d/C3
+++ b/tests/boolean/boptuc_2d/C3
@@ -1,5 +1,5 @@
-restore case_2_shell_r.brep a
-restore case_2_wire3.brep b
+restore [locate_data_file case_2_shell_r.brep] a
+restore [locate_data_file case_2_wire3.brep] b
 bop a b
 boptuc result
 #set length 3176.78
diff --git a/tests/boolean/boptuc_2d/C4 b/tests/boolean/boptuc_2d/C4
index b16dd2001c..eba7555852 100644
--- a/tests/boolean/boptuc_2d/C4
+++ b/tests/boolean/boptuc_2d/C4
@@ -1,5 +1,5 @@
-restore case_2_face_r.brep a
-restore case_2_edge1.brep b
+restore [locate_data_file case_2_face_r.brep] a
+restore [locate_data_file case_2_edge1.brep] b
 bop a b
 boptuc result
 #set length 2058.17
diff --git a/tests/boolean/boptuc_2d/C5 b/tests/boolean/boptuc_2d/C5
index 0137814551..5fbfc2c44c 100644
--- a/tests/boolean/boptuc_2d/C5
+++ b/tests/boolean/boptuc_2d/C5
@@ -1,5 +1,5 @@
-restore case_2_face_r.brep a
-restore case_2_edge3.brep b
+restore [locate_data_file case_2_face_r.brep] a
+restore [locate_data_file case_2_edge3.brep] b
 bop a b
 boptuc result
 #set length 2058.17
diff --git a/tests/boolean/boptuc_2d/C6 b/tests/boolean/boptuc_2d/C6
index 7ddb143167..2db1823019 100644
--- a/tests/boolean/boptuc_2d/C6
+++ b/tests/boolean/boptuc_2d/C6
@@ -1,5 +1,5 @@
-restore case_2_face_r.brep a
-restore case_2_wire1.brep b
+restore [locate_data_file case_2_face_r.brep] a
+restore [locate_data_file case_2_wire1.brep] b
 bop a b
 boptuc result
 #set length 3176.78
diff --git a/tests/boolean/boptuc_2d/C7 b/tests/boolean/boptuc_2d/C7
index 3711e0ca9a..127993359b 100644
--- a/tests/boolean/boptuc_2d/C7
+++ b/tests/boolean/boptuc_2d/C7
@@ -1,5 +1,5 @@
-restore case_2_face_r.brep a
-restore case_2_wire3.brep b
+restore [locate_data_file case_2_face_r.brep] a
+restore [locate_data_file case_2_wire3.brep] b
 bop a b
 boptuc result
 set length 2329.96
diff --git a/tests/boolean/boptuc_2d/C8 b/tests/boolean/boptuc_2d/C8
index 9a5d955800..968e038034 100644
--- a/tests/boolean/boptuc_2d/C8
+++ b/tests/boolean/boptuc_2d/C8
@@ -1,5 +1,5 @@
-restore case_3_solid.brep a
-restore case_3_edge1.brep b
+restore [locate_data_file case_3_solid.brep] a
+restore [locate_data_file case_3_edge1.brep] b
 bop a b
 boptuc result
 set length empty
diff --git a/tests/boolean/boptuc_2d/C9 b/tests/boolean/boptuc_2d/C9
index 59be07c5d6..d1bb7aa2cd 100644
--- a/tests/boolean/boptuc_2d/C9
+++ b/tests/boolean/boptuc_2d/C9
@@ -1,5 +1,5 @@
-restore case_3_solid.brep a
-restore case_3_edge2.brep b
+restore [locate_data_file case_3_solid.brep] a
+restore [locate_data_file case_3_edge2.brep] b
 bop a b
 boptuc result
 set length empty
diff --git a/tests/boolean/boptuc_2d/D1 b/tests/boolean/boptuc_2d/D1
index b7b598b44a..bb1860da4f 100644
--- a/tests/boolean/boptuc_2d/D1
+++ b/tests/boolean/boptuc_2d/D1
@@ -1,5 +1,5 @@
-restore case_3_solid.brep a
-restore case_3_wire1.brep b
+restore [locate_data_file case_3_solid.brep] a
+restore [locate_data_file case_3_wire1.brep] b
 bop a b
 boptuc result
 set length 103.485
diff --git a/tests/boolean/boptuc_2d/D2 b/tests/boolean/boptuc_2d/D2
index 7ace6f4968..ab711f11b6 100644
--- a/tests/boolean/boptuc_2d/D2
+++ b/tests/boolean/boptuc_2d/D2
@@ -1,5 +1,5 @@
-restore case_3_solid.brep a
-restore case_3_wire2.brep b
+restore [locate_data_file case_3_solid.brep] a
+restore [locate_data_file case_3_wire2.brep] b
 bop a b
 boptuc result
 set length 103.485
diff --git a/tests/boolean/boptuc_2d/D3 b/tests/boolean/boptuc_2d/D3
index 6821ed12e3..e5d16dd69b 100644
--- a/tests/boolean/boptuc_2d/D3
+++ b/tests/boolean/boptuc_2d/D3
@@ -1,5 +1,5 @@
-restore case_3_solid.brep a
-restore case_3_wire3.brep b
+restore [locate_data_file case_3_solid.brep] a
+restore [locate_data_file case_3_wire3.brep] b
 bop a b
 boptuc result
 set length 234.903
diff --git a/tests/boolean/boptuc_2d/D4 b/tests/boolean/boptuc_2d/D4
index 67ef7b13e4..61047a5806 100644
--- a/tests/boolean/boptuc_2d/D4
+++ b/tests/boolean/boptuc_2d/D4
@@ -1,5 +1,5 @@
-restore case_3_solid.brep a
-restore case_3_wire4.brep b
+restore [locate_data_file case_3_solid.brep] a
+restore [locate_data_file case_3_wire4.brep] b
 bop a b
 boptuc result
 set length 234.903
diff --git a/tests/boolean/boptuc_2d/D5 b/tests/boolean/boptuc_2d/D5
index 6e5dcb6f20..ac261cce70 100644
--- a/tests/boolean/boptuc_2d/D5
+++ b/tests/boolean/boptuc_2d/D5
@@ -1,5 +1,5 @@
-restore case_3_solid.brep a
-restore case_3_wire5.brep b
+restore [locate_data_file case_3_solid.brep] a
+restore [locate_data_file case_3_wire5.brep] b
 bop a b
 boptuc result
 set length empty
diff --git a/tests/boolean/boptuc_2d/D6 b/tests/boolean/boptuc_2d/D6
index 564745a3c4..f25c4f853a 100644
--- a/tests/boolean/boptuc_2d/D6
+++ b/tests/boolean/boptuc_2d/D6
@@ -1,5 +1,5 @@
-restore case_3_shell.brep a
-restore case_3_edge1.brep b
+restore [locate_data_file case_3_shell.brep] a
+restore [locate_data_file case_3_edge1.brep] b
 bop a b
 boptuc result
 set length empty
diff --git a/tests/boolean/boptuc_2d/D7 b/tests/boolean/boptuc_2d/D7
index 05391f1e4e..c724864c74 100644
--- a/tests/boolean/boptuc_2d/D7
+++ b/tests/boolean/boptuc_2d/D7
@@ -1,5 +1,5 @@
-restore case_3_shell.brep a
-restore case_3_edge2.brep b
+restore [locate_data_file case_3_shell.brep] a
+restore [locate_data_file case_3_edge2.brep] b
 bop a b
 boptuc result
 set length empty
diff --git a/tests/boolean/boptuc_2d/D8 b/tests/boolean/boptuc_2d/D8
index 7a93ed49c0..ab4d40ae0d 100644
--- a/tests/boolean/boptuc_2d/D8
+++ b/tests/boolean/boptuc_2d/D8
@@ -1,5 +1,5 @@
-restore case_3_shell.brep a
-restore case_3_wire1.brep b
+restore [locate_data_file case_3_shell.brep] a
+restore [locate_data_file case_3_wire1.brep] b
 bop a b
 boptuc result
 set length 103.485
diff --git a/tests/boolean/boptuc_2d/D9 b/tests/boolean/boptuc_2d/D9
index 698c85d5e0..34874d5ad7 100644
--- a/tests/boolean/boptuc_2d/D9
+++ b/tests/boolean/boptuc_2d/D9
@@ -1,5 +1,5 @@
-restore case_3_shell.brep a
-restore case_3_wire2.brep b
+restore [locate_data_file case_3_shell.brep] a
+restore [locate_data_file case_3_wire2.brep] b
 bop a b
 boptuc result
 set length 103.485
diff --git a/tests/boolean/boptuc_2d/E1 b/tests/boolean/boptuc_2d/E1
index d4235b9578..99c270479e 100644
--- a/tests/boolean/boptuc_2d/E1
+++ b/tests/boolean/boptuc_2d/E1
@@ -1,5 +1,5 @@
-restore case_3_shell.brep a
-restore case_3_wire3.brep b
+restore [locate_data_file case_3_shell.brep] a
+restore [locate_data_file case_3_wire3.brep] b
 bop a b
 boptuc result
 set length 234.903
diff --git a/tests/boolean/boptuc_2d/E2 b/tests/boolean/boptuc_2d/E2
index d420fd0bfd..d67b5dd55b 100644
--- a/tests/boolean/boptuc_2d/E2
+++ b/tests/boolean/boptuc_2d/E2
@@ -1,5 +1,5 @@
-restore case_3_shell.brep a
-restore case_3_wire4.brep b
+restore [locate_data_file case_3_shell.brep] a
+restore [locate_data_file case_3_wire4.brep] b
 bop a b
 boptuc result
 set length 234.903
diff --git a/tests/boolean/boptuc_2d/E3 b/tests/boolean/boptuc_2d/E3
index e2cf981f5f..9467cf418f 100644
--- a/tests/boolean/boptuc_2d/E3
+++ b/tests/boolean/boptuc_2d/E3
@@ -1,5 +1,5 @@
-restore case_3_shell.brep a
-restore case_3_wire5.brep b
+restore [locate_data_file case_3_shell.brep] a
+restore [locate_data_file case_3_wire5.brep] b
 bop a b
 boptuc result
 set length empty
diff --git a/tests/boolean/boptuc_2d/E4 b/tests/boolean/boptuc_2d/E4
index eef633ddc5..fcda3e819a 100644
--- a/tests/boolean/boptuc_2d/E4
+++ b/tests/boolean/boptuc_2d/E4
@@ -1,5 +1,5 @@
-restore case_3_face.brep a
-restore case_3_edge1.brep b
+restore [locate_data_file case_3_face.brep] a
+restore [locate_data_file case_3_edge1.brep] b
 bop a b
 boptuc result
 set length empty
diff --git a/tests/boolean/boptuc_2d/E5 b/tests/boolean/boptuc_2d/E5
index 83dc79a893..3d21aebb28 100644
--- a/tests/boolean/boptuc_2d/E5
+++ b/tests/boolean/boptuc_2d/E5
@@ -1,5 +1,5 @@
-restore case_4_shell.brep a
-restore case_4_wire3.brep b
+restore [locate_data_file case_4_shell.brep] a
+restore [locate_data_file case_4_wire3.brep] b
 bop a b
 boptuc result
 set length 929.278
diff --git a/tests/boolean/boptuc_2d/E6 b/tests/boolean/boptuc_2d/E6
index 2ebb5b10e4..7e49e27d47 100644
--- a/tests/boolean/boptuc_2d/E6
+++ b/tests/boolean/boptuc_2d/E6
@@ -1,5 +1,5 @@
-restore case_3_face.brep a
-restore case_3_wire2.brep b
+restore [locate_data_file case_3_face.brep] a
+restore [locate_data_file case_3_wire2.brep] b
 bop a b
 boptuc result
 set length 103.485
diff --git a/tests/boolean/boptuc_2d/E7 b/tests/boolean/boptuc_2d/E7
index af6c0b9828..80b74d24b6 100644
--- a/tests/boolean/boptuc_2d/E7
+++ b/tests/boolean/boptuc_2d/E7
@@ -1,5 +1,5 @@
-restore case_3_face.brep a
-restore case_3_wire5.brep b
+restore [locate_data_file case_3_face.brep] a
+restore [locate_data_file case_3_wire5.brep] b
 bop a b
 boptuc result
 set length 226.366
diff --git a/tests/boolean/boptuc_2d/E8 b/tests/boolean/boptuc_2d/E8
index 443c5c0fd5..e886f427f9 100644
--- a/tests/boolean/boptuc_2d/E8
+++ b/tests/boolean/boptuc_2d/E8
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_edge1.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_edge1.brep] b
 bop a b
 boptuc result
 set length empty
diff --git a/tests/boolean/boptuc_2d/E9 b/tests/boolean/boptuc_2d/E9
index 529bc036a5..06e7fd46d3 100644
--- a/tests/boolean/boptuc_2d/E9
+++ b/tests/boolean/boptuc_2d/E9
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_wire1.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_wire1.brep] b
 bop a b
 boptuc result
 set length 103.485
diff --git a/tests/boolean/boptuc_2d/F1 b/tests/boolean/boptuc_2d/F1
index dbe1b9f22e..1beccf3b66 100644
--- a/tests/boolean/boptuc_2d/F1
+++ b/tests/boolean/boptuc_2d/F1
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_wire2.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_wire2.brep] b
 bop a b
 boptuc result
 set length 103.485
diff --git a/tests/boolean/boptuc_2d/F2 b/tests/boolean/boptuc_2d/F2
index df73cf2312..9df0041fa7 100644
--- a/tests/boolean/boptuc_2d/F2
+++ b/tests/boolean/boptuc_2d/F2
@@ -1,5 +1,5 @@
-restore case_3_wire.brep a
-restore case_3_wire5.brep b
+restore [locate_data_file case_3_wire.brep] a
+restore [locate_data_file case_3_wire5.brep] b
 bop a b
 boptuc result
 set length 226.366
diff --git a/tests/boolean/boptuc_2d/F3 b/tests/boolean/boptuc_2d/F3
index 6b57726086..129b811c65 100644
--- a/tests/boolean/boptuc_2d/F3
+++ b/tests/boolean/boptuc_2d/F3
@@ -1,5 +1,5 @@
-restore case_4_solid.brep a
-restore case_4_edge1.brep b
+restore [locate_data_file case_4_solid.brep] a
+restore [locate_data_file case_4_edge1.brep] b
 bop a b
 boptuc result
 set length empty
diff --git a/tests/boolean/boptuc_2d/F4 b/tests/boolean/boptuc_2d/F4
index 9a492dd442..c2666b7c8c 100644
--- a/tests/boolean/boptuc_2d/F4
+++ b/tests/boolean/boptuc_2d/F4
@@ -1,5 +1,5 @@
-restore case_4_solid.brep a
-restore case_4_edge2.brep b
+restore [locate_data_file case_4_solid.brep] a
+restore [locate_data_file case_4_edge2.brep] b
 bop a b
 boptuc result
 set length empty
diff --git a/tests/boolean/boptuc_2d/F5 b/tests/boolean/boptuc_2d/F5
index e8b86aa2f6..b102ec81bf 100644
--- a/tests/boolean/boptuc_2d/F5
+++ b/tests/boolean/boptuc_2d/F5
@@ -1,5 +1,5 @@
-restore case_4_solid.brep a
-restore case_4_edge3.brep b
+restore [locate_data_file case_4_solid.brep] a
+restore [locate_data_file case_4_edge3.brep] b
 bop a b
 boptuc result
 set length 589.551
diff --git a/tests/boolean/boptuc_2d/F6 b/tests/boolean/boptuc_2d/F6
index bbda0b1460..b9641fabbc 100644
--- a/tests/boolean/boptuc_2d/F6
+++ b/tests/boolean/boptuc_2d/F6
@@ -1,5 +1,5 @@
-restore case_4_solid.brep a
-restore case_4_wire1.brep b
+restore [locate_data_file case_4_solid.brep] a
+restore [locate_data_file case_4_wire1.brep] b
 bop a b
 boptuc result
 set length empty
diff --git a/tests/boolean/boptuc_2d/F7 b/tests/boolean/boptuc_2d/F7
index 815a2c8d80..8e8b1d4224 100644
--- a/tests/boolean/boptuc_2d/F7
+++ b/tests/boolean/boptuc_2d/F7
@@ -1,5 +1,5 @@
-restore case_4_solid.brep a
-restore case_4_wire2.brep b
+restore [locate_data_file case_4_solid.brep] a
+restore [locate_data_file case_4_wire2.brep] b
 bop a b
 boptuc result
 set length empty
diff --git a/tests/boolean/boptuc_2d/F8 b/tests/boolean/boptuc_2d/F8
index 167cef035b..7c49b63b96 100644
--- a/tests/boolean/boptuc_2d/F8
+++ b/tests/boolean/boptuc_2d/F8
@@ -1,5 +1,5 @@
-restore case_4_solid.brep a
-restore case_4_wire3.brep b
+restore [locate_data_file case_4_solid.brep] a
+restore [locate_data_file case_4_wire3.brep] b
 bop a b
 boptuc result
 set length 1446.99
diff --git a/tests/boolean/boptuc_2d/F9 b/tests/boolean/boptuc_2d/F9
index fe1cd5c121..bd1a5d1263 100644
--- a/tests/boolean/boptuc_2d/F9
+++ b/tests/boolean/boptuc_2d/F9
@@ -1,5 +1,5 @@
-restore case_4_solid.brep a
-restore case_4_wire4.brep b
+restore [locate_data_file case_4_solid.brep] a
+restore [locate_data_file case_4_wire4.brep] b
 bop a b
 boptuc result
 set length 1446.99
diff --git a/tests/boolean/boptuc_2d/G1 b/tests/boolean/boptuc_2d/G1
index 15ba884607..5bc63c0408 100644
--- a/tests/boolean/boptuc_2d/G1
+++ b/tests/boolean/boptuc_2d/G1
@@ -1,5 +1,5 @@
-restore case_4_shell.brep a
-restore case_4_edge1.brep b
+restore [locate_data_file case_4_shell.brep] a
+restore [locate_data_file case_4_edge1.brep] b
 bop a b
 boptuc result
 set length 616.124
diff --git a/tests/boolean/boptuc_2d/G2 b/tests/boolean/boptuc_2d/G2
index 3fe66e43ef..7caee283aa 100644
--- a/tests/boolean/boptuc_2d/G2
+++ b/tests/boolean/boptuc_2d/G2
@@ -1,5 +1,5 @@
-restore case_4_shell.brep a
-restore case_4_edge3.brep b
+restore [locate_data_file case_4_shell.brep] a
+restore [locate_data_file case_4_edge3.brep] b
 bop a b
 boptuc result
 set length 490.752
diff --git a/tests/boolean/boptuc_2d/G3 b/tests/boolean/boptuc_2d/G3
index 935a151f36..64353cfa23 100644
--- a/tests/boolean/boptuc_2d/G3
+++ b/tests/boolean/boptuc_2d/G3
@@ -1,5 +1,5 @@
-restore case_4_shell.brep a
-restore case_4_wire1.brep b
+restore [locate_data_file case_4_shell.brep] a
+restore [locate_data_file case_4_wire1.brep] b
 bop a b
 boptuc result
 set length 1308.66
diff --git a/tests/boolean/boptuc_2d/G4 b/tests/boolean/boptuc_2d/G4
index 83dc79a893..3d21aebb28 100644
--- a/tests/boolean/boptuc_2d/G4
+++ b/tests/boolean/boptuc_2d/G4
@@ -1,5 +1,5 @@
-restore case_4_shell.brep a
-restore case_4_wire3.brep b
+restore [locate_data_file case_4_shell.brep] a
+restore [locate_data_file case_4_wire3.brep] b
 bop a b
 boptuc result
 set length 929.278
diff --git a/tests/boolean/boptuc_2d/G5 b/tests/boolean/boptuc_2d/G5
index 463079d73a..3294e8c1bd 100644
--- a/tests/boolean/boptuc_2d/G5
+++ b/tests/boolean/boptuc_2d/G5
@@ -1,5 +1,5 @@
-restore case_4_face.brep a
-restore case_4_edge1.brep b
+restore [locate_data_file case_4_face.brep] a
+restore [locate_data_file case_4_edge1.brep] b
 bop a b
 boptuc result
 set length 616.124
diff --git a/tests/boolean/boptuc_2d/G6 b/tests/boolean/boptuc_2d/G6
index 916bae510e..33f40795c6 100644
--- a/tests/boolean/boptuc_2d/G6
+++ b/tests/boolean/boptuc_2d/G6
@@ -1,5 +1,5 @@
-restore case_4_face.brep a
-restore case_4_edge3.brep b
+restore [locate_data_file case_4_face.brep] a
+restore [locate_data_file case_4_edge3.brep] b
 bop a b
 boptuc result
 set length 490.752
diff --git a/tests/boolean/boptuc_2d/G7 b/tests/boolean/boptuc_2d/G7
index ea3621bde2..b202a7aa9d 100644
--- a/tests/boolean/boptuc_2d/G7
+++ b/tests/boolean/boptuc_2d/G7
@@ -1,5 +1,5 @@
-restore case_4_face.brep a
-restore case_4_wire1.brep b
+restore [locate_data_file case_4_face.brep] a
+restore [locate_data_file case_4_wire1.brep] b
 bop a b
 boptuc result
 set length 1308.66
diff --git a/tests/boolean/boptuc_2d/G8 b/tests/boolean/boptuc_2d/G8
index 63ce800700..fff1910aeb 100644
--- a/tests/boolean/boptuc_2d/G8
+++ b/tests/boolean/boptuc_2d/G8
@@ -1,5 +1,5 @@
-restore case_4_face.brep a
-restore case_4_wire3.brep b
+restore [locate_data_file case_4_face.brep] a
+restore [locate_data_file case_4_wire3.brep] b
 bop a b
 boptuc result
 set length 929.278
diff --git a/tests/boolean/boptuc_2d/G9 b/tests/boolean/boptuc_2d/G9
index 6f5db4a583..8da6ee1847 100644
--- a/tests/boolean/boptuc_2d/G9
+++ b/tests/boolean/boptuc_2d/G9
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_edge1.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_edge1.brep] b
 bop a b
 boptuc result
 set length 344.173
diff --git a/tests/boolean/boptuc_2d/H1 b/tests/boolean/boptuc_2d/H1
index f6f2e78000..4c79b949e8 100644
--- a/tests/boolean/boptuc_2d/H1
+++ b/tests/boolean/boptuc_2d/H1
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_edge2.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_edge2.brep] b
 bop a b
 boptuc result
 set length 344.173
diff --git a/tests/boolean/boptuc_2d/H2 b/tests/boolean/boptuc_2d/H2
index 23c56365d3..08a63ae440 100644
--- a/tests/boolean/boptuc_2d/H2
+++ b/tests/boolean/boptuc_2d/H2
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_edge3.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_edge3.brep] b
 bop a b
 boptuc result
 set length 135.758
diff --git a/tests/boolean/boptuc_2d/H3 b/tests/boolean/boptuc_2d/H3
index 166209d923..55e132991a 100644
--- a/tests/boolean/boptuc_2d/H3
+++ b/tests/boolean/boptuc_2d/H3
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_wire1.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_wire1.brep] b
 bop a b
 boptuc result
 set length 806.219
diff --git a/tests/boolean/boptuc_2d/H4 b/tests/boolean/boptuc_2d/H4
index 34209ecbfc..4437bf687e 100644
--- a/tests/boolean/boptuc_2d/H4
+++ b/tests/boolean/boptuc_2d/H4
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_wire2.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_wire2.brep] b
 bop a b
 boptuc result
 set length 806.219
diff --git a/tests/boolean/boptuc_2d/H5 b/tests/boolean/boptuc_2d/H5
index ae16a0b7df..03ce090888 100644
--- a/tests/boolean/boptuc_2d/H5
+++ b/tests/boolean/boptuc_2d/H5
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_wire3.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_wire3.brep] b
 bop a b
 boptuc result
 set length 272.04
diff --git a/tests/boolean/boptuc_2d/H6 b/tests/boolean/boptuc_2d/H6
index 02137a9bc4..fcc48513c5 100644
--- a/tests/boolean/boptuc_2d/H6
+++ b/tests/boolean/boptuc_2d/H6
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_wire4.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_wire4.brep] b
 bop a b
 boptuc result
 set length 272.04
diff --git a/tests/boolean/boptuc_2d/H7 b/tests/boolean/boptuc_2d/H7
index d1a59eb86d..bda932cb64 100644
--- a/tests/boolean/boptuc_2d/H7
+++ b/tests/boolean/boptuc_2d/H7
@@ -1,5 +1,5 @@
-restore case_5_solid.brep a
-restore case_5_wire5.brep b
+restore [locate_data_file case_5_solid.brep] a
+restore [locate_data_file case_5_wire5.brep] b
 bop a b
 boptuc result
 set length 2800.52
diff --git a/tests/boolean/boptuc_2d/H8 b/tests/boolean/boptuc_2d/H8
index 06128abc7a..ec323d6f25 100644
--- a/tests/boolean/boptuc_2d/H8
+++ b/tests/boolean/boptuc_2d/H8
@@ -1,5 +1,5 @@
-restore case_5_shell.brep a
-restore case_5_edge1.brep b
+restore [locate_data_file case_5_shell.brep] a
+restore [locate_data_file case_5_edge1.brep] b
 bop a b
 boptuc result
 set length 344.173
diff --git a/tests/boolean/boptuc_2d/H9 b/tests/boolean/boptuc_2d/H9
index 2f8efd5f29..115e4093b6 100644
--- a/tests/boolean/boptuc_2d/H9
+++ b/tests/boolean/boptuc_2d/H9
@@ -1,5 +1,5 @@
-restore case_5_shell.brep a
-restore case_5_edge3.brep b
+restore [locate_data_file case_5_shell.brep] a
+restore [locate_data_file case_5_edge3.brep] b
 bop a b
 boptuc result
 set length 135.758
diff --git a/tests/boolean/boptuc_2d/I1 b/tests/boolean/boptuc_2d/I1
index b2bda7570a..bb690184ec 100644
--- a/tests/boolean/boptuc_2d/I1
+++ b/tests/boolean/boptuc_2d/I1
@@ -1,5 +1,5 @@
-restore case_5_shell.brep a
-restore case_5_wire1.brep b
+restore [locate_data_file case_5_shell.brep] a
+restore [locate_data_file case_5_wire1.brep] b
 bop a b
 boptuc result
 set length 806.219
diff --git a/tests/boolean/boptuc_2d/I2 b/tests/boolean/boptuc_2d/I2
index 99049f42d1..7b1aa188b3 100644
--- a/tests/boolean/boptuc_2d/I2
+++ b/tests/boolean/boptuc_2d/I2
@@ -1,5 +1,5 @@
-restore case_5_shell.brep a
-restore case_5_wire3.brep b
+restore [locate_data_file case_5_shell.brep] a
+restore [locate_data_file case_5_wire3.brep] b
 bop a b
 boptuc result
 set length 272.04
diff --git a/tests/boolean/boptuc_2d/I3 b/tests/boolean/boptuc_2d/I3
index 180ec07e90..1543a24f68 100644
--- a/tests/boolean/boptuc_2d/I3
+++ b/tests/boolean/boptuc_2d/I3
@@ -1,5 +1,5 @@
-restore case_5_shell.brep a
-restore case_5_wire5.brep b
+restore [locate_data_file case_5_shell.brep] a
+restore [locate_data_file case_5_wire5.brep] b
 bop a b
 boptuc result
 set length 2800.52
diff --git a/tests/boolean/boptuc_2d/I4 b/tests/boolean/boptuc_2d/I4
index 8e70781de6..e61b9bdb21 100644
--- a/tests/boolean/boptuc_2d/I4
+++ b/tests/boolean/boptuc_2d/I4
@@ -1,5 +1,5 @@
-restore case_5_face.brep a
-restore case_5_edge1.brep b
+restore [locate_data_file case_5_face.brep] a
+restore [locate_data_file case_5_edge1.brep] b
 bop a b
 boptuc result
 set length 344.173
diff --git a/tests/boolean/boptuc_2d/I5 b/tests/boolean/boptuc_2d/I5
index fe395d43f2..690ea8f630 100644
--- a/tests/boolean/boptuc_2d/I5
+++ b/tests/boolean/boptuc_2d/I5
@@ -1,5 +1,5 @@
-restore case_5_face.brep a
-restore case_5_edge3.brep b
+restore [locate_data_file case_5_face.brep] a
+restore [locate_data_file case_5_edge3.brep] b
 bop a b
 boptuc result
 set length 135.758
diff --git a/tests/boolean/boptuc_2d/I6 b/tests/boolean/boptuc_2d/I6
index 62ca9bdb32..117d1e6de2 100644
--- a/tests/boolean/boptuc_2d/I6
+++ b/tests/boolean/boptuc_2d/I6
@@ -1,5 +1,5 @@
-restore case_5_face.brep a
-restore case_5_wire1.brep b
+restore [locate_data_file case_5_face.brep] a
+restore [locate_data_file case_5_wire1.brep] b
 bop a b
 boptuc result
 set length 806.219
diff --git a/tests/boolean/boptuc_2d/I7 b/tests/boolean/boptuc_2d/I7
index 23cd4554e9..6030ba4ffb 100644
--- a/tests/boolean/boptuc_2d/I7
+++ b/tests/boolean/boptuc_2d/I7
@@ -1,5 +1,5 @@
-restore case_5_face.brep a
-restore case_5_wire3.brep b
+restore [locate_data_file case_5_face.brep] a
+restore [locate_data_file case_5_wire3.brep] b
 bop a b
 boptuc result
 set length 272.04
diff --git a/tests/boolean/boptuc_2d/I8 b/tests/boolean/boptuc_2d/I8
index c9a651f0ba..a822dd2b2e 100644
--- a/tests/boolean/boptuc_2d/I8
+++ b/tests/boolean/boptuc_2d/I8
@@ -1,5 +1,5 @@
-restore case_6_solid.brep a
-restore case_6_edge1.brep b
+restore [locate_data_file case_6_solid.brep] a
+restore [locate_data_file case_6_edge1.brep] b
 bop a b
 boptuc result
 set length 819.435
diff --git a/tests/boolean/boptuc_2d/I9 b/tests/boolean/boptuc_2d/I9
index 83069ad14d..5c623b72c6 100644
--- a/tests/boolean/boptuc_2d/I9
+++ b/tests/boolean/boptuc_2d/I9
@@ -1,5 +1,5 @@
-restore case_6_solid.brep a
-restore case_6_edge2.brep b
+restore [locate_data_file case_6_solid.brep] a
+restore [locate_data_file case_6_edge2.brep] b
 bop a b
 boptuc result
 set length 616.124
diff --git a/tests/boolean/boptuc_2d/J1 b/tests/boolean/boptuc_2d/J1
index dc81e6c94f..c63dfe111f 100644
--- a/tests/boolean/boptuc_2d/J1
+++ b/tests/boolean/boptuc_2d/J1
@@ -1,5 +1,5 @@
-restore case_6_solid.brep a
-restore case_6_edge3.brep b
+restore [locate_data_file case_6_solid.brep] a
+restore [locate_data_file case_6_edge3.brep] b
 bop a b
 boptuc result
 set length 729.781
diff --git a/tests/boolean/boptuc_2d/J2 b/tests/boolean/boptuc_2d/J2
index cceb6adaf4..5400e07e83 100644
--- a/tests/boolean/boptuc_2d/J2
+++ b/tests/boolean/boptuc_2d/J2
@@ -1,5 +1,5 @@
-restore case_6_solid.brep a
-restore case_6_wire1.brep b
+restore [locate_data_file case_6_solid.brep] a
+restore [locate_data_file case_6_wire1.brep] b
 bop a b
 boptuc result
 set length 1738.37
diff --git a/tests/boolean/boptuc_2d/J3 b/tests/boolean/boptuc_2d/J3
index b9b72f3dc4..009a08ec17 100644
--- a/tests/boolean/boptuc_2d/J3
+++ b/tests/boolean/boptuc_2d/J3
@@ -1,5 +1,5 @@
-restore case_6_solid.brep a
-restore case_6_wire2.brep b
+restore [locate_data_file case_6_solid.brep] a
+restore [locate_data_file case_6_wire2.brep] b
 bop a b
 boptuc result
 set length 1308.66
diff --git a/tests/boolean/boptuc_2d/J4 b/tests/boolean/boptuc_2d/J4
index 39926d4089..89cf9d3537 100644
--- a/tests/boolean/boptuc_2d/J4
+++ b/tests/boolean/boptuc_2d/J4
@@ -1,5 +1,5 @@
-restore case_6_solid.brep a
-restore case_6_wire3.brep b
+restore [locate_data_file case_6_solid.brep] a
+restore [locate_data_file case_6_wire3.brep] b
 bop a b
 boptuc result
 set length 1450.39
diff --git a/tests/boolean/boptuc_2d/J5 b/tests/boolean/boptuc_2d/J5
index 62b0d197ec..16b63c661a 100644
--- a/tests/boolean/boptuc_2d/J5
+++ b/tests/boolean/boptuc_2d/J5
@@ -1,5 +1,5 @@
-restore case_6_solid.brep a
-restore case_6_wire4.brep b
+restore [locate_data_file case_6_solid.brep] a
+restore [locate_data_file case_6_wire4.brep] b
 bop a b
 boptuc result
 set length 929.278
diff --git a/tests/boolean/boptuc_2d/J6 b/tests/boolean/boptuc_2d/J6
index 3583903e9c..6c7e3129dc 100644
--- a/tests/boolean/boptuc_2d/J6
+++ b/tests/boolean/boptuc_2d/J6
@@ -1,5 +1,5 @@
-restore case_6_shell.brep a
-restore case_6_edge1.brep b
+restore [locate_data_file case_6_shell.brep] a
+restore [locate_data_file case_6_edge1.brep] b
 bop a b
 boptuc result
 set length 819.435
diff --git a/tests/boolean/boptuc_2d/J7 b/tests/boolean/boptuc_2d/J7
index 97fd1aab4c..ae9ef43add 100644
--- a/tests/boolean/boptuc_2d/J7
+++ b/tests/boolean/boptuc_2d/J7
@@ -1,5 +1,5 @@
-restore case_6_shell.brep a
-restore case_6_edge3.brep b
+restore [locate_data_file case_6_shell.brep] a
+restore [locate_data_file case_6_edge3.brep] b
 bop a b
 boptuc result
 set length 729.781
diff --git a/tests/boolean/boptuc_2d/J8 b/tests/boolean/boptuc_2d/J8
index 5c089f9f34..1a78f35f9d 100644
--- a/tests/boolean/boptuc_2d/J8
+++ b/tests/boolean/boptuc_2d/J8
@@ -1,5 +1,5 @@
-restore case_6_shell.brep a
-restore case_6_wire1.brep b
+restore [locate_data_file case_6_shell.brep] a
+restore [locate_data_file case_6_wire1.brep] b
 bop a b
 boptuc result
 set length 1738.37
diff --git a/tests/boolean/boptuc_2d/J9 b/tests/boolean/boptuc_2d/J9
index 5a14589ef1..fe290dffb7 100644
--- a/tests/boolean/boptuc_2d/J9
+++ b/tests/boolean/boptuc_2d/J9
@@ -1,5 +1,5 @@
-restore case_6_shell.brep a
-restore case_6_wire3.brep b
+restore [locate_data_file case_6_shell.brep] a
+restore [locate_data_file case_6_wire3.brep] b
 bop a b
 boptuc result
 set length 1450.39
diff --git a/tests/boolean/boptuc_2d/K1 b/tests/boolean/boptuc_2d/K1
index 485b635f0f..2ecc009d7a 100644
--- a/tests/boolean/boptuc_2d/K1
+++ b/tests/boolean/boptuc_2d/K1
@@ -1,5 +1,5 @@
-restore case_6_face.brep a
-restore case_6_edge1.brep b
+restore [locate_data_file case_6_face.brep] a
+restore [locate_data_file case_6_edge1.brep] b
 bop a b
 boptuc result
 set length 819.435
diff --git a/tests/boolean/boptuc_2d/K2 b/tests/boolean/boptuc_2d/K2
index c169637b5b..ee8bafc880 100644
--- a/tests/boolean/boptuc_2d/K2
+++ b/tests/boolean/boptuc_2d/K2
@@ -1,5 +1,5 @@
-restore case_6_face.brep a
-restore case_6_edge3.brep b
+restore [locate_data_file case_6_face.brep] a
+restore [locate_data_file case_6_edge3.brep] b
 bop a b
 boptuc result
 set length 729.781
diff --git a/tests/boolean/boptuc_2d/K3 b/tests/boolean/boptuc_2d/K3
index 7c5625ef03..abd60d96b7 100644
--- a/tests/boolean/boptuc_2d/K3
+++ b/tests/boolean/boptuc_2d/K3
@@ -1,5 +1,5 @@
-restore case_6_face.brep a
-restore case_6_wire1.brep b
+restore [locate_data_file case_6_face.brep] a
+restore [locate_data_file case_6_wire1.brep] b
 bop a b
 boptuc result
 set length 1738.37
diff --git a/tests/boolean/boptuc_2d/K4 b/tests/boolean/boptuc_2d/K4
index 4f1ef2e3d0..bfe569510a 100644
--- a/tests/boolean/boptuc_2d/K4
+++ b/tests/boolean/boptuc_2d/K4
@@ -1,5 +1,5 @@
-restore case_6_face.brep a
-restore case_6_wire3.brep b
+restore [locate_data_file case_6_face.brep] a
+restore [locate_data_file case_6_wire3.brep] b
 bop a b
 boptuc result
 set length 1450.39
diff --git a/tests/boolean/boptuc_2d/K5 b/tests/boolean/boptuc_2d/K5
index d101c24485..fb36756aba 100644
--- a/tests/boolean/boptuc_2d/K5
+++ b/tests/boolean/boptuc_2d/K5
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_edge1.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_edge1.brep] b
 bop a b
 boptuc result
 set length 632.537
diff --git a/tests/boolean/boptuc_2d/K6 b/tests/boolean/boptuc_2d/K6
index ed87f47c23..1d800bc63e 100644
--- a/tests/boolean/boptuc_2d/K6
+++ b/tests/boolean/boptuc_2d/K6
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_edge2.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_edge2.brep] b
 bop a b
 boptuc result
 set length 632.537
diff --git a/tests/boolean/boptuc_2d/K7 b/tests/boolean/boptuc_2d/K7
index 77bf6352ed..d4f0fe8ed8 100644
--- a/tests/boolean/boptuc_2d/K7
+++ b/tests/boolean/boptuc_2d/K7
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_edge3.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_edge3.brep] b
 bop a b
 boptuc result
 set length 710.965
diff --git a/tests/boolean/boptuc_2d/K8 b/tests/boolean/boptuc_2d/K8
index 0b076485af..c1e627197b 100644
--- a/tests/boolean/boptuc_2d/K8
+++ b/tests/boolean/boptuc_2d/K8
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_edge4.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_edge4.brep] b
 bop a b
 boptuc result
 set length 710.965
diff --git a/tests/boolean/boptuc_2d/K9 b/tests/boolean/boptuc_2d/K9
index f752ecdc6f..80978ad4fb 100644
--- a/tests/boolean/boptuc_2d/K9
+++ b/tests/boolean/boptuc_2d/K9
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_wire1.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_wire1.brep] b
 bop a b
 boptuc result
 set length 2498.39
diff --git a/tests/boolean/boptuc_2d/L1 b/tests/boolean/boptuc_2d/L1
index 912595be5a..6f8c8094a3 100644
--- a/tests/boolean/boptuc_2d/L1
+++ b/tests/boolean/boptuc_2d/L1
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_wire2.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_wire2.brep] b
 bop a b
 boptuc result
 set length 2498.39
diff --git a/tests/boolean/boptuc_2d/L2 b/tests/boolean/boptuc_2d/L2
index 1a57e3553b..10aa526753 100644
--- a/tests/boolean/boptuc_2d/L2
+++ b/tests/boolean/boptuc_2d/L2
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_wire3.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_wire3.brep] b
 bop a b
 boptuc result
 set length 2033.56
diff --git a/tests/boolean/boptuc_2d/L3 b/tests/boolean/boptuc_2d/L3
index 825a0d3823..c2a27f614c 100644
--- a/tests/boolean/boptuc_2d/L3
+++ b/tests/boolean/boptuc_2d/L3
@@ -1,5 +1,5 @@
-restore case_7_solid.brep a
-restore case_7_wire4.brep b
+restore [locate_data_file case_7_solid.brep] a
+restore [locate_data_file case_7_wire4.brep] b
 bop a b
 boptuc result
 set length 2033.56
diff --git a/tests/boolean/boptuc_2d/L4 b/tests/boolean/boptuc_2d/L4
index ae8046e182..3bacb746d1 100644
--- a/tests/boolean/boptuc_2d/L4
+++ b/tests/boolean/boptuc_2d/L4
@@ -1,5 +1,5 @@
-restore case_7_shell.brep a
-restore case_7_edge1.brep b
+restore [locate_data_file case_7_shell.brep] a
+restore [locate_data_file case_7_edge1.brep] b
 bop a b
 boptuc result
 set length 632.537
diff --git a/tests/boolean/boptuc_2d/L5 b/tests/boolean/boptuc_2d/L5
index ad72408e31..703d9f8acf 100644
--- a/tests/boolean/boptuc_2d/L5
+++ b/tests/boolean/boptuc_2d/L5
@@ -1,5 +1,5 @@
-restore case_7_shell.brep a
-restore case_7_edge3.brep b
+restore [locate_data_file case_7_shell.brep] a
+restore [locate_data_file case_7_edge3.brep] b
 bop a b
 boptuc result
 set length 710.965
diff --git a/tests/boolean/boptuc_2d/L6 b/tests/boolean/boptuc_2d/L6
index 9315d4ca3d..047dc79e0e 100644
--- a/tests/boolean/boptuc_2d/L6
+++ b/tests/boolean/boptuc_2d/L6
@@ -1,5 +1,5 @@
-restore case_7_shell.brep a
-restore case_7_wire1.brep b
+restore [locate_data_file case_7_shell.brep] a
+restore [locate_data_file case_7_wire1.brep] b
 bop a b
 boptuc result
 set length 2498.39
diff --git a/tests/boolean/boptuc_2d/L7 b/tests/boolean/boptuc_2d/L7
index 716f722e08..7712adcddf 100644
--- a/tests/boolean/boptuc_2d/L7
+++ b/tests/boolean/boptuc_2d/L7
@@ -1,5 +1,5 @@
-restore case_7_shell.brep a
-restore case_7_wire3.brep b
+restore [locate_data_file case_7_shell.brep] a
+restore [locate_data_file case_7_wire3.brep] b
 bop a b
 boptuc result
 set length 2033.56
diff --git a/tests/boolean/boptuc_2d/L8 b/tests/boolean/boptuc_2d/L8
index 69c0319994..8b28b24b4e 100644
--- a/tests/boolean/boptuc_2d/L8
+++ b/tests/boolean/boptuc_2d/L8
@@ -1,5 +1,5 @@
-restore case_7_face.brep a
-restore case_7_edge1.brep b
+restore [locate_data_file case_7_face.brep] a
+restore [locate_data_file case_7_edge1.brep] b
 bop a b
 boptuc result
 set length 632.537
diff --git a/tests/boolean/boptuc_2d/L9 b/tests/boolean/boptuc_2d/L9
index 71bf0c2e1b..2bc6e2c3e1 100644
--- a/tests/boolean/boptuc_2d/L9
+++ b/tests/boolean/boptuc_2d/L9
@@ -1,5 +1,5 @@
-restore case_7_face.brep a
-restore case_7_edge3.brep b
+restore [locate_data_file case_7_face.brep] a
+restore [locate_data_file case_7_edge3.brep] b
 bop a b
 boptuc result
 set length 710.965
diff --git a/tests/boolean/boptuc_2d/M1 b/tests/boolean/boptuc_2d/M1
index 97fd4752cd..534f57bc48 100644
--- a/tests/boolean/boptuc_2d/M1
+++ b/tests/boolean/boptuc_2d/M1
@@ -1,5 +1,5 @@
-restore case_7_face.brep a
-restore case_7_wire1.brep b
+restore [locate_data_file case_7_face.brep] a
+restore [locate_data_file case_7_wire1.brep] b
 bop a b
 boptuc result
 set length 2498.39
diff --git a/tests/boolean/boptuc_2d/M2 b/tests/boolean/boptuc_2d/M2
index fccddd758e..01e4fa18e4 100644
--- a/tests/boolean/boptuc_2d/M2
+++ b/tests/boolean/boptuc_2d/M2
@@ -1,5 +1,5 @@
-restore case_7_face.brep a
-restore case_7_wire3.brep b
+restore [locate_data_file case_7_face.brep] a
+restore [locate_data_file case_7_wire3.brep] b
 bop a b
 boptuc result
 set length 2033.56
diff --git a/tests/boolean/boptuc_2d/M3 b/tests/boolean/boptuc_2d/M3
index f3bcfde18f..8b71a0a62c 100644
--- a/tests/boolean/boptuc_2d/M3
+++ b/tests/boolean/boptuc_2d/M3
@@ -1,5 +1,5 @@
-restore case_8_solid_repaired.brep a
-restore case_8_wire1.brep b
+restore [locate_data_file case_8_solid_repaired.brep] a
+restore [locate_data_file case_8_wire1.brep] b
 bop a b
 boptuc result
 set length 393.479
diff --git a/tests/boolean/boptuc_2d/M4 b/tests/boolean/boptuc_2d/M4
index 80bc1d7fe5..472fcd23f7 100644
--- a/tests/boolean/boptuc_2d/M4
+++ b/tests/boolean/boptuc_2d/M4
@@ -1,5 +1,5 @@
-restore case_8_solid_repaired.brep a
-restore case_8_wire2.brep b
+restore [locate_data_file case_8_solid_repaired.brep] a
+restore [locate_data_file case_8_wire2.brep] b
 bop a b
 boptuc result
 set length 472.684
diff --git a/tests/boolean/boptuc_2d/M5 b/tests/boolean/boptuc_2d/M5
index 093775dc21..4a52ed3fab 100644
--- a/tests/boolean/boptuc_2d/M5
+++ b/tests/boolean/boptuc_2d/M5
@@ -1,5 +1,5 @@
-restore case_8_solid_repaired.brep a
-restore case_8_wire3.brep b
+restore [locate_data_file case_8_solid_repaired.brep] a
+restore [locate_data_file case_8_wire3.brep] b
 bop a b
 boptuc result
 set length 518.811
diff --git a/tests/boolean/boptuc_2d/M6 b/tests/boolean/boptuc_2d/M6
index e4cdd5bfe5..1bb935a6f6 100644
--- a/tests/boolean/boptuc_2d/M6
+++ b/tests/boolean/boptuc_2d/M6
@@ -1,5 +1,5 @@
-restore case_8_solid_repaired.brep a
-restore case_8_wire4.brep b
+restore [locate_data_file case_8_solid_repaired.brep] a
+restore [locate_data_file case_8_wire4.brep] b
 bop a b
 boptuc result
 set length 517.136
diff --git a/tests/boolean/boptuc_2d/M7 b/tests/boolean/boptuc_2d/M7
index 242d8cc375..d9eae81299 100644
--- a/tests/boolean/boptuc_2d/M7
+++ b/tests/boolean/boptuc_2d/M7
@@ -1,5 +1,5 @@
-restore case_8_solid_repaired.brep a
-restore case_8_wire5.brep b
+restore [locate_data_file case_8_solid_repaired.brep] a
+restore [locate_data_file case_8_wire5.brep] b
 bop a b
 boptuc result
 set length 1349.4
diff --git a/tests/boolean/boptuc_2d/M8 b/tests/boolean/boptuc_2d/M8
index 59765eea1e..7663eec03b 100644
--- a/tests/boolean/boptuc_2d/M8
+++ b/tests/boolean/boptuc_2d/M8
@@ -1,5 +1,5 @@
-restore case_8_solid_repaired.brep a
-restore case_8_wire6.brep b
+restore [locate_data_file case_8_solid_repaired.brep] a
+restore [locate_data_file case_8_wire6.brep] b
 bop a b
 boptuc result
 set length 1476.21
diff --git a/tests/boolean/boptuc_2d/M9 b/tests/boolean/boptuc_2d/M9
index b92f950d3a..0099c2a48e 100644
--- a/tests/boolean/boptuc_2d/M9
+++ b/tests/boolean/boptuc_2d/M9
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge1.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge1.brep] b
 bop a b
 boptuc result
 set length empty
diff --git a/tests/boolean/boptuc_2d/N1 b/tests/boolean/boptuc_2d/N1
index cba4b18d9d..ace09aad30 100644
--- a/tests/boolean/boptuc_2d/N1
+++ b/tests/boolean/boptuc_2d/N1
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge2.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge2.brep] b
 bop a b
 boptuc result
 set length 111.749
diff --git a/tests/boolean/boptuc_2d/N2 b/tests/boolean/boptuc_2d/N2
index 01f6f68c76..9c29b1532e 100644
--- a/tests/boolean/boptuc_2d/N2
+++ b/tests/boolean/boptuc_2d/N2
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge3.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge3.brep] b
 bop a b
 boptuc result
 set length 206.213
diff --git a/tests/boolean/boptuc_2d/N3 b/tests/boolean/boptuc_2d/N3
index 079353221b..11596b6aa3 100644
--- a/tests/boolean/boptuc_2d/N3
+++ b/tests/boolean/boptuc_2d/N3
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge4.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge4.brep] b
 bop a b
 boptuc result
 set length 81.6175
diff --git a/tests/boolean/boptuc_2d/N4 b/tests/boolean/boptuc_2d/N4
index 5b0d245010..0f67f8c005 100644
--- a/tests/boolean/boptuc_2d/N4
+++ b/tests/boolean/boptuc_2d/N4
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_edge5.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_edge5.brep] b
 bop a b
 boptuc result
 set length 270.1
diff --git a/tests/boolean/boptuc_2d/N5 b/tests/boolean/boptuc_2d/N5
index b177adb125..531a095945 100644
--- a/tests/boolean/boptuc_2d/N5
+++ b/tests/boolean/boptuc_2d/N5
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_wire1.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_wire1.brep] b
 bop a b
 boptuc result
 set length 763.834
diff --git a/tests/boolean/boptuc_2d/N6 b/tests/boolean/boptuc_2d/N6
index d92d6f0deb..e1c6a6b0f6 100644
--- a/tests/boolean/boptuc_2d/N6
+++ b/tests/boolean/boptuc_2d/N6
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_wire2.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_wire2.brep] b
 bop a b
 boptuc result
 set length 936.857
diff --git a/tests/boolean/boptuc_2d/N7 b/tests/boolean/boptuc_2d/N7
index 821736a984..64c5121f63 100644
--- a/tests/boolean/boptuc_2d/N7
+++ b/tests/boolean/boptuc_2d/N7
@@ -1,5 +1,5 @@
-restore case_9_wire.brep a
-restore case_9_wire3.brep b
+restore [locate_data_file case_9_wire.brep] a
+restore [locate_data_file case_9_wire3.brep] b
 bop a b
 boptuc result
 set length 1000.74
diff --git a/tests/boolean/boptuc_2d/N8 b/tests/boolean/boptuc_2d/N8
index a478bbafee..2539c25ba6 100644
--- a/tests/boolean/boptuc_2d/N8
+++ b/tests/boolean/boptuc_2d/N8
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge1.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge1.brep] b
 bop a b
 boptuc result
 set length empty
diff --git a/tests/boolean/boptuc_2d/N9 b/tests/boolean/boptuc_2d/N9
index e41a43c557..0c170dc79e 100644
--- a/tests/boolean/boptuc_2d/N9
+++ b/tests/boolean/boptuc_2d/N9
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge2.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge2.brep] b
 bop a b
 boptuc result
 set length 111.749
diff --git a/tests/boolean/boptuc_2d/O1 b/tests/boolean/boptuc_2d/O1
index 94a7aeb2e9..328c119830 100644
--- a/tests/boolean/boptuc_2d/O1
+++ b/tests/boolean/boptuc_2d/O1
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge3.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge3.brep] b
 bop a b
 boptuc result
 set length 350
diff --git a/tests/boolean/boptuc_2d/O2 b/tests/boolean/boptuc_2d/O2
index 9737f27e69..37f8bc72cb 100644
--- a/tests/boolean/boptuc_2d/O2
+++ b/tests/boolean/boptuc_2d/O2
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge4.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge4.brep] b
 bop a b
 boptuc result
 set length 81.6175
diff --git a/tests/boolean/boptuc_2d/O3 b/tests/boolean/boptuc_2d/O3
index 576d74db0c..55f127ea90 100644
--- a/tests/boolean/boptuc_2d/O3
+++ b/tests/boolean/boptuc_2d/O3
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_edge5.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_edge5.brep] b
 bop a b
 boptuc result
 set length 350
diff --git a/tests/boolean/boptuc_2d/O4 b/tests/boolean/boptuc_2d/O4
index 6066b480a1..94fffef4f6 100644
--- a/tests/boolean/boptuc_2d/O4
+++ b/tests/boolean/boptuc_2d/O4
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_wire1.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_wire1.brep] b
 bop a b
 boptuc result
 set length 763.834
diff --git a/tests/boolean/boptuc_2d/O5 b/tests/boolean/boptuc_2d/O5
index a766c71f6c..94ff3ad936 100644
--- a/tests/boolean/boptuc_2d/O5
+++ b/tests/boolean/boptuc_2d/O5
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_wire2.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_wire2.brep] b
 bop a b
 boptuc result
 set length 1080.64
diff --git a/tests/boolean/boptuc_2d/O6 b/tests/boolean/boptuc_2d/O6
index d384eaffef..3397e7022c 100644
--- a/tests/boolean/boptuc_2d/O6
+++ b/tests/boolean/boptuc_2d/O6
@@ -1,5 +1,5 @@
-restore case_9_wire_a.brep a
-restore case_9_wire3.brep b
+restore [locate_data_file case_9_wire_a.brep] a
+restore [locate_data_file case_9_wire3.brep] b
 bop a b
 boptuc result
 set length 1080.64
diff --git a/tests/boolean/boptuc_2d/O7 b/tests/boolean/boptuc_2d/O7
index 7c1ca676c9..a9c4e1a6bc 100644
--- a/tests/boolean/boptuc_2d/O7
+++ b/tests/boolean/boptuc_2d/O7
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge1.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge1.brep] b
 bop a b
 boptuc result
 set length empty
diff --git a/tests/boolean/boptuc_2d/O8 b/tests/boolean/boptuc_2d/O8
index e851cf5455..a9f8183249 100644
--- a/tests/boolean/boptuc_2d/O8
+++ b/tests/boolean/boptuc_2d/O8
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge2.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge2.brep] b
 bop a b
 boptuc result
 set length 111.749
diff --git a/tests/boolean/boptuc_2d/O9 b/tests/boolean/boptuc_2d/O9
index 7c103c00de..a45bde8893 100644
--- a/tests/boolean/boptuc_2d/O9
+++ b/tests/boolean/boptuc_2d/O9
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge3.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge3.brep] b
 bop a b
 boptuc result
 set length 350
diff --git a/tests/boolean/boptuc_2d/P1 b/tests/boolean/boptuc_2d/P1
index 9ad9f98c7f..6eb2530b3d 100644
--- a/tests/boolean/boptuc_2d/P1
+++ b/tests/boolean/boptuc_2d/P1
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge4.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge4.brep] b
 bop a b
 boptuc result
 set length 81.6175
diff --git a/tests/boolean/boptuc_2d/P2 b/tests/boolean/boptuc_2d/P2
index f0be920d18..61764100c0 100644
--- a/tests/boolean/boptuc_2d/P2
+++ b/tests/boolean/boptuc_2d/P2
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_edge5.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_edge5.brep] b
 bop a b
 boptuc result
 set length 350
diff --git a/tests/boolean/boptuc_2d/P3 b/tests/boolean/boptuc_2d/P3
index 8072eddb4b..faf4fdf5ef 100644
--- a/tests/boolean/boptuc_2d/P3
+++ b/tests/boolean/boptuc_2d/P3
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_wire1.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_wire1.brep] b
 bop a b
 boptuc result
 set length 763.834
diff --git a/tests/boolean/boptuc_2d/P4 b/tests/boolean/boptuc_2d/P4
index 990fb6357c..b9660c2fd6 100644
--- a/tests/boolean/boptuc_2d/P4
+++ b/tests/boolean/boptuc_2d/P4
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_wire2.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_wire2.brep] b
 bop a b
 boptuc result
 set length 1080.64
diff --git a/tests/boolean/boptuc_2d/P5 b/tests/boolean/boptuc_2d/P5
index e1d82eb3ae..101b58dab9 100644
--- a/tests/boolean/boptuc_2d/P5
+++ b/tests/boolean/boptuc_2d/P5
@@ -1,5 +1,5 @@
-restore case_9_edge.brep a
-restore case_9_wire3.brep b
+restore [locate_data_file case_9_edge.brep] a
+restore [locate_data_file case_9_wire3.brep] b
 bop a b
 boptuc result
 set length 1080.64
diff --git a/tests/boolean/boptuc_complex/A1 b/tests/boolean/boptuc_complex/A1
index b1fde1bb67..3821da18d6 100644
--- a/tests/boolean/boptuc_complex/A1
+++ b/tests/boolean/boptuc_complex/A1
@@ -1,5 +1,5 @@
 cpulimit 3600
-restore BUC60938.brep sh
+restore [locate_data_file BUC60938.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/boptuc_complex/A2 b/tests/boolean/boptuc_complex/A2
index 2ad12c0b49..d65b42ef6a 100644
--- a/tests/boolean/boptuc_complex/A2
+++ b/tests/boolean/boptuc_complex/A2
@@ -1,5 +1,5 @@
 cpulimit 3600
-restore BUC60938.brep sh
+restore [locate_data_file BUC60938.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/boptuc_complex/A3 b/tests/boolean/boptuc_complex/A3
index 1d6716e006..1f9e07fc56 100644
--- a/tests/boolean/boptuc_complex/A3
+++ b/tests/boolean/boptuc_complex/A3
@@ -1,5 +1,5 @@
 cpulimit 3600
-restore BUC60937.brep sh
+restore [locate_data_file BUC60937.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/boptuc_complex/A4 b/tests/boolean/boptuc_complex/A4
index dee80bbfdf..4f4cf5974e 100644
--- a/tests/boolean/boptuc_complex/A4
+++ b/tests/boolean/boptuc_complex/A4
@@ -1,5 +1,5 @@
 cpulimit 3600
-restore BUC60937.brep sh
+restore [locate_data_file BUC60937.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/boptuc_complex/A5 b/tests/boolean/boptuc_complex/A5
index 6235c5a450..00beb57d84 100644
--- a/tests/boolean/boptuc_complex/A5
+++ b/tests/boolean/boptuc_complex/A5
@@ -1,5 +1,5 @@
 cpulimit 3600
-restore BUC60936.brep sh
+restore [locate_data_file BUC60936.brep] sh
 explode sh
 
 bop sh_1 sh_2
diff --git a/tests/boolean/boptuc_complex/A6 b/tests/boolean/boptuc_complex/A6
index 09bad3e175..03bbfe958d 100644
--- a/tests/boolean/boptuc_complex/A6
+++ b/tests/boolean/boptuc_complex/A6
@@ -1,5 +1,5 @@
 cpulimit 3600
-restore BUC60936.brep sh
+restore [locate_data_file BUC60936.brep] sh
 explode sh
 
 bop sh_2 sh_1
diff --git a/tests/boolean/boptuc_complex/A7 b/tests/boolean/boptuc_complex/A7
index aa88d088d2..9c9dcd6f3a 100644
--- a/tests/boolean/boptuc_complex/A7
+++ b/tests/boolean/boptuc_complex/A7
@@ -1,5 +1,5 @@
-restore a11 a
-restore b11 b
+restore [locate_data_file a11] a
+restore [locate_data_file b11] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/A8 b/tests/boolean/boptuc_complex/A8
index 4e86cb84db..9f0a015f2e 100644
--- a/tests/boolean/boptuc_complex/A8
+++ b/tests/boolean/boptuc_complex/A8
@@ -1,5 +1,5 @@
-restore a11 a
-restore b13 b
+restore [locate_data_file a11] a
+restore [locate_data_file b13] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/A9 b/tests/boolean/boptuc_complex/A9
index 59fac35288..895460b0f6 100644
--- a/tests/boolean/boptuc_complex/A9
+++ b/tests/boolean/boptuc_complex/A9
@@ -1,5 +1,5 @@
-restore a11 a
-restore b15 b
+restore [locate_data_file a11] a
+restore [locate_data_file b15] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/B1 b/tests/boolean/boptuc_complex/B1
index f102d18324..d31e2ee1f8 100644
--- a/tests/boolean/boptuc_complex/B1
+++ b/tests/boolean/boptuc_complex/B1
@@ -1,5 +1,5 @@
-restore a11 a
-restore b17 b
+restore [locate_data_file a11] a
+restore [locate_data_file b17] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/B2 b/tests/boolean/boptuc_complex/B2
index 2c4ff229dd..bb7d5f9649 100644
--- a/tests/boolean/boptuc_complex/B2
+++ b/tests/boolean/boptuc_complex/B2
@@ -1,5 +1,5 @@
-restore a11 a
-restore b19 b
+restore [locate_data_file a11] a
+restore [locate_data_file b19] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/B3 b/tests/boolean/boptuc_complex/B3
index dc0b39fd42..37e913cbc0 100644
--- a/tests/boolean/boptuc_complex/B3
+++ b/tests/boolean/boptuc_complex/B3
@@ -1,5 +1,5 @@
-restore a57 a
-restore b57 b
+restore [locate_data_file a57] a
+restore [locate_data_file b57] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/B4 b/tests/boolean/boptuc_complex/B4
index ad132bb693..d07aa8b999 100644
--- a/tests/boolean/boptuc_complex/B4
+++ b/tests/boolean/boptuc_complex/B4
@@ -1,5 +1,5 @@
-restore a58 a
-restore b58 b
+restore [locate_data_file a58] a
+restore [locate_data_file b58] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/B5 b/tests/boolean/boptuc_complex/B5
index d73004f911..5cca2fcabf 100644
--- a/tests/boolean/boptuc_complex/B5
+++ b/tests/boolean/boptuc_complex/B5
@@ -1,5 +1,5 @@
-restore a58 a
-restore b60 b
+restore [locate_data_file a58] a
+restore [locate_data_file b60] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/B6 b/tests/boolean/boptuc_complex/B6
index e1908a5204..97781ceb9a 100644
--- a/tests/boolean/boptuc_complex/B6
+++ b/tests/boolean/boptuc_complex/B6
@@ -1,5 +1,5 @@
-restore a58 a
-restore b62 b
+restore [locate_data_file a58] a
+restore [locate_data_file b62] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/B7 b/tests/boolean/boptuc_complex/B7
index 8729c432ac..aba47a1236 100644
--- a/tests/boolean/boptuc_complex/B7
+++ b/tests/boolean/boptuc_complex/B7
@@ -1,5 +1,5 @@
-restore a58 a
-restore b64 b
+restore [locate_data_file a58] a
+restore [locate_data_file b64] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/B8 b/tests/boolean/boptuc_complex/B8
index 6471ca149b..9a7f05a314 100644
--- a/tests/boolean/boptuc_complex/B8
+++ b/tests/boolean/boptuc_complex/B8
@@ -1,5 +1,5 @@
-restore a58 a
-restore b66 b
+restore [locate_data_file a58] a
+restore [locate_data_file b66] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/B9 b/tests/boolean/boptuc_complex/B9
index 5882acc374..bc35eb6d86 100644
--- a/tests/boolean/boptuc_complex/B9
+++ b/tests/boolean/boptuc_complex/B9
@@ -1,5 +1,5 @@
-restore a90 a
-restore b90 b
+restore [locate_data_file a90] a
+restore [locate_data_file b90] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/C1 b/tests/boolean/boptuc_complex/C1
index 2994c56c01..75d4ccb6d5 100644
--- a/tests/boolean/boptuc_complex/C1
+++ b/tests/boolean/boptuc_complex/C1
@@ -1,5 +1,5 @@
-restore a102 a
-restore b102 b
+restore [locate_data_file a102] a
+restore [locate_data_file b102] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/C2 b/tests/boolean/boptuc_complex/C2
index 9abf1ffa92..4587af0df2 100644
--- a/tests/boolean/boptuc_complex/C2
+++ b/tests/boolean/boptuc_complex/C2
@@ -1,5 +1,5 @@
-restore a104 a
-restore b104 b
+restore [locate_data_file a104] a
+restore [locate_data_file b104] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/C3 b/tests/boolean/boptuc_complex/C3
index 74ce3a812a..27c533826f 100644
--- a/tests/boolean/boptuc_complex/C3
+++ b/tests/boolean/boptuc_complex/C3
@@ -1,5 +1,5 @@
-restore a108 a
-restore b108 b
+restore [locate_data_file a108] a
+restore [locate_data_file b108] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/C4 b/tests/boolean/boptuc_complex/C4
index c6726d824a..fb409c2425 100644
--- a/tests/boolean/boptuc_complex/C4
+++ b/tests/boolean/boptuc_complex/C4
@@ -1,5 +1,5 @@
-restore a110 a
-restore b110 b
+restore [locate_data_file a110] a
+restore [locate_data_file b110] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/C5 b/tests/boolean/boptuc_complex/C5
index 6c96376303..c589649e21 100644
--- a/tests/boolean/boptuc_complex/C5
+++ b/tests/boolean/boptuc_complex/C5
@@ -1,5 +1,5 @@
-restore a112 a
-restore b112 b
+restore [locate_data_file a112] a
+restore [locate_data_file b112] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/C6 b/tests/boolean/boptuc_complex/C6
index 139f40a2c4..e84a7a9b67 100644
--- a/tests/boolean/boptuc_complex/C6
+++ b/tests/boolean/boptuc_complex/C6
@@ -1,5 +1,5 @@
-restore a114 a
-restore b114 b
+restore [locate_data_file a114] a
+restore [locate_data_file b114] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/C7 b/tests/boolean/boptuc_complex/C7
index ac2ae4a045..5945aa891e 100644
--- a/tests/boolean/boptuc_complex/C7
+++ b/tests/boolean/boptuc_complex/C7
@@ -1,5 +1,5 @@
-restore a116 a
-restore b116 b
+restore [locate_data_file a116] a
+restore [locate_data_file b116] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/C8 b/tests/boolean/boptuc_complex/C8
index e2af5f6d7a..813e492ab5 100644
--- a/tests/boolean/boptuc_complex/C8
+++ b/tests/boolean/boptuc_complex/C8
@@ -1,5 +1,5 @@
-restore a118 a
-restore b118 b
+restore [locate_data_file a118] a
+restore [locate_data_file b118] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/C9 b/tests/boolean/boptuc_complex/C9
index 2ed381f422..2c5e0d530a 100644
--- a/tests/boolean/boptuc_complex/C9
+++ b/tests/boolean/boptuc_complex/C9
@@ -1,5 +1,5 @@
-restore a124 a
-restore b124 b
+restore [locate_data_file a124] a
+restore [locate_data_file b124] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/D1 b/tests/boolean/boptuc_complex/D1
index f7323d33de..3872775917 100644
--- a/tests/boolean/boptuc_complex/D1
+++ b/tests/boolean/boptuc_complex/D1
@@ -1,5 +1,5 @@
-restore a126 a
-restore b126 b
+restore [locate_data_file a126] a
+restore [locate_data_file b126] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/D2 b/tests/boolean/boptuc_complex/D2
index d31b3a1cfc..c0202862a6 100644
--- a/tests/boolean/boptuc_complex/D2
+++ b/tests/boolean/boptuc_complex/D2
@@ -1,5 +1,5 @@
-restore a128 a
-restore b128 b
+restore [locate_data_file a128] a
+restore [locate_data_file b128] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/D3 b/tests/boolean/boptuc_complex/D3
index 94b6b5c309..0bfacda504 100644
--- a/tests/boolean/boptuc_complex/D3
+++ b/tests/boolean/boptuc_complex/D3
@@ -1,5 +1,5 @@
-restore a130 a
-restore b130 b
+restore [locate_data_file a130] a
+restore [locate_data_file b130] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/D4 b/tests/boolean/boptuc_complex/D4
index 75c54cd074..a4d0e3a560 100644
--- a/tests/boolean/boptuc_complex/D4
+++ b/tests/boolean/boptuc_complex/D4
@@ -1,5 +1,5 @@
-restore a132 a
-restore b132 b
+restore [locate_data_file a132] a
+restore [locate_data_file b132] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/D5 b/tests/boolean/boptuc_complex/D5
index a3c5bf90cc..e38d3a0129 100644
--- a/tests/boolean/boptuc_complex/D5
+++ b/tests/boolean/boptuc_complex/D5
@@ -1,8 +1,8 @@
 puts "TODO #22911 ALL: Faulty shapes in variables faulty_1 to faulty_2"
 puts "TODO #22911 ALL: Error : The square of result shape is"
 
-restore a136 a
-restore b136 b
+restore [locate_data_file a136] a
+restore [locate_data_file b136] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/D6 b/tests/boolean/boptuc_complex/D6
index dbe8367544..53038a1576 100644
--- a/tests/boolean/boptuc_complex/D6
+++ b/tests/boolean/boptuc_complex/D6
@@ -1,5 +1,5 @@
-restore a138 a
-restore b138 b
+restore [locate_data_file a138] a
+restore [locate_data_file b138] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/D7 b/tests/boolean/boptuc_complex/D7
index b795485dbc..f3376c8887 100644
--- a/tests/boolean/boptuc_complex/D7
+++ b/tests/boolean/boptuc_complex/D7
@@ -1,5 +1,5 @@
-restore a140 a
-restore b140 b
+restore [locate_data_file a140] a
+restore [locate_data_file b140] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/D8 b/tests/boolean/boptuc_complex/D8
index e576fe95e2..d2ae455f99 100644
--- a/tests/boolean/boptuc_complex/D8
+++ b/tests/boolean/boptuc_complex/D8
@@ -1,5 +1,5 @@
-restore a142 a
-restore b142 b
+restore [locate_data_file a142] a
+restore [locate_data_file b142] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/D9 b/tests/boolean/boptuc_complex/D9
index 36694a59a7..d142b6d671 100644
--- a/tests/boolean/boptuc_complex/D9
+++ b/tests/boolean/boptuc_complex/D9
@@ -1,5 +1,5 @@
-restore a144 a
-restore b144 b
+restore [locate_data_file a144] a
+restore [locate_data_file b144] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/E1 b/tests/boolean/boptuc_complex/E1
index 0a7a88bcf8..756f3215df 100644
--- a/tests/boolean/boptuc_complex/E1
+++ b/tests/boolean/boptuc_complex/E1
@@ -1,5 +1,5 @@
-restore a146 a
-restore b146 b
+restore [locate_data_file a146] a
+restore [locate_data_file b146] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/E2 b/tests/boolean/boptuc_complex/E2
index d5098928d4..09648798ec 100644
--- a/tests/boolean/boptuc_complex/E2
+++ b/tests/boolean/boptuc_complex/E2
@@ -1,5 +1,5 @@
-restore a148 a
-restore b148 b
+restore [locate_data_file a148] a
+restore [locate_data_file b148] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/E3 b/tests/boolean/boptuc_complex/E3
index eea3f33b79..84accc6eb8 100644
--- a/tests/boolean/boptuc_complex/E3
+++ b/tests/boolean/boptuc_complex/E3
@@ -1,5 +1,5 @@
-restore a150 a
-restore b150 b
+restore [locate_data_file a150] a
+restore [locate_data_file b150] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/E4 b/tests/boolean/boptuc_complex/E4
index 9e22b4a0cc..d1c2c055b4 100644
--- a/tests/boolean/boptuc_complex/E4
+++ b/tests/boolean/boptuc_complex/E4
@@ -1,5 +1,5 @@
-restore a154 a
-restore b154 b
+restore [locate_data_file a154] a
+restore [locate_data_file b154] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/E5 b/tests/boolean/boptuc_complex/E5
index 34a59b59c6..8fe915b9e0 100644
--- a/tests/boolean/boptuc_complex/E5
+++ b/tests/boolean/boptuc_complex/E5
@@ -1,5 +1,5 @@
-restore a156 a
-restore b156 b
+restore [locate_data_file a156] a
+restore [locate_data_file b156] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/E6 b/tests/boolean/boptuc_complex/E6
index c8ddcb1442..09fd38f411 100644
--- a/tests/boolean/boptuc_complex/E6
+++ b/tests/boolean/boptuc_complex/E6
@@ -1,5 +1,5 @@
-restore a157 a
-restore b157 b
+restore [locate_data_file a157] a
+restore [locate_data_file b157] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/E7 b/tests/boolean/boptuc_complex/E7
index b132d39239..e0f81c47d9 100644
--- a/tests/boolean/boptuc_complex/E7
+++ b/tests/boolean/boptuc_complex/E7
@@ -1,5 +1,5 @@
-restore a158 a
-restore b158 b
+restore [locate_data_file a158] a
+restore [locate_data_file b158] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/E8 b/tests/boolean/boptuc_complex/E8
index 2aa7c491bb..468b2a6024 100644
--- a/tests/boolean/boptuc_complex/E8
+++ b/tests/boolean/boptuc_complex/E8
@@ -1,5 +1,5 @@
-restore a160 a
-restore b160 b
+restore [locate_data_file a160] a
+restore [locate_data_file b160] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/E9 b/tests/boolean/boptuc_complex/E9
index bec87946a4..2b854130c6 100644
--- a/tests/boolean/boptuc_complex/E9
+++ b/tests/boolean/boptuc_complex/E9
@@ -1,5 +1,5 @@
-restore a164 a
-restore b164 b
+restore [locate_data_file a164] a
+restore [locate_data_file b164] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/F1 b/tests/boolean/boptuc_complex/F1
index aa2662ebe5..3a2e270293 100644
--- a/tests/boolean/boptuc_complex/F1
+++ b/tests/boolean/boptuc_complex/F1
@@ -1,5 +1,5 @@
-restore a166 a
-restore b166 b
+restore [locate_data_file a166] a
+restore [locate_data_file b166] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/F2 b/tests/boolean/boptuc_complex/F2
index fc28a268ed..d028e05853 100644
--- a/tests/boolean/boptuc_complex/F2
+++ b/tests/boolean/boptuc_complex/F2
@@ -1,5 +1,5 @@
-restore a168 a
-restore b168 b
+restore [locate_data_file a168] a
+restore [locate_data_file b168] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/F3 b/tests/boolean/boptuc_complex/F3
index e5baa595b7..6661c3808c 100644
--- a/tests/boolean/boptuc_complex/F3
+++ b/tests/boolean/boptuc_complex/F3
@@ -1,5 +1,5 @@
-restore a170 a
-restore b170 b
+restore [locate_data_file a170] a
+restore [locate_data_file b170] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/F4 b/tests/boolean/boptuc_complex/F4
index 0d348acfe4..d90f034e7e 100644
--- a/tests/boolean/boptuc_complex/F4
+++ b/tests/boolean/boptuc_complex/F4
@@ -1,5 +1,5 @@
-restore a167 a
-restore b167 b
+restore [locate_data_file a167] a
+restore [locate_data_file b167] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/F5 b/tests/boolean/boptuc_complex/F5
index dc47efe21b..f57e23c0b5 100644
--- a/tests/boolean/boptuc_complex/F5
+++ b/tests/boolean/boptuc_complex/F5
@@ -1,5 +1,5 @@
-restore a189 a
-restore b189 b
+restore [locate_data_file a189] a
+restore [locate_data_file b189] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/F6 b/tests/boolean/boptuc_complex/F6
index 6a8b88ccc1..bf6dd1cffd 100644
--- a/tests/boolean/boptuc_complex/F6
+++ b/tests/boolean/boptuc_complex/F6
@@ -1,5 +1,5 @@
-restore a191 a
-restore b191 b
+restore [locate_data_file a191] a
+restore [locate_data_file b191] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/F7 b/tests/boolean/boptuc_complex/F7
index 1672f191b0..e0013ec0a4 100644
--- a/tests/boolean/boptuc_complex/F7
+++ b/tests/boolean/boptuc_complex/F7
@@ -1,5 +1,5 @@
-restore a197 a
-restore b197 b
+restore [locate_data_file a197] a
+restore [locate_data_file b197] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/F8 b/tests/boolean/boptuc_complex/F8
index 924378d1b9..5395107740 100644
--- a/tests/boolean/boptuc_complex/F8
+++ b/tests/boolean/boptuc_complex/F8
@@ -1,5 +1,5 @@
-restore a199 a
-restore b199 b
+restore [locate_data_file a199] a
+restore [locate_data_file b199] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/F9 b/tests/boolean/boptuc_complex/F9
index 913f6d714d..ec7ca3bd88 100644
--- a/tests/boolean/boptuc_complex/F9
+++ b/tests/boolean/boptuc_complex/F9
@@ -1,5 +1,5 @@
-restore a206 a
-restore b206 b
+restore [locate_data_file a206] a
+restore [locate_data_file b206] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/G1 b/tests/boolean/boptuc_complex/G1
index c2d7313ca6..1fa627c78e 100644
--- a/tests/boolean/boptuc_complex/G1
+++ b/tests/boolean/boptuc_complex/G1
@@ -1,5 +1,5 @@
-restore a210 a
-restore b210 b
+restore [locate_data_file a210] a
+restore [locate_data_file b210] b
 
 bop a b
 boptuc result
diff --git a/tests/boolean/boptuc_complex/G2 b/tests/boolean/boptuc_complex/G2
index 45b9ec896c..f6b74c5aee 100644
--- a/tests/boolean/boptuc_complex/G2
+++ b/tests/boolean/boptuc_complex/G2
@@ -5,7 +5,7 @@ ttranslate c 3 3 6
 bop b c
 bopfuse rr
 
-restore A1_rr_7.brep A1_rr_7
+restore [locate_data_file A1_rr_7.brep] A1_rr_7
 prism p1 A1_rr_7 0 0 4
 
 bop rr p1
diff --git a/tests/boolean/boptuc_complex/G3 b/tests/boolean/boptuc_complex/G3
index 5a946bdd32..b4393cc77a 100644
--- a/tests/boolean/boptuc_complex/G3
+++ b/tests/boolean/boptuc_complex/G3
@@ -5,7 +5,7 @@ ttranslate c 3 3 6
 
 bfuse rr b c
 
-restore A1_rr_7.brep A1_rr_7
+restore [locate_data_file A1_rr_7.brep] A1_rr_7
 prism p1  A1_rr_7 0 0 -4
 
 explode  rr so
diff --git a/tests/boolean/boptuc_complex/G4 b/tests/boolean/boptuc_complex/G4
index 7f0dc8180b..0c8aa19ad1 100644
--- a/tests/boolean/boptuc_complex/G4
+++ b/tests/boolean/boptuc_complex/G4
@@ -5,7 +5,7 @@ ttranslate c 0 0 6
 
 bfuse rr b c
 
-restore C1_rr_8.brep C1_rr_8
+restore [locate_data_file C1_rr_8.brep] C1_rr_8
 prism p1 C1_rr_8 0 0 -4
 
 explode rr so
diff --git a/tests/boolean/boptuc_complex/G5 b/tests/boolean/boptuc_complex/G5
index 794762e655..6da6e519da 100644
--- a/tests/boolean/boptuc_complex/G5
+++ b/tests/boolean/boptuc_complex/G5
@@ -5,7 +5,7 @@ ttranslate c 0 0 6
 
 bfuse rr b c
 
-restore C1_rr_8.brep C1_rr_8
+restore [locate_data_file C1_rr_8.brep] C1_rr_8
 prism p1 C1_rr_8 0 0 4
 
 explode rr so
diff --git a/tests/boolean/boptuc_complex/G6 b/tests/boolean/boptuc_complex/G6
index e8e9e74b3e..f5755b2dca 100644
--- a/tests/boolean/boptuc_complex/G6
+++ b/tests/boolean/boptuc_complex/G6
@@ -5,7 +5,7 @@ ttranslate c 0 0 2
 
 bfuse rr b c
 
-restore E1_rr_7.brep E1_rr_7
+restore [locate_data_file E1_rr_7.brep] E1_rr_7
 prism p1 E1_rr_7 0 -4 0
 
 explode rr so
diff --git a/tests/boolean/boptuc_complex/G7 b/tests/boolean/boptuc_complex/G7
index 11e66c489d..76dedc8037 100644
--- a/tests/boolean/boptuc_complex/G7
+++ b/tests/boolean/boptuc_complex/G7
@@ -5,7 +5,7 @@ ttranslate c 0 0 2
 
 bfuse rr b c
 
-restore E1_rr_7.brep E1_rr_7
+restore [locate_data_file E1_rr_7.brep] E1_rr_7
 prism p1 E1_rr_7 0 4 0
 
 explode rr so
diff --git a/tests/boolean/boptuc_complex/G8 b/tests/boolean/boptuc_complex/G8
index 8ddbd6b23a..247cb46a04 100644
--- a/tests/boolean/boptuc_complex/G8
+++ b/tests/boolean/boptuc_complex/G8
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh2a b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh2a] b2
 
 bop b1 b2
 boptuc result
diff --git a/tests/boolean/boptuc_complex/G9 b/tests/boolean/boptuc_complex/G9
index 7e352c966e..241d18f630 100644
--- a/tests/boolean/boptuc_complex/G9
+++ b/tests/boolean/boptuc_complex/G9
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh3 b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh3] b2
 
 bop b1 b2
 boptuc result
diff --git a/tests/boolean/boptuc_complex/H1 b/tests/boolean/boptuc_complex/H1
index c2c2b0d8de..97c318cced 100644
--- a/tests/boolean/boptuc_complex/H1
+++ b/tests/boolean/boptuc_complex/H1
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh4 b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh4] b2
 
 bop b1 b2
 boptuc result
diff --git a/tests/boolean/boptuc_complex/H2 b/tests/boolean/boptuc_complex/H2
index b6b3e2dfe6..855fdae90e 100644
--- a/tests/boolean/boptuc_complex/H2
+++ b/tests/boolean/boptuc_complex/H2
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh7 b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh7] b2
 
 bop b1 b2
 boptuc result
diff --git a/tests/boolean/boptuc_complex/H3 b/tests/boolean/boptuc_complex/H3
index 611e40d75d..39177fd5a7 100644
--- a/tests/boolean/boptuc_complex/H3
+++ b/tests/boolean/boptuc_complex/H3
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh8 b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh8] b2
 
 bop b1 b2
 boptuc result
diff --git a/tests/boolean/boptuc_complex/H4 b/tests/boolean/boptuc_complex/H4
index 6e6ea9c3bf..423f7f9bd5 100644
--- a/tests/boolean/boptuc_complex/H4
+++ b/tests/boolean/boptuc_complex/H4
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh9 b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh9] b2
 
 bop b1 b2
 boptuc result
diff --git a/tests/boolean/boptuc_complex/H5 b/tests/boolean/boptuc_complex/H5
index fdcb1140d6..34b7bcac09 100644
--- a/tests/boolean/boptuc_complex/H5
+++ b/tests/boolean/boptuc_complex/H5
@@ -1,5 +1,5 @@
-restore sh10 b1
-restore shx b2
+restore [locate_data_file sh10] b1
+restore [locate_data_file shx] b2
 
 bop b1 b2
 boptuc result
diff --git a/tests/boolean/boptuc_complex/H6 b/tests/boolean/boptuc_complex/H6
index 8d23785dab..c8c203e676 100644
--- a/tests/boolean/boptuc_complex/H6
+++ b/tests/boolean/boptuc_complex/H6
@@ -1,5 +1,5 @@
-restore sh2 b1
-restore sh5 b2
+restore [locate_data_file sh2] b1
+restore [locate_data_file sh5] b2
 
 bop b1 b2
 boptuc result
diff --git a/tests/boolean/boptuc_complex/H7 b/tests/boolean/boptuc_complex/H7
index e59749dda9..c66953b6ba 100644
--- a/tests/boolean/boptuc_complex/H7
+++ b/tests/boolean/boptuc_complex/H7
@@ -1,5 +1,5 @@
-restore g1 b1
-restore g2 b2
+restore [locate_data_file g1] b1
+restore [locate_data_file g2] b2
 
 bop b1 b2
 boptuc result
diff --git a/tests/boolean/boptuc_complex/H8 b/tests/boolean/boptuc_complex/H8
index c295d8ec32..fa2af93b03 100644
--- a/tests/boolean/boptuc_complex/H8
+++ b/tests/boolean/boptuc_complex/H8
@@ -1,5 +1,5 @@
-restore sg1 b1
-restore sg2 b2
+restore [locate_data_file sg1] b1
+restore [locate_data_file sg2] b2
 
 bop b1 b2
 boptuc result
diff --git a/tests/boolean/boptuc_complex/H9 b/tests/boolean/boptuc_complex/H9
index 0c8aab3b41..cfe2278592 100644
--- a/tests/boolean/boptuc_complex/H9
+++ b/tests/boolean/boptuc_complex/H9
@@ -1,5 +1,5 @@
-restore sf4 b1
-restore sf5 b2
+restore [locate_data_file sf4] b1
+restore [locate_data_file sf5] b2
 
 bop b1 b2
 boptuc result
diff --git a/tests/boolean/boptuc_complex/I1 b/tests/boolean/boptuc_complex/I1
index 40aedb49b0..11f41bcad9 100644
--- a/tests/boolean/boptuc_complex/I1
+++ b/tests/boolean/boptuc_complex/I1
@@ -1,5 +1,5 @@
-restore sf5 b1
-restore sf3 b2
+restore [locate_data_file sf5] b1
+restore [locate_data_file sf3] b2
 
 bop b1 b2
 boptuc result
diff --git a/tests/boolean/boptuc_complex/I2 b/tests/boolean/boptuc_complex/I2
index ad00c790cf..bb5fb2ac17 100644
--- a/tests/boolean/boptuc_complex/I2
+++ b/tests/boolean/boptuc_complex/I2
@@ -1,5 +1,5 @@
-restore sf5 b1
-restore sf55 b2
+restore [locate_data_file sf5] b1
+restore [locate_data_file sf55] b2
 
 bop b1 b2
 boptuc result
diff --git a/tests/boolean/bsection/A1 b/tests/boolean/bsection/A1
index d805ae7c49..c325e1cc92 100644
--- a/tests/boolean/bsection/A1
+++ b/tests/boolean/bsection/A1
@@ -1,5 +1,5 @@
-restore a63 a
-restore b63 b
+restore [locate_data_file a63] a
+restore [locate_data_file b63] b
 #a and b shapes have not intersection according to tolerance
 
 ttranslate a 0 -0.0025400016456842422 0
diff --git a/tests/boolean/bsection/A2 b/tests/boolean/bsection/A2
index e3caeb8fc3..0fdb0f295e 100644
--- a/tests/boolean/bsection/A2
+++ b/tests/boolean/bsection/A2
@@ -1,5 +1,5 @@
-restore a10 a
-restore b10 b
+restore [locate_data_file a10] a
+restore [locate_data_file b10] b
 bsection result a b
 
 set length 25.4961
diff --git a/tests/boolean/bsection/A3 b/tests/boolean/bsection/A3
index 9abbd2990e..7e77e0995c 100644
--- a/tests/boolean/bsection/A3
+++ b/tests/boolean/bsection/A3
@@ -1,5 +1,5 @@
-restore a2 a
-restore b2_bsect b
+restore [locate_data_file a2] a
+restore [locate_data_file b2_bsect] b
 bsection result a b
 
 set length 25.1327
diff --git a/tests/boolean/bsection/A4 b/tests/boolean/bsection/A4
index 5b109b7d9a..de732cfcb0 100644
--- a/tests/boolean/bsection/A4
+++ b/tests/boolean/bsection/A4
@@ -1,5 +1,5 @@
-restore a3 a
-restore b3 b
+restore [locate_data_file a3] a
+restore [locate_data_file b3] b
 bsection result a b
 
 set length 10
diff --git a/tests/boolean/bsection/A5 b/tests/boolean/bsection/A5
index 92df856492..a93b181b90 100644
--- a/tests/boolean/bsection/A5
+++ b/tests/boolean/bsection/A5
@@ -1,5 +1,5 @@
-restore a4 a
-restore b4 b
+restore [locate_data_file a4] a
+restore [locate_data_file b4] b
 bsection result a b
 
 set length 125.664
diff --git a/tests/boolean/bsection/A6 b/tests/boolean/bsection/A6
index 4f1109564e..7606c61ccd 100644
--- a/tests/boolean/bsection/A6
+++ b/tests/boolean/bsection/A6
@@ -1,5 +1,5 @@
-restore a5 a
-restore b5 b
+restore [locate_data_file a5] a
+restore [locate_data_file b5] b
 bsection result a b
 
 set length 15.8345
diff --git a/tests/boolean/bsection/A7 b/tests/boolean/bsection/A7
index 6aeb6968b4..7dca1fef68 100644
--- a/tests/boolean/bsection/A7
+++ b/tests/boolean/bsection/A7
@@ -1,5 +1,5 @@
-restore a7 a
-restore b7 b
+restore [locate_data_file a7] a
+restore [locate_data_file b7] b
 bsection result a b
 
 set length 1.75
diff --git a/tests/boolean/bsection/A8 b/tests/boolean/bsection/A8
index 8a83d989d6..f238c3fe41 100644
--- a/tests/boolean/bsection/A8
+++ b/tests/boolean/bsection/A8
@@ -1,5 +1,5 @@
-restore a8 a
-restore b8 b
+restore [locate_data_file a8] a
+restore [locate_data_file b8] b
 bsection result a b
 
 set length 43.3411
diff --git a/tests/boolean/bsection/A9 b/tests/boolean/bsection/A9
index 3a4e6416fc..4ef0102be3 100644
--- a/tests/boolean/bsection/A9
+++ b/tests/boolean/bsection/A9
@@ -1,5 +1,5 @@
-restore a9 a
-restore b9 b
+restore [locate_data_file a9] a
+restore [locate_data_file b9] b
 bsection result a b
 
 set length 27.2153
diff --git a/tests/boolean/bsection/B1 b/tests/boolean/bsection/B1
index b548e8626b..895892e33e 100644
--- a/tests/boolean/bsection/B1
+++ b/tests/boolean/bsection/B1
@@ -1,5 +1,5 @@
-restore a11_bsect a
-restore b11_bsect b
+restore [locate_data_file a11_bsect] a
+restore [locate_data_file b11_bsect] b
 bsection result a b
 
 set length 1.21315
diff --git a/tests/boolean/bsection/B2 b/tests/boolean/bsection/B2
index 5d1bdce844..21ddd430b2 100644
--- a/tests/boolean/bsection/B2
+++ b/tests/boolean/bsection/B2
@@ -1,5 +1,5 @@
-restore a12 a
-restore b12 b
+restore [locate_data_file a12] a
+restore [locate_data_file b12] b
 bsection result a b
 
 set length 140.043
diff --git a/tests/boolean/bsection/B3 b/tests/boolean/bsection/B3
index 8886914951..c1cc818824 100644
--- a/tests/boolean/bsection/B3
+++ b/tests/boolean/bsection/B3
@@ -1,5 +1,5 @@
-restore a13 a
-restore b13_bsect b
+restore [locate_data_file a13] a
+restore [locate_data_file b13_bsect] b
 bsection result a b
 
 set length 7.47641
diff --git a/tests/boolean/bsection/B4 b/tests/boolean/bsection/B4
index 466aa222bd..e8bdde6165 100644
--- a/tests/boolean/bsection/B4
+++ b/tests/boolean/bsection/B4
@@ -1,5 +1,5 @@
-restore a14 a
-restore b14 b
+restore [locate_data_file a14] a
+restore [locate_data_file b14] b
 bsection result a b
 
 set length 10.6749
diff --git a/tests/boolean/bsection/B5 b/tests/boolean/bsection/B5
index ac8c83edf6..ef77dd3391 100644
--- a/tests/boolean/bsection/B5
+++ b/tests/boolean/bsection/B5
@@ -1,5 +1,5 @@
-restore a15 a
-restore b15_bsect b
+restore [locate_data_file a15] a
+restore [locate_data_file b15_bsect] b
 bsection result a b
 
 set length 546.82
diff --git a/tests/boolean/bsection/B6 b/tests/boolean/bsection/B6
index e15069b332..7fc1fe68f4 100644
--- a/tests/boolean/bsection/B6
+++ b/tests/boolean/bsection/B6
@@ -1,5 +1,5 @@
-restore a16 a
-restore b16 b
+restore [locate_data_file a16] a
+restore [locate_data_file b16] b
 bsection result a b
 
 set length 76.0946
diff --git a/tests/boolean/bsection/B7 b/tests/boolean/bsection/B7
index 0168d42a8f..3877d67e22 100644
--- a/tests/boolean/bsection/B7
+++ b/tests/boolean/bsection/B7
@@ -1,5 +1,5 @@
-restore a17 a
-restore b17_bsect b
+restore [locate_data_file a17] a
+restore [locate_data_file b17_bsect] b
 bsection result a b
 
 set length 10
diff --git a/tests/boolean/bsection/B8 b/tests/boolean/bsection/B8
index 390b6a6d9a..1e4396d625 100644
--- a/tests/boolean/bsection/B8
+++ b/tests/boolean/bsection/B8
@@ -1,5 +1,5 @@
-restore a18 a
-restore b18 b
+restore [locate_data_file a18] a
+restore [locate_data_file b18] b
 bsection result a b
 
 set length 53.6115
diff --git a/tests/boolean/bsection/B9 b/tests/boolean/bsection/B9
index 7dd29db018..7dfc2d55ff 100644
--- a/tests/boolean/bsection/B9
+++ b/tests/boolean/bsection/B9
@@ -1,5 +1,5 @@
-restore a19 a
-restore b19_bsect b
+restore [locate_data_file a19] a
+restore [locate_data_file b19_bsect] b
 bsection result a b
 
 set length 0.392404
diff --git a/tests/boolean/bsection/C1 b/tests/boolean/bsection/C1
index d0973ecefb..6f378a4005 100644
--- a/tests/boolean/bsection/C1
+++ b/tests/boolean/bsection/C1
@@ -1,5 +1,5 @@
-restore a30 a
-restore b30 b
+restore [locate_data_file a30] a
+restore [locate_data_file b30] b
 bsection result a b
 
 set length 12.5664
diff --git a/tests/boolean/bsection/C2 b/tests/boolean/bsection/C2
index 37ffb84fed..97290a3b81 100644
--- a/tests/boolean/bsection/C2
+++ b/tests/boolean/bsection/C2
@@ -1,5 +1,5 @@
-restore a23 a
-restore b23 b
+restore [locate_data_file a23] a
+restore [locate_data_file b23] b
 bsection result a b
 
 set length 51.7591
diff --git a/tests/boolean/bsection/C3 b/tests/boolean/bsection/C3
index 23f6099dff..4b96d7f36b 100644
--- a/tests/boolean/bsection/C3
+++ b/tests/boolean/bsection/C3
@@ -1,5 +1,5 @@
-restore a24 a
-restore b24 b
+restore [locate_data_file a24] a
+restore [locate_data_file b24] b
 bsection result a b
 
 set length 88.6365
diff --git a/tests/boolean/bsection/C4 b/tests/boolean/bsection/C4
index bc1673f92d..33fad2a495 100644
--- a/tests/boolean/bsection/C4
+++ b/tests/boolean/bsection/C4
@@ -1,5 +1,5 @@
-restore a25 a
-restore b25 b
+restore [locate_data_file a25] a
+restore [locate_data_file b25] b
 bsection result a b
 
 set length 1.51691
diff --git a/tests/boolean/bsection/C5 b/tests/boolean/bsection/C5
index c4fe9a5b1c..e01c483c2a 100644
--- a/tests/boolean/bsection/C5
+++ b/tests/boolean/bsection/C5
@@ -1,5 +1,5 @@
-restore a26 a
-restore b26 b
+restore [locate_data_file a26] a
+restore [locate_data_file b26] b
 bsection result a b
 
 set length 251.672
diff --git a/tests/boolean/bsection/C6 b/tests/boolean/bsection/C6
index f149de7be5..f637e8d700 100644
--- a/tests/boolean/bsection/C6
+++ b/tests/boolean/bsection/C6
@@ -1,5 +1,5 @@
-restore a27 a
-restore b27 b
+restore [locate_data_file a27] a
+restore [locate_data_file b27] b
 bsection result a b
 
 set length 7.94247
diff --git a/tests/boolean/bsection/C7 b/tests/boolean/bsection/C7
index fcbef29f2b..0cf4c43605 100644
--- a/tests/boolean/bsection/C7
+++ b/tests/boolean/bsection/C7
@@ -1,5 +1,5 @@
-restore a28 a
-restore b28 b
+restore [locate_data_file a28] a
+restore [locate_data_file b28] b
 bsection result a b
 
 set length 176.127
diff --git a/tests/boolean/bsection/C8 b/tests/boolean/bsection/C8
index ea56d30d1b..8bc7179d55 100644
--- a/tests/boolean/bsection/C8
+++ b/tests/boolean/bsection/C8
@@ -1,5 +1,5 @@
-restore a29 a
-restore b29 b
+restore [locate_data_file a29] a
+restore [locate_data_file b29] b
 bsection result a b
 
 set length 6.23599
diff --git a/tests/boolean/bsection/C9 b/tests/boolean/bsection/C9
index e88edf3f22..5d1187f0f7 100644
--- a/tests/boolean/bsection/C9
+++ b/tests/boolean/bsection/C9
@@ -1,5 +1,5 @@
-restore a40 a
-restore b40 b
+restore [locate_data_file a40] a
+restore [locate_data_file b40] b
 bsection result a b
 
 set length 39.8158
diff --git a/tests/boolean/bsection/D1 b/tests/boolean/bsection/D1
index e08e88eb76..2f9cdf15c0 100644
--- a/tests/boolean/bsection/D1
+++ b/tests/boolean/bsection/D1
@@ -1,5 +1,5 @@
-restore a31 a
-restore b31 b
+restore [locate_data_file a31] a
+restore [locate_data_file b31] b
 bsection result a b
 
 set length 17041.4
diff --git a/tests/boolean/bsection/D2 b/tests/boolean/bsection/D2
index 19fa7a2d1e..b6cdcef6bb 100644
--- a/tests/boolean/bsection/D2
+++ b/tests/boolean/bsection/D2
@@ -1,5 +1,5 @@
-restore a32 a
-restore b32 b
+restore [locate_data_file a32] a
+restore [locate_data_file b32] b
 bsection result a b
 
 set length 12.4984
diff --git a/tests/boolean/bsection/D3 b/tests/boolean/bsection/D3
index e5ba220373..6e0962100e 100644
--- a/tests/boolean/bsection/D3
+++ b/tests/boolean/bsection/D3
@@ -1,5 +1,5 @@
-restore a33 a
-restore b33 b
+restore [locate_data_file a33] a
+restore [locate_data_file b33] b
 bsection result a b
 
 set length 2.00019
diff --git a/tests/boolean/bsection/D4 b/tests/boolean/bsection/D4
index c304b33f69..34e262b2f5 100644
--- a/tests/boolean/bsection/D4
+++ b/tests/boolean/bsection/D4
@@ -1,5 +1,5 @@
-restore a34 a
-restore b34 b
+restore [locate_data_file a34] a
+restore [locate_data_file b34] b
 bsection result a b
 
 set length 45.4729
diff --git a/tests/boolean/bsection/D5 b/tests/boolean/bsection/D5
index 25cdfe65a8..74474e1bed 100644
--- a/tests/boolean/bsection/D5
+++ b/tests/boolean/bsection/D5
@@ -1,5 +1,5 @@
-restore a35 a
-restore b35 b
+restore [locate_data_file a35] a
+restore [locate_data_file b35] b
 bsection result a b
 
 set length 15.0786
diff --git a/tests/boolean/bsection/D6 b/tests/boolean/bsection/D6
index 974f93eeaa..6ba7f515ca 100644
--- a/tests/boolean/bsection/D6
+++ b/tests/boolean/bsection/D6
@@ -1,5 +1,5 @@
-restore a37 a
-restore b37 b
+restore [locate_data_file a37] a
+restore [locate_data_file b37] b
 bsection result a b
 
 set length 6.28319
diff --git a/tests/boolean/bsection/D7 b/tests/boolean/bsection/D7
index cebbfdc371..192471986c 100644
--- a/tests/boolean/bsection/D7
+++ b/tests/boolean/bsection/D7
@@ -1,5 +1,5 @@
-restore a38 a
-restore b38 b
+restore [locate_data_file a38] a
+restore [locate_data_file b38] b
 bsection result a b
 
 set length 8.24621
diff --git a/tests/boolean/bsection/D8 b/tests/boolean/bsection/D8
index 674f4891e2..703b646b54 100644
--- a/tests/boolean/bsection/D8
+++ b/tests/boolean/bsection/D8
@@ -1,6 +1,6 @@
 puts "TODO OCC22911 ALL: Error : The bsection is not valid."
-restore a50 a
-restore b50 b
+restore [locate_data_file a50] a
+restore [locate_data_file b50] b
 bsection result a b
 
 set length 0
diff --git a/tests/boolean/bsection/D9 b/tests/boolean/bsection/D9
index ce86c39e40..4a45403ce6 100644
--- a/tests/boolean/bsection/D9
+++ b/tests/boolean/bsection/D9
@@ -1,5 +1,5 @@
-restore a41 a
-restore b41 b
+restore [locate_data_file a41] a
+restore [locate_data_file b41] b
 bsection result a b
 
 set length 19.9279
diff --git a/tests/boolean/bsection/E1 b/tests/boolean/bsection/E1
index 61bc41de59..33b5064a1f 100644
--- a/tests/boolean/bsection/E1
+++ b/tests/boolean/bsection/E1
@@ -1,5 +1,5 @@
-restore a42 a
-restore b42 b
+restore [locate_data_file a42] a
+restore [locate_data_file b42] b
 bsection result a b
 
 set length 2.99998
diff --git a/tests/boolean/bsection/E2 b/tests/boolean/bsection/E2
index 6b2eda7fd3..96418d21e4 100644
--- a/tests/boolean/bsection/E2
+++ b/tests/boolean/bsection/E2
@@ -1,5 +1,5 @@
-restore a43 a
-restore b43 b
+restore [locate_data_file a43] a
+restore [locate_data_file b43] b
 bsection result a b
 
 set length 29.2833
diff --git a/tests/boolean/bsection/E3 b/tests/boolean/bsection/E3
index 604668249b..f129f88cd8 100644
--- a/tests/boolean/bsection/E3
+++ b/tests/boolean/bsection/E3
@@ -1,5 +1,5 @@
-restore a44 a
-restore b44 b
+restore [locate_data_file a44] a
+restore [locate_data_file b44] b
 bsection result a b
 
 set length 4.91577
diff --git a/tests/boolean/bsection/E4 b/tests/boolean/bsection/E4
index 4285650798..a5aa39810a 100644
--- a/tests/boolean/bsection/E4
+++ b/tests/boolean/bsection/E4
@@ -1,5 +1,5 @@
-restore a45 a
-restore b45 b
+restore [locate_data_file a45] a
+restore [locate_data_file b45] b
 bsection result a b
 
 set length 0.374089
diff --git a/tests/boolean/bsection/E5 b/tests/boolean/bsection/E5
index a4339656bc..0aa24a9f48 100644
--- a/tests/boolean/bsection/E5
+++ b/tests/boolean/bsection/E5
@@ -1,5 +1,5 @@
-restore a46 a
-restore b46 b
+restore [locate_data_file a46] a
+restore [locate_data_file b46] b
 bsection result a b
 
 set length 0.278859
diff --git a/tests/boolean/bsection/E6 b/tests/boolean/bsection/E6
index f45dcb374e..05ba008fe7 100644
--- a/tests/boolean/bsection/E6
+++ b/tests/boolean/bsection/E6
@@ -1,5 +1,5 @@
-restore a47 a
-restore b47 b
+restore [locate_data_file a47] a
+restore [locate_data_file b47] b
 bsection result a b
 
 set length 7.94247
diff --git a/tests/boolean/bsection/E7 b/tests/boolean/bsection/E7
index 44a4109926..cf3c501662 100644
--- a/tests/boolean/bsection/E7
+++ b/tests/boolean/bsection/E7
@@ -1,5 +1,5 @@
-restore a48 a
-restore b48 b
+restore [locate_data_file a48] a
+restore [locate_data_file b48] b
 bsection result a b
 
 set length 71.2757
diff --git a/tests/boolean/bsection/E8 b/tests/boolean/bsection/E8
index e52c430aba..bbfe1a15f0 100644
--- a/tests/boolean/bsection/E8
+++ b/tests/boolean/bsection/E8
@@ -1,6 +1,6 @@
 puts "TODO OCC22911 ALL: Error : The bsection is not valid."
-restore a49 a
-restore b49 b
+restore [locate_data_file a49] a
+restore [locate_data_file b49] b
 bsection result a b
 
 set length 0
diff --git a/tests/boolean/bsection/E9 b/tests/boolean/bsection/E9
index 2395361503..c0bb6a04f9 100644
--- a/tests/boolean/bsection/E9
+++ b/tests/boolean/bsection/E9
@@ -1,5 +1,5 @@
-restore a60 a
-restore b60_bsect b
+restore [locate_data_file a60] a
+restore [locate_data_file b60_bsect] b
 bsection result a b
 
 set length 1.64804
diff --git a/tests/boolean/bsection/F1 b/tests/boolean/bsection/F1
index 637402fe62..88fcdb6ae2 100644
--- a/tests/boolean/bsection/F1
+++ b/tests/boolean/bsection/F1
@@ -1,5 +1,5 @@
-restore a51 a
-restore b51 b
+restore [locate_data_file a51] a
+restore [locate_data_file b51] b
 bsection result a b
 
 set length 9.94056
diff --git a/tests/boolean/bsection/F2 b/tests/boolean/bsection/F2
index 644cfd2e11..4ef92c13c2 100644
--- a/tests/boolean/bsection/F2
+++ b/tests/boolean/bsection/F2
@@ -1,5 +1,5 @@
-restore a52 a
-restore b52 b
+restore [locate_data_file a52] a
+restore [locate_data_file b52] b
 bsection result a b
 
 set length 164.908
diff --git a/tests/boolean/bsection/F3 b/tests/boolean/bsection/F3
index b678cd828c..45446a96a2 100644
--- a/tests/boolean/bsection/F3
+++ b/tests/boolean/bsection/F3
@@ -1,5 +1,5 @@
-restore a53 a
-restore b53 b
+restore [locate_data_file a53] a
+restore [locate_data_file b53] b
 bsection result a b
 
 set length 15.2808
diff --git a/tests/boolean/bsection/F4 b/tests/boolean/bsection/F4
index 45c889244d..9861621762 100644
--- a/tests/boolean/bsection/F4
+++ b/tests/boolean/bsection/F4
@@ -1,5 +1,5 @@
-restore a54 a
-restore b54 b
+restore [locate_data_file a54] a
+restore [locate_data_file b54] b
 bsection result a b
 
 set length 3872.37
diff --git a/tests/boolean/bsection/F5 b/tests/boolean/bsection/F5
index 7aec3131d6..9490a253c2 100644
--- a/tests/boolean/bsection/F5
+++ b/tests/boolean/bsection/F5
@@ -1,5 +1,5 @@
-restore a55 a
-restore b55 b
+restore [locate_data_file a55] a
+restore [locate_data_file b55] b
 bsection result a b
 
 set length 15.7507
diff --git a/tests/boolean/bsection/F6 b/tests/boolean/bsection/F6
index 849cf741f7..867044d9f8 100644
--- a/tests/boolean/bsection/F6
+++ b/tests/boolean/bsection/F6
@@ -1,5 +1,5 @@
-restore a57_bsect a
-restore b57_bsect b
+restore [locate_data_file a57_bsect] a
+restore [locate_data_file b57_bsect] b
 bsection result a b
 
 set length 117.749
diff --git a/tests/boolean/bsection/F7 b/tests/boolean/bsection/F7
index f665fe9f64..aaeaa99b6f 100644
--- a/tests/boolean/bsection/F7
+++ b/tests/boolean/bsection/F7
@@ -1,5 +1,5 @@
-restore a58_bsect a
-restore b58_bsect b
+restore [locate_data_file a58_bsect] a
+restore [locate_data_file b58_bsect] b
 bsection result a b
 
 set length 3.46962
diff --git a/tests/boolean/bsection/F8 b/tests/boolean/bsection/F8
index 97d86e0342..6fad498eae 100644
--- a/tests/boolean/bsection/F8
+++ b/tests/boolean/bsection/F8
@@ -1,5 +1,5 @@
-restore a59 a
-restore b59 b
+restore [locate_data_file a59] a
+restore [locate_data_file b59] b
 bsection result a b
 
 set length 23.7344
diff --git a/tests/boolean/bsection/F9 b/tests/boolean/bsection/F9
index 86104fb40d..a9058b4090 100644
--- a/tests/boolean/bsection/F9
+++ b/tests/boolean/bsection/F9
@@ -1,5 +1,5 @@
-restore a61 a
-restore b61 b
+restore [locate_data_file a61] a
+restore [locate_data_file b61] b
 bsection result a b
 
 set length 773.793
diff --git a/tests/boolean/bsection/G1 b/tests/boolean/bsection/G1
index 9d771fff6e..cea6a412a1 100644
--- a/tests/boolean/bsection/G1
+++ b/tests/boolean/bsection/G1
@@ -1,5 +1,5 @@
-restore a62 a
-restore b62_bsect b
+restore [locate_data_file a62] a
+restore [locate_data_file b62_bsect] b
 bsection result a b
 
 set length 1.17784
diff --git a/tests/boolean/bsection/G2 b/tests/boolean/bsection/G2
index 0e1c699953..1a876a858e 100644
--- a/tests/boolean/bsection/G2
+++ b/tests/boolean/bsection/G2
@@ -1,5 +1,5 @@
-restore a64 a
-restore b64_bsect b
+restore [locate_data_file a64] a
+restore [locate_data_file b64_bsect] b
 bsection result a b
 
 set length 1.58211
diff --git a/tests/boolean/bsection/G3 b/tests/boolean/bsection/G3
index e6c05e0c7b..9a47881141 100644
--- a/tests/boolean/bsection/G3
+++ b/tests/boolean/bsection/G3
@@ -1,5 +1,5 @@
-restore a65 a
-restore b65 b
+restore [locate_data_file a65] a
+restore [locate_data_file b65] b
 bsection result a b
 
 set length 0.885026
diff --git a/tests/boolean/bsection/G4 b/tests/boolean/bsection/G4
index 70065c02bb..3aaadb1ca9 100644
--- a/tests/boolean/bsection/G4
+++ b/tests/boolean/bsection/G4
@@ -1,5 +1,5 @@
-restore a66 a
-restore b66_bsect b
+restore [locate_data_file a66] a
+restore [locate_data_file b66_bsect] b
 bsection result a b
 
 set length 20.2081
diff --git a/tests/boolean/bsection/G5 b/tests/boolean/bsection/G5
index 99581c1eb0..a7e53ce64c 100644
--- a/tests/boolean/bsection/G5
+++ b/tests/boolean/bsection/G5
@@ -1,5 +1,5 @@
-restore a67 a
-restore b67 b
+restore [locate_data_file a67] a
+restore [locate_data_file b67] b
 bsection result a b
 
 set length 5.75983
diff --git a/tests/boolean/bsection/G6 b/tests/boolean/bsection/G6
index 55e2079619..322e40786d 100644
--- a/tests/boolean/bsection/G6
+++ b/tests/boolean/bsection/G6
@@ -1,5 +1,5 @@
-restore a68 a
-restore b68 b
+restore [locate_data_file a68] a
+restore [locate_data_file b68] b
 bsection result a b
 
 set length 10.448
diff --git a/tests/boolean/bsection/G7 b/tests/boolean/bsection/G7
index 02f9bd290f..bd0322ef00 100644
--- a/tests/boolean/bsection/G7
+++ b/tests/boolean/bsection/G7
@@ -1,5 +1,5 @@
-restore a69 a
-restore b69 b
+restore [locate_data_file a69] a
+restore [locate_data_file b69] b
 bsection result a b
 
 set length 0.00170879
diff --git a/tests/boolean/bsection/G8 b/tests/boolean/bsection/G8
index b3f98b52e9..949c0dae73 100644
--- a/tests/boolean/bsection/G8
+++ b/tests/boolean/bsection/G8
@@ -1,5 +1,5 @@
-restore a71 a
-restore b71 b
+restore [locate_data_file a71] a
+restore [locate_data_file b71] b
 bsection result a b
 
 set length 10.8828
diff --git a/tests/boolean/bsection/G9 b/tests/boolean/bsection/G9
index 3e6a971615..12a67c5cf9 100644
--- a/tests/boolean/bsection/G9
+++ b/tests/boolean/bsection/G9
@@ -1,5 +1,5 @@
-restore a72 a
-restore b72 b
+restore [locate_data_file a72] a
+restore [locate_data_file b72] b
 bsection result a b
 
 set length 0.5
diff --git a/tests/boolean/bsection/H1 b/tests/boolean/bsection/H1
index 46c90599af..a6fd630aa6 100644
--- a/tests/boolean/bsection/H1
+++ b/tests/boolean/bsection/H1
@@ -1,5 +1,5 @@
-restore a73 a
-restore b73 b
+restore [locate_data_file a73] a
+restore [locate_data_file b73] b
 bsection result a b
 
 set length 13.1087
diff --git a/tests/boolean/bsection/H2 b/tests/boolean/bsection/H2
index 340aa45599..103dfb862d 100644
--- a/tests/boolean/bsection/H2
+++ b/tests/boolean/bsection/H2
@@ -1,5 +1,5 @@
-restore a74 a
-restore b74 b
+restore [locate_data_file a74] a
+restore [locate_data_file b74] b
 bsection result a b
 
 set length 94.0179
diff --git a/tests/boolean/bsection/H3 b/tests/boolean/bsection/H3
index 682cf3298d..891fbd30be 100644
--- a/tests/boolean/bsection/H3
+++ b/tests/boolean/bsection/H3
@@ -1,4 +1,4 @@
-restore BUGDATA_2293.rle a
+restore [locate_data_file BUGDATA_2293.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/H4 b/tests/boolean/bsection/H4
index d791944720..a8228fcf01 100644
--- a/tests/boolean/bsection/H4
+++ b/tests/boolean/bsection/H4
@@ -1,4 +1,4 @@
-restore BUGDATA_2293_nofog.rle a
+restore [locate_data_file BUGDATA_2293_nofog.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/H5 b/tests/boolean/bsection/H5
index 27ae82737c..69bb1afec6 100644
--- a/tests/boolean/bsection/H5
+++ b/tests/boolean/bsection/H5
@@ -1,4 +1,4 @@
-restore BUGDATA_2381.rle a
+restore [locate_data_file BUGDATA_2381.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/H6 b/tests/boolean/bsection/H6
index f92fcf0784..8354f4b121 100644
--- a/tests/boolean/bsection/H6
+++ b/tests/boolean/bsection/H6
@@ -1,4 +1,4 @@
-restore BUGDATA_2381_nofog.rle a
+restore [locate_data_file BUGDATA_2381_nofog.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/H7 b/tests/boolean/bsection/H7
index f3c600fc00..30ba45b2f5 100644
--- a/tests/boolean/bsection/H7
+++ b/tests/boolean/bsection/H7
@@ -1,4 +1,4 @@
-restore GEN453.rle a
+restore [locate_data_file GEN453.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/H8 b/tests/boolean/bsection/H8
index 147181d9dd..8e9a851b65 100644
--- a/tests/boolean/bsection/H8
+++ b/tests/boolean/bsection/H8
@@ -1,4 +1,4 @@
-restore GEN453_nofog.rle a
+restore [locate_data_file GEN453_nofog.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/H9 b/tests/boolean/bsection/H9
index 7a0864a660..3fc4336768 100644
--- a/tests/boolean/bsection/H9
+++ b/tests/boolean/bsection/H9
@@ -1,4 +1,4 @@
-restore GEN465.rle a
+restore [locate_data_file GEN465.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/I1 b/tests/boolean/bsection/I1
index b6cc906685..7a695c08b5 100644
--- a/tests/boolean/bsection/I1
+++ b/tests/boolean/bsection/I1
@@ -1,4 +1,4 @@
-restore GEN465_nofog.rle a
+restore [locate_data_file GEN465_nofog.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/I2 b/tests/boolean/bsection/I2
index 770be17747..db89a87e64 100644
--- a/tests/boolean/bsection/I2
+++ b/tests/boolean/bsection/I2
@@ -1,4 +1,4 @@
-restore GEN510-3454.rle a
+restore [locate_data_file GEN510-3454.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/I3 b/tests/boolean/bsection/I3
index bb5bd23853..f7958a308a 100644
--- a/tests/boolean/bsection/I3
+++ b/tests/boolean/bsection/I3
@@ -1,4 +1,4 @@
-restore GEN510-3454_nofog.rle a
+restore [locate_data_file GEN510-3454_nofog.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/I4 b/tests/boolean/bsection/I4
index 72190cc820..11e4f92d19 100644
--- a/tests/boolean/bsection/I4
+++ b/tests/boolean/bsection/I4
@@ -1,4 +1,4 @@
-restore GEN510-3666.rle a
+restore [locate_data_file GEN510-3666.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/I5 b/tests/boolean/bsection/I5
index 7f8a8d76ba..ebd84b23d0 100644
--- a/tests/boolean/bsection/I5
+++ b/tests/boolean/bsection/I5
@@ -1,4 +1,4 @@
-restore GEN510-3666_nofog.rle a
+restore [locate_data_file GEN510-3666_nofog.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/I6 b/tests/boolean/bsection/I6
index 45b93bd659..c5dc688c67 100644
--- a/tests/boolean/bsection/I6
+++ b/tests/boolean/bsection/I6
@@ -1,4 +1,4 @@
-restore GEN510-3681.rle a
+restore [locate_data_file GEN510-3681.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/I7 b/tests/boolean/bsection/I7
index c7b90d1e05..640c1b95fa 100644
--- a/tests/boolean/bsection/I7
+++ b/tests/boolean/bsection/I7
@@ -1,4 +1,4 @@
-restore GEN510-3681_nofog.rle a
+restore [locate_data_file GEN510-3681_nofog.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/I8 b/tests/boolean/bsection/I8
index cf9d9ca690..21ba82b2d3 100644
--- a/tests/boolean/bsection/I8
+++ b/tests/boolean/bsection/I8
@@ -1,4 +1,4 @@
-restore GEN525_3291.rle a
+restore [locate_data_file GEN525_3291.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/I9 b/tests/boolean/bsection/I9
index 531bc7ee74..75f36d0e78 100644
--- a/tests/boolean/bsection/I9
+++ b/tests/boolean/bsection/I9
@@ -1,4 +1,4 @@
-restore GEN525_3367_1.rle a
+restore [locate_data_file GEN525_3367_1.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/J1 b/tests/boolean/bsection/J1
index ebd5a13c19..15226389c1 100644
--- a/tests/boolean/bsection/J1
+++ b/tests/boolean/bsection/J1
@@ -1,4 +1,4 @@
-restore GEN525_3367_1_nofog.rle a
+restore [locate_data_file GEN525_3367_1_nofog.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/J2 b/tests/boolean/bsection/J2
index 1873134ee5..a5143d90de 100644
--- a/tests/boolean/bsection/J2
+++ b/tests/boolean/bsection/J2
@@ -1,4 +1,4 @@
-restore GEN525_3367_2.rle a
+restore [locate_data_file GEN525_3367_2.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/J3 b/tests/boolean/bsection/J3
index 1bfd52122a..952cef0f7d 100644
--- a/tests/boolean/bsection/J3
+++ b/tests/boolean/bsection/J3
@@ -1,4 +1,4 @@
-restore GEN525_3367_2_nofog.rle a
+restore [locate_data_file GEN525_3367_2_nofog.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/J4 b/tests/boolean/bsection/J4
index f1975c7c86..373da701ca 100644
--- a/tests/boolean/bsection/J4
+++ b/tests/boolean/bsection/J4
@@ -1,4 +1,4 @@
-restore GEN525_3403.rle a
+restore [locate_data_file GEN525_3403.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/J5 b/tests/boolean/bsection/J5
index 2f84b2d28d..2acd8d9fae 100644
--- a/tests/boolean/bsection/J5
+++ b/tests/boolean/bsection/J5
@@ -1,4 +1,4 @@
-restore GEN525_3403_nofog.rle a
+restore [locate_data_file GEN525_3403_nofog.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/J6 b/tests/boolean/bsection/J6
index fa717a4065..0368f5c561 100644
--- a/tests/boolean/bsection/J6
+++ b/tests/boolean/bsection/J6
@@ -1,4 +1,4 @@
-restore GEN539.rle a
+restore [locate_data_file GEN539.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/J7 b/tests/boolean/bsection/J7
index ea83015c01..4047734d1a 100644
--- a/tests/boolean/bsection/J7
+++ b/tests/boolean/bsection/J7
@@ -1,4 +1,4 @@
-restore GEN539_nofog.rle a
+restore [locate_data_file GEN539_nofog.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/J8 b/tests/boolean/bsection/J8
index 51fe283824..17f185d094 100644
--- a/tests/boolean/bsection/J8
+++ b/tests/boolean/bsection/J8
@@ -1,4 +1,4 @@
-restore GEN585.rle a
+restore [locate_data_file GEN585.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/J9 b/tests/boolean/bsection/J9
index 10ae1dd00e..9f1c011c02 100644
--- a/tests/boolean/bsection/J9
+++ b/tests/boolean/bsection/J9
@@ -1,4 +1,4 @@
-restore GEN585_nofog.rle a
+restore [locate_data_file GEN585_nofog.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/K1 b/tests/boolean/bsection/K1
index 281166d7b5..8954e6b058 100644
--- a/tests/boolean/bsection/K1
+++ b/tests/boolean/bsection/K1
@@ -1,4 +1,4 @@
-restore GEN594.rle a
+restore [locate_data_file GEN594.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/K2 b/tests/boolean/bsection/K2
index bf38559a20..a2f83f45c7 100644
--- a/tests/boolean/bsection/K2
+++ b/tests/boolean/bsection/K2
@@ -1,4 +1,4 @@
-restore GEN594_nofog.rle a
+restore [locate_data_file GEN594_nofog.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/K3 b/tests/boolean/bsection/K3
index 8e36b68451..076c88a569 100644
--- a/tests/boolean/bsection/K3
+++ b/tests/boolean/bsection/K3
@@ -1,4 +1,4 @@
-restore GEN605.rle a
+restore [locate_data_file GEN605.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/K4 b/tests/boolean/bsection/K4
index 8c946ba9c1..1ebc2957ff 100644
--- a/tests/boolean/bsection/K4
+++ b/tests/boolean/bsection/K4
@@ -1,4 +1,4 @@
-restore GEN605_nofog.rle a
+restore [locate_data_file GEN605_nofog.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/K5 b/tests/boolean/bsection/K5
index f4e2f558be..5adbefb4d7 100644
--- a/tests/boolean/bsection/K5
+++ b/tests/boolean/bsection/K5
@@ -1,4 +1,4 @@
-restore GEN664.rle a
+restore [locate_data_file GEN664.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/K6 b/tests/boolean/bsection/K6
index b320cecde1..c7f61e4b4a 100644
--- a/tests/boolean/bsection/K6
+++ b/tests/boolean/bsection/K6
@@ -1,4 +1,4 @@
-restore GEN664_nofog.rle a
+restore [locate_data_file GEN664_nofog.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/K7 b/tests/boolean/bsection/K7
index 37a7ec0887..2ecb0874ae 100644
--- a/tests/boolean/bsection/K7
+++ b/tests/boolean/bsection/K7
@@ -1,4 +1,4 @@
-restore GEN676.rle a
+restore [locate_data_file GEN676.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/K8 b/tests/boolean/bsection/K8
index 8d6e16c204..eadc406fc1 100644
--- a/tests/boolean/bsection/K8
+++ b/tests/boolean/bsection/K8
@@ -1,4 +1,4 @@
-restore GEN676_nofog.rle a
+restore [locate_data_file GEN676_nofog.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/K9 b/tests/boolean/bsection/K9
index fe547d35d8..eb8c22df92 100644
--- a/tests/boolean/bsection/K9
+++ b/tests/boolean/bsection/K9
@@ -1,4 +1,4 @@
-restore GEN677.rle a
+restore [locate_data_file GEN677.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/L1 b/tests/boolean/bsection/L1
index fa0c89fe3e..c97a4606e3 100644
--- a/tests/boolean/bsection/L1
+++ b/tests/boolean/bsection/L1
@@ -1,4 +1,4 @@
-restore GEN731.rle a
+restore [locate_data_file GEN731.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/L2 b/tests/boolean/bsection/L2
index fdddd8dd24..fdb697683e 100644
--- a/tests/boolean/bsection/L2
+++ b/tests/boolean/bsection/L2
@@ -1,4 +1,4 @@
-restore GEN731_nofog.rle a
+restore [locate_data_file GEN731_nofog.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/L3 b/tests/boolean/bsection/L3
index 2c2a5e75ba..c915ff1b57 100644
--- a/tests/boolean/bsection/L3
+++ b/tests/boolean/bsection/L3
@@ -1,4 +1,4 @@
-restore GEN745.rle a
+restore [locate_data_file GEN745.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/L4 b/tests/boolean/bsection/L4
index 38029a81d8..5954d0f809 100644
--- a/tests/boolean/bsection/L4
+++ b/tests/boolean/bsection/L4
@@ -1,4 +1,4 @@
-restore GEN745_nofog.rle a
+restore [locate_data_file GEN745_nofog.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/L5 b/tests/boolean/bsection/L5
index 69f7752e9d..a0736d0b47 100644
--- a/tests/boolean/bsection/L5
+++ b/tests/boolean/bsection/L5
@@ -1,4 +1,4 @@
-restore GEN746.rle a
+restore [locate_data_file GEN746.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/L6 b/tests/boolean/bsection/L6
index 81d7a800b8..1b85ff1353 100644
--- a/tests/boolean/bsection/L6
+++ b/tests/boolean/bsection/L6
@@ -1,4 +1,4 @@
-restore GEN746_nofog.rle a
+restore [locate_data_file GEN746_nofog.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/L7 b/tests/boolean/bsection/L7
index 9edb377f36..805348a55b 100644
--- a/tests/boolean/bsection/L7
+++ b/tests/boolean/bsection/L7
@@ -1,4 +1,4 @@
-restore GEN747.rle a
+restore [locate_data_file GEN747.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/L8 b/tests/boolean/bsection/L8
index 66763b93e9..f7a0a4abf5 100644
--- a/tests/boolean/bsection/L8
+++ b/tests/boolean/bsection/L8
@@ -1,4 +1,4 @@
-restore GEN747_nofog.rle a
+restore [locate_data_file GEN747_nofog.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/L9 b/tests/boolean/bsection/L9
index b33d52e837..f42b356e68 100644
--- a/tests/boolean/bsection/L9
+++ b/tests/boolean/bsection/L9
@@ -1,4 +1,4 @@
-restore GEN757.rle a
+restore [locate_data_file GEN757.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/M1 b/tests/boolean/bsection/M1
index c4064bad6e..abef12371a 100644
--- a/tests/boolean/bsection/M1
+++ b/tests/boolean/bsection/M1
@@ -1,4 +1,4 @@
-restore GEN757_nofog.rle a
+restore [locate_data_file GEN757_nofog.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/M2 b/tests/boolean/bsection/M2
index 4b6f33c82f..c78efc9bc7 100644
--- a/tests/boolean/bsection/M2
+++ b/tests/boolean/bsection/M2
@@ -1,4 +1,4 @@
-restore GEN758.rle a
+restore [locate_data_file GEN758.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/M3 b/tests/boolean/bsection/M3
index 8fd04b11eb..02e8bacc4f 100644
--- a/tests/boolean/bsection/M3
+++ b/tests/boolean/bsection/M3
@@ -1,4 +1,4 @@
-restore GEN758_nofog.rle a
+restore [locate_data_file GEN758_nofog.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/M4 b/tests/boolean/bsection/M4
index a0cac22557..ef8e05d368 100644
--- a/tests/boolean/bsection/M4
+++ b/tests/boolean/bsection/M4
@@ -1,4 +1,4 @@
-restore GEN776.rle a
+restore [locate_data_file GEN776.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/M5 b/tests/boolean/bsection/M5
index 00cd4cfe53..01ed221158 100644
--- a/tests/boolean/bsection/M5
+++ b/tests/boolean/bsection/M5
@@ -1,4 +1,4 @@
-restore GEN776_nofog.rle a
+restore [locate_data_file GEN776_nofog.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/M6 b/tests/boolean/bsection/M6
index adf2709972..766572f38e 100644
--- a/tests/boolean/bsection/M6
+++ b/tests/boolean/bsection/M6
@@ -1,4 +1,4 @@
-restore GEN778.rle a
+restore [locate_data_file GEN778.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/M7 b/tests/boolean/bsection/M7
index 1ec77a191e..b6f933c333 100644
--- a/tests/boolean/bsection/M7
+++ b/tests/boolean/bsection/M7
@@ -1,4 +1,4 @@
-restore GEN778_nofog.rle a
+restore [locate_data_file GEN778_nofog.rle] a
 explode a
 bsection result a_1 a_2 -2d -a
 
diff --git a/tests/boolean/bsection/M8 b/tests/boolean/bsection/M8
index 986959c444..2d3530b1de 100644
--- a/tests/boolean/bsection/M8
+++ b/tests/boolean/bsection/M8
@@ -1,4 +1,4 @@
-restore lh3d_px1.brep a
+restore [locate_data_file lh3d_px1.brep] a
 
 #removing intersection of faces a_3 and a_220
 
diff --git a/tests/boolean/bsection/M9 b/tests/boolean/bsection/M9
index 50524d03cd..f00c4d4189 100644
--- a/tests/boolean/bsection/M9
+++ b/tests/boolean/bsection/M9
@@ -1,4 +1,4 @@
-restore lh3d_px1.brep a
+restore [locate_data_file lh3d_px1.brep] a
 
 #removing intersection of faces a_3 and a_220
 
diff --git a/tests/boolean/bsection/N2 b/tests/boolean/bsection/N2
index 315e7a3bc7..ad00ee1898 100644
--- a/tests/boolean/bsection/N2
+++ b/tests/boolean/bsection/N2
@@ -1,4 +1,4 @@
-restore lh3d_px1.brep a
+restore [locate_data_file lh3d_px1.brep] a
 plane p 0 0 0 1 0 0
 mkface f p
 bsection result a f -2d -a
diff --git a/tests/boolean/bsection/N4 b/tests/boolean/bsection/N4
index 3442311700..2f77a9a32d 100644
--- a/tests/boolean/bsection/N4
+++ b/tests/boolean/bsection/N4
@@ -1,6 +1,6 @@
 cpulimit 1000
 
-restore lh3d_px2.brep a
+restore [locate_data_file lh3d_px2.brep] a
 compound result
 set i 1
 repeat 199 {
diff --git a/tests/boolean/bsection/N5 b/tests/boolean/bsection/N5
index 192f2141e0..b8c8969842 100644
--- a/tests/boolean/bsection/N5
+++ b/tests/boolean/bsection/N5
@@ -1,6 +1,6 @@
 cpulimit 900
 
-restore lh3d_px2.brep a
+restore [locate_data_file lh3d_px2.brep] a
 set i 1
 compound result
 repeat 155 {
diff --git a/tests/boolean/bsection/N6 b/tests/boolean/bsection/N6
index 4d75669352..d93c144419 100644
--- a/tests/boolean/bsection/N6
+++ b/tests/boolean/bsection/N6
@@ -1,4 +1,4 @@
-restore lh3d_ro1.brep a
+restore [locate_data_file lh3d_ro1.brep] a
 compound result
 isos a 0
 set i -60
diff --git a/tests/boolean/bsection/N7 b/tests/boolean/bsection/N7
index 8efc679dc9..ec389e6d4f 100644
--- a/tests/boolean/bsection/N7
+++ b/tests/boolean/bsection/N7
@@ -1,6 +1,6 @@
 cpulimit 900
 
-restore lh3d_ro1.brep a
+restore [locate_data_file lh3d_ro1.brep] a
 isos a 0
 compound result
 set i 1
diff --git a/tests/boolean/bsection/N8 b/tests/boolean/bsection/N8
index a54771896f..d50d557039 100644
--- a/tests/boolean/bsection/N8
+++ b/tests/boolean/bsection/N8
@@ -1,5 +1,5 @@
-restore cts20976a.rle a
-restore cts20976b.rle b
+restore [locate_data_file cts20976a.rle] a
+restore [locate_data_file cts20976b.rle] b
 bsection result a b
 
 set length 119.639
diff --git a/tests/boolean/bsection/N9 b/tests/boolean/bsection/N9
index ce7bb7dfa0..98c506dafe 100644
--- a/tests/boolean/bsection/N9
+++ b/tests/boolean/bsection/N9
@@ -1,5 +1,5 @@
-restore fra61083a.rle a
-restore fra61083b.rle b
+restore [locate_data_file fra61083a.rle] a
+restore [locate_data_file fra61083b.rle] b
 bsection result a b
 
 set length 10
diff --git a/tests/boolean/bsection/O1 b/tests/boolean/bsection/O1
index 552ef3fc5c..957929b685 100644
--- a/tests/boolean/bsection/O1
+++ b/tests/boolean/bsection/O1
@@ -1,5 +1,5 @@
-restore pro12053a.rle a
-restore pro12053b.rle b
+restore [locate_data_file pro12053a.rle] a
+restore [locate_data_file pro12053b.rle] b
 bsection result a b
 
 set length 132.564
diff --git a/tests/boolean/bsection/O2 b/tests/boolean/bsection/O2
index f62f390851..8e40ae83b5 100644
--- a/tests/boolean/bsection/O2
+++ b/tests/boolean/bsection/O2
@@ -1,5 +1,5 @@
-restore pro14150a.rle a
-restore pro14150b.rle b
+restore [locate_data_file pro14150a.rle] a
+restore [locate_data_file pro14150b.rle] b
 bsection result a b -2d
 
 set length 267.619
diff --git a/tests/boolean/bsection/O3 b/tests/boolean/bsection/O3
index 6369c9bf72..72e4c9279a 100644
--- a/tests/boolean/bsection/O3
+++ b/tests/boolean/bsection/O3
@@ -1,5 +1,5 @@
-restore pro14151a.rle a
-restore pro14151b.rle b
+restore [locate_data_file pro14151a.rle] a
+restore [locate_data_file pro14151b.rle] b
 bsection result a b
 
 set length 49.9609
diff --git a/tests/boolean/bsection/O4 b/tests/boolean/bsection/O4
index 1c53f989d3..0807343ef5 100644
--- a/tests/boolean/bsection/O4
+++ b/tests/boolean/bsection/O4
@@ -1,5 +1,5 @@
-restore pro14151a.rle a
-restore pro14151b.rle b
+restore [locate_data_file pro14151a.rle] a
+restore [locate_data_file pro14151b.rle] b
 bsection result b a
 
 set length 49.9609
diff --git a/tests/boolean/bsection/O5 b/tests/boolean/bsection/O5
index 9207dba35e..e2f5ae5d2d 100644
--- a/tests/boolean/bsection/O5
+++ b/tests/boolean/bsection/O5
@@ -1,5 +1,5 @@
-restore pro14151a.rle a
-restore pro14151b.rle b
+restore [locate_data_file pro14151a.rle] a
+restore [locate_data_file pro14151b.rle] b
 bsection result a b -2d
 
 set length 49.9609
diff --git a/tests/boolean/bsection/O6 b/tests/boolean/bsection/O6
index e24373fac6..d4e636b71c 100644
--- a/tests/boolean/bsection/O6
+++ b/tests/boolean/bsection/O6
@@ -1,5 +1,5 @@
-restore pro14151a.rle a
-restore pro14151b.rle b
+restore [locate_data_file pro14151a.rle] a
+restore [locate_data_file pro14151b.rle] b
 bsection result b a -2d
 
 set length 49.9609
diff --git a/tests/boolean/bsection/O7 b/tests/boolean/bsection/O7
index b25b0b9c97..104265b983 100644
--- a/tests/boolean/bsection/O7
+++ b/tests/boolean/bsection/O7
@@ -1,5 +1,5 @@
-restore cts21184a.rle a
-restore cts21184b.rle b
+restore [locate_data_file cts21184a.rle] a
+restore [locate_data_file cts21184b.rle] b
 bsection result a b
 
 set length 751.43
diff --git a/tests/boolean/bsection/O8 b/tests/boolean/bsection/O8
index 56e7acfe26..82744339a1 100644
--- a/tests/boolean/bsection/O8
+++ b/tests/boolean/bsection/O8
@@ -1,5 +1,5 @@
-restore cts21302a.rle a
-restore cts21302b.rle b
+restore [locate_data_file cts21302a.rle] a
+restore [locate_data_file cts21302b.rle] b
 bsection result a b
 
 set length 79.1327
diff --git a/tests/boolean/bsection/O9 b/tests/boolean/bsection/O9
index 06210aba14..26568e1612 100644
--- a/tests/boolean/bsection/O9
+++ b/tests/boolean/bsection/O9
@@ -1,4 +1,4 @@
-restore buc60302.rle a
+restore [locate_data_file buc60302.rle] a
 plane planz 0 0 0 0 0 1
 mkface fass planz -100 100 -100 100
 bsection result a fass
diff --git a/tests/boolean/bsection/P1 b/tests/boolean/bsection/P1
index c875461145..2e748335f5 100644
--- a/tests/boolean/bsection/P1
+++ b/tests/boolean/bsection/P1
@@ -1,4 +1,4 @@
-restore intcq001.brep m
+restore [locate_data_file intcq001.brep] m
 explode m
 compound m_1 m_3 c1
 compound m_2 m_4 c2
diff --git a/tests/boolean/bsection/P2 b/tests/boolean/bsection/P2
index d0b8cc90eb..9605f32053 100644
--- a/tests/boolean/bsection/P2
+++ b/tests/boolean/bsection/P2
@@ -1,4 +1,4 @@
-restore intcq002.brep m
+restore [locate_data_file intcq002.brep] m
 explode m
 # m_1 : Sr Revolution
 # m_2 : Sr Reglee
diff --git a/tests/boolean/bsection/P3 b/tests/boolean/bsection/P3
index 50a35953ae..d12bcfc999 100644
--- a/tests/boolean/bsection/P3
+++ b/tests/boolean/bsection/P3
@@ -1,4 +1,4 @@
-restore intcq003.brep m
+restore [locate_data_file intcq003.brep] m
 explode m
 # m_1 : Cq
 # m_2 -> m_5 : Cones
diff --git a/tests/boolean/bsection/P4 b/tests/boolean/bsection/P4
index 47911a66bd..669ca81e4a 100644
--- a/tests/boolean/bsection/P4
+++ b/tests/boolean/bsection/P4
@@ -1,4 +1,4 @@
-restore intcq004.brep m
+restore [locate_data_file intcq004.brep] m
 explode m
 # primitives : m_1 m_3 m_4 m_5
 # m_2 : Bloc
diff --git a/tests/boolean/bsection/P5 b/tests/boolean/bsection/P5
index 09c04bf7e5..7bdac79e2f 100644
--- a/tests/boolean/bsection/P5
+++ b/tests/boolean/bsection/P5
@@ -1,4 +1,4 @@
-restore intcq101.brep m
+restore [locate_data_file intcq101.brep] m
 explode m f
 # m_1
 bsection result m_1 m_2 -2d -a
diff --git a/tests/boolean/bsection/P6 b/tests/boolean/bsection/P6
index c3310a9428..a792aa730b 100644
--- a/tests/boolean/bsection/P6
+++ b/tests/boolean/bsection/P6
@@ -1,4 +1,4 @@
-restore intcq102.brep m
+restore [locate_data_file intcq102.brep] m
 explode m
 # m_1 : Prisme
 # m_2 : Contre-depouille
diff --git a/tests/boolean/bsection/P7 b/tests/boolean/bsection/P7
index bd17309b15..749ba781b7 100644
--- a/tests/boolean/bsection/P7
+++ b/tests/boolean/bsection/P7
@@ -1,4 +1,4 @@
-restore intcq104.brep m
+restore [locate_data_file intcq104.brep] m
 explode m
 # m_1 : Bossage
 # m_2 : Carreau (Enveloppe)
diff --git a/tests/boolean/bsection/P8 b/tests/boolean/bsection/P8
index 70ccb00d25..b50d0bfcdd 100644
--- a/tests/boolean/bsection/P8
+++ b/tests/boolean/bsection/P8
@@ -1,4 +1,4 @@
-restore intcq105.brep m
+restore [locate_data_file intcq105.brep] m
 explode m
 # m_1 : Carreau Support
 # m_2 : Bossage
diff --git a/tests/boolean/bsection/Q1 b/tests/boolean/bsection/Q1
index 8d9472fcfa..27a0e64c28 100644
--- a/tests/boolean/bsection/Q1
+++ b/tests/boolean/bsection/Q1
@@ -1,8 +1,8 @@
 # Original bug : cts20339
 # Date : 19Mai98
 
-restore cts20339a.rle a
-restore cts20339b.rle b
+restore [locate_data_file cts20339a.rle] a
+restore [locate_data_file cts20339b.rle] b
 
 bsection result a b
 
diff --git a/tests/boolean/bsection/Q2 b/tests/boolean/bsection/Q2
index 2052cc6a38..a85bce7006 100644
--- a/tests/boolean/bsection/Q2
+++ b/tests/boolean/bsection/Q2
@@ -1,8 +1,8 @@
 # Original bug : cts20527
 # Date : 19Mai98
 
-restore cts20527a.rle a
-restore cts20527b.rle b
+restore [locate_data_file cts20527a.rle] a
+restore [locate_data_file cts20527b.rle] b
 
 bsection result a b
 
diff --git a/tests/boolean/bsection/Q4 b/tests/boolean/bsection/Q4
index df43250fed..ca922950a1 100644
--- a/tests/boolean/bsection/Q4
+++ b/tests/boolean/bsection/Q4
@@ -1,8 +1,8 @@
 # Original bug : cts20370
 # Date : 19Mai98
 
-restore cts20370-part.rle part
-restore cts20370-tool.rle tool
+restore [locate_data_file cts20370-part.rle] part
+restore [locate_data_file cts20370-tool.rle] tool
 
 bsection result part tool
 
diff --git a/tests/boolean/bsection/Q5 b/tests/boolean/bsection/Q5
index c4a20c1c71..937f9c8c4d 100644
--- a/tests/boolean/bsection/Q5
+++ b/tests/boolean/bsection/Q5
@@ -1,8 +1,8 @@
 # Original bug : cts20482
 # Date : 19Mai98
 
-restore cts20482-part.rle part
-restore cts20482-tool1.rle tool1
+restore [locate_data_file cts20482-part.rle] part
+restore [locate_data_file cts20482-tool1.rle] tool1
 
 bsection result part tool1
 
diff --git a/tests/boolean/bsection/Q6 b/tests/boolean/bsection/Q6
index 5902a5a67a..ae510e6853 100644
--- a/tests/boolean/bsection/Q6
+++ b/tests/boolean/bsection/Q6
@@ -1,8 +1,8 @@
 # Original bug : cts20482
 # Date : 19Mai98
 
-restore cts20482-part.rle part
-restore cts20482-tool2.rle tool2
+restore [locate_data_file cts20482-part.rle] part
+restore [locate_data_file cts20482-tool2.rle] tool2
 
 bsection result part tool2
 
diff --git a/tests/boolean/bsection/Q7 b/tests/boolean/bsection/Q7
index 87926a867e..3ab9c59cc4 100644
--- a/tests/boolean/bsection/Q7
+++ b/tests/boolean/bsection/Q7
@@ -1,8 +1,8 @@
 # Original bug : cts20484
 # Date : 19Mai98
 
-restore cts20484-part.rle part
-restore cts20484-tool1.rle tool1
+restore [locate_data_file cts20484-part.rle] part
+restore [locate_data_file cts20484-tool1.rle] tool1
 
 bsection result part tool1
 
diff --git a/tests/boolean/bsection/Q8 b/tests/boolean/bsection/Q8
index 6c6314825d..6c7edc2001 100644
--- a/tests/boolean/bsection/Q8
+++ b/tests/boolean/bsection/Q8
@@ -1,8 +1,8 @@
 # Original bug : cts20549
 # Date : 19Mai98
 
-restore cts20549a.rle a
-restore cts20549b.rle b
+restore [locate_data_file cts20549a.rle] a
+restore [locate_data_file cts20549b.rle] b
 
 bsection result a b
 
diff --git a/tests/boolean/bsection/Q9 b/tests/boolean/bsection/Q9
index 21039a22e5..4ae59e13e0 100644
--- a/tests/boolean/bsection/Q9
+++ b/tests/boolean/bsection/Q9
@@ -1,8 +1,8 @@
 # Original bug : spo0139
 # Date : 19Mai98
 
-restore spo0139a.rle a
-restore spo0139b.rle b
+restore [locate_data_file spo0139a.rle] a
+restore [locate_data_file spo0139b.rle] b
 
 bsection result a b
 
diff --git a/tests/boolean/bsection/R1 b/tests/boolean/bsection/R1
index 3d1c7bc465..799a55b61e 100644
--- a/tests/boolean/bsection/R1
+++ b/tests/boolean/bsection/R1
@@ -1,8 +1,8 @@
 # Original bug : cts20290 : 
 # Date : 12June98
 
-restore cts20290a.rle a 
-restore cts20290b.rle b
+restore [locate_data_file cts20290a.rle] a 
+restore [locate_data_file cts20290b.rle] b
 
 #pkv f
 btolx a
diff --git a/tests/boolean/bsection/R2 b/tests/boolean/bsection/R2
index d42a19caba..bea1d151e9 100644
--- a/tests/boolean/bsection/R2
+++ b/tests/boolean/bsection/R2
@@ -1,8 +1,8 @@
 # Original bug : cts20918
 # Date : 12June98
 
-restore cts20918a.rle a 
-restore cts20918b.rle b
+restore [locate_data_file cts20918a.rle] a 
+restore [locate_data_file cts20918b.rle] b
 #pkv f
 updatetolerance a 1
 updatetolerance b 1
diff --git a/tests/boolean/bsection/R3 b/tests/boolean/bsection/R3
index 2096f6e36b..d5b57c98c3 100644
--- a/tests/boolean/bsection/R3
+++ b/tests/boolean/bsection/R3
@@ -1,7 +1,7 @@
 ## buc60289
 
-restore Face1.rle a
-restore Plan.rle b
+restore [locate_data_file Face1.rle] a
+restore [locate_data_file Plan.rle] b
 
 bsection result a b
 
diff --git a/tests/boolean/bsection/R4 b/tests/boolean/bsection/R4
index e3241f930a..650b88ac54 100644
--- a/tests/boolean/bsection/R4
+++ b/tests/boolean/bsection/R4
@@ -1,10 +1,10 @@
 ## pro12473
 
-restore objects.brep a
+restore [locate_data_file objects.brep] a
 explode a sh
 copy a_1 a
 
-restore tool_4.brep b
+restore [locate_data_file tool_4.brep] b
 explode b sh
 copy b_1 b
 
diff --git a/tests/boolean/bsection/R5 b/tests/boolean/bsection/R5
index 11ef65717f..35036aaabc 100644
--- a/tests/boolean/bsection/R5
+++ b/tests/boolean/bsection/R5
@@ -1,10 +1,10 @@
 # pro15545
 
-restore coque1.brep c1
+restore [locate_data_file coque1.brep] c1
 explode c1 sh
 renamevar c1_1 c1
 
-restore coque2.brep c2 
+restore [locate_data_file coque2.brep] c2 
 explode c2 sh
 renamevar c2_1 c2
 
diff --git a/tests/boolean/bsection/R6 b/tests/boolean/bsection/R6
index fbdcb5c46c..fca3932e1f 100644
--- a/tests/boolean/bsection/R6
+++ b/tests/boolean/bsection/R6
@@ -2,14 +2,14 @@ puts " BUC60068 "
 puts "If scales by 1000, time to compute is 10 times greater "
 ##
 ## mod pkv from
-restore buc60068a.rle a
-restore buc60068b.rle b
-restore buc60068a.rle c
-restore buc60068b.rle d
-restore buc60068a.rle e
-restore buc60068b.rle f
-restore buc60068a.rle g
-restore buc60068b.rle h
+restore [locate_data_file buc60068a.rle] a
+restore [locate_data_file buc60068b.rle] b
+restore [locate_data_file buc60068a.rle] c
+restore [locate_data_file buc60068b.rle] d
+restore [locate_data_file buc60068a.rle] e
+restore [locate_data_file buc60068b.rle] f
+restore [locate_data_file buc60068a.rle] g
+restore [locate_data_file buc60068b.rle] h
 ## mod pkv from
 ##
 
@@ -36,15 +36,15 @@ dchrono m start
 bsection resgh g h
 dchrono m stop
 
-regexp {Elapsed time: ([0-9]+) Hours ([0-9]+) Minutes ([0-9]|.+) Seconds} [dchrono j show] full Jhours Jminutes Jseconds
-regexp {Elapsed time: ([0-9]+) Hours ([0-9]+) Minutes ([0-9]|.+) Seconds} [dchrono k show] full Khours Kminutes Kseconds
-regexp {Elapsed time: ([0-9]+) Hours ([0-9]+) Minutes ([0-9]|.+) Seconds} [dchrono l show] full Lhours Lminutes Lseconds
-regexp {Elapsed time: ([0-9]+) Hours ([0-9]+) Minutes ([0-9]|.+) Seconds} [dchrono m show] full Mhours Mminutes Mseconds
+regexp {CPU user time: ([0-9|.]+) seconds} [dchrono j show] full Jseconds
+regexp {CPU user time: ([0-9|.]+) seconds} [dchrono k show] full Kseconds
+regexp {CPU user time: ([0-9|.]+) seconds} [dchrono l show] full Lseconds
+regexp {CPU user time: ([0-9|.]+) seconds} [dchrono m show] full Mseconds
 
-set Jtime [expr ($Jhours*60*60 + $Jminutes*60 + $Jseconds)*2]
-set Ktime [expr $Khours*60*60 + $Kminutes*60 + $Kseconds]
-set Ltime [expr $Lhours*60*60 + $Lminutes*60 + $Lseconds]
-set Mtime [expr $Mhours*60*60 + $Mminutes*60 + $Mseconds]
+set Jtime [expr $Jseconds * 1.1]
+set Ktime $Kseconds
+set Ltime $Lseconds
+set Mtime $Mseconds
 
 if { $Jtime < $Ktime || $Jtime < $Ltime || $Jtime < $Mtime} {
    puts "Error: incorrect performance of bsection operation:"
diff --git a/tests/boolean/bsection/R7 b/tests/boolean/bsection/R7
index 0a38030e1a..c4b3a70fa3 100644
--- a/tests/boolean/bsection/R7
+++ b/tests/boolean/bsection/R7
@@ -2,8 +2,8 @@ puts "BUC60092"
 puts "section"
 puts ""
 
-restore buc60092a.rle a
-restore buc60092b.rle b
+restore [locate_data_file buc60092a.rle] a
+restore [locate_data_file buc60092b.rle] b
 
 bsection result a b
 
diff --git a/tests/boolean/bsection/R8 b/tests/boolean/bsection/R8
index d9a61f2de4..2a59a52696 100644
--- a/tests/boolean/bsection/R8
+++ b/tests/boolean/bsection/R8
@@ -3,8 +3,8 @@ puts "GER61235"
 puts "intersect"
 puts ""
 
-restore ger61235a.brep tool 
-restore ger61235b.brep object 
+restore [locate_data_file ger61235a.brep] tool 
+restore [locate_data_file ger61235b.brep] object 
 
 bsection result object tool 
 
diff --git a/tests/boolean/bsection/R9 b/tests/boolean/bsection/R9
index ef0f54ca76..45dffdbd9f 100644
--- a/tests/boolean/bsection/R9
+++ b/tests/boolean/bsection/R9
@@ -2,8 +2,8 @@ puts "BUC60462"
 puts "Section"
 puts ""
 
-restore buc60462a.brep a
-restore buc60462b.brep b
+restore [locate_data_file buc60462a.brep] a
+restore [locate_data_file buc60462b.brep] b
 
 bsection result a b
 
diff --git a/tests/boolean/bsection/S2 b/tests/boolean/bsection/S2
index f155cd2198..b8345a6b92 100644
--- a/tests/boolean/bsection/S2
+++ b/tests/boolean/bsection/S2
@@ -1,8 +1,8 @@
 puts "GER60854"
 puts "Section"
 puts ""
-restore ger60854a.rle a
-restore ger60854b.rle b
+restore [locate_data_file ger60854a.rle] a
+restore [locate_data_file ger60854b.rle] b
 
 bsection result a b
 
diff --git a/tests/boolean/bsection/S3 b/tests/boolean/bsection/S3
index 4f686f6773..27b31fef55 100644
--- a/tests/boolean/bsection/S3
+++ b/tests/boolean/bsection/S3
@@ -3,8 +3,8 @@ puts "PRO12675"
 puts "Section"
 puts ""
 
-restore pro12675a.brep obj
-restore pro12675b.brep out 
+restore [locate_data_file pro12675a.brep] obj
+restore [locate_data_file pro12675b.brep] out 
 updatetolerance obj 1
 updatetolerance out 1
 
diff --git a/tests/boolean/bsection/S4 b/tests/boolean/bsection/S4
index fc32b049f7..f3cbcece2b 100644
--- a/tests/boolean/bsection/S4
+++ b/tests/boolean/bsection/S4
@@ -3,11 +3,11 @@ puts "PRO15545"
 puts "Section"
 puts ""
 
-restore pro15545a.brep c1
+restore [locate_data_file pro15545a.brep] c1
 explode c1 sh
 renamevar c1_1 c1
 
-restore pro15545b.brep c2 
+restore [locate_data_file pro15545b.brep] c2 
 explode c2 sh
 renamevar c2_1 c2
 
diff --git a/tests/boolean/bsection/S5 b/tests/boolean/bsection/S5
index 63fccd5f7d..b17ec09d37 100644
--- a/tests/boolean/bsection/S5
+++ b/tests/boolean/bsection/S5
@@ -3,8 +3,8 @@ puts "PRO15946"
 puts "Section"
 puts ""
 
-restore pro15946a.rle a
-restore pro15946b.rle b
+restore [locate_data_file pro15946a.rle] a
+restore [locate_data_file pro15946b.rle] b
 
 fsameparameter a
 fsameparameter b
diff --git a/tests/caf/basic/A3 b/tests/caf/basic/A3
index 645e68f439..4ef398f18c 100755
--- a/tests/caf/basic/A3
+++ b/tests/caf/basic/A3
@@ -18,7 +18,7 @@ SetInteger D ${aLabel} ${aSetAttr1}
 NewCommand D
 
 # Save the document
-set aFile ${WorkDirectory}/caf001-A3.std
+set aFile ${imagedir}/caf001-A3.std
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/basic/B3 b/tests/caf/basic/B3
index 6ff1193ab9..a40dba4dfe 100755
--- a/tests/caf/basic/B3
+++ b/tests/caf/basic/B3
@@ -18,7 +18,7 @@ SetReal D ${aLabel} ${aSetAttr1}
 NewCommand D
 
 # Save the document
-set aFile ${WorkDirectory}/caf001-B3.std
+set aFile ${imagedir}/caf001-B3.std
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/basic/C3 b/tests/caf/basic/C3
index bbf5d99651..798019f998 100755
--- a/tests/caf/basic/C3
+++ b/tests/caf/basic/C3
@@ -23,7 +23,7 @@ SetRealArray D ${aLabel} ${isDelta} ${aFrom1} ${aTo1} ${aSetAttr11} ${aSetAttr12
 NewCommand D
 
 # Save the document
-set aFile ${WorkDirectory}/caf001-C3.std
+set aFile ${imagedir}/caf001-C3.std
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/basic/D3 b/tests/caf/basic/D3
index 53f016c277..6a8938fdd1 100755
--- a/tests/caf/basic/D3
+++ b/tests/caf/basic/D3
@@ -23,7 +23,7 @@ SetIntArray D ${aLabel} ${isDelta} ${aFrom1} ${aTo1} ${aSetAttr11} ${aSetAttr12}
 NewCommand D
 
 # Save the document
-set aFile ${WorkDirectory}/caf001-D3.std
+set aFile ${imagedir}/caf001-D3.std
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/basic/E3 b/tests/caf/basic/E3
index 8e8e313cc8..2cac769922 100755
--- a/tests/caf/basic/E3
+++ b/tests/caf/basic/E3
@@ -19,7 +19,7 @@ SetName D ${aLabel} ${aSetAttr1}
 NewCommand D
 
 # Save the document
-set aFile ${WorkDirectory}/caf001-E3.std
+set aFile ${imagedir}/caf001-E3.std
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/basic/F3 b/tests/caf/basic/F3
index cabd0b34fa..ef6050feac 100755
--- a/tests/caf/basic/F3
+++ b/tests/caf/basic/F3
@@ -19,7 +19,7 @@ SetComment D ${aLabel} ${aSetAttr1}
 NewCommand D
 
 # Save the document
-set aFile ${WorkDirectory}/caf001-F3.std
+set aFile ${imagedir}/caf001-F3.std
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/basic/G3 b/tests/caf/basic/G3
index 8a2a269f9d..b00ffce2ca 100755
--- a/tests/caf/basic/G3
+++ b/tests/caf/basic/G3
@@ -35,7 +35,7 @@ SetPoint D ${aLabel} aPoint1
 NewCommand D
 
 # Save the document
-set aFile ${WorkDirectory}/caf001-G3.std
+set aFile ${imagedir}/caf001-G3.std
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/basic/H3 b/tests/caf/basic/H3
index c436092f5d..0af9ba5a40 100755
--- a/tests/caf/basic/H3
+++ b/tests/caf/basic/H3
@@ -43,7 +43,7 @@ SetAxis D ${aLabel} aLine1
 NewCommand D
 
 # Save the document
-set aFile ${WorkDirectory}/caf001-H3.std
+set aFile ${imagedir}/caf001-H3.std
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/basic/I3 b/tests/caf/basic/I3
index 9ab6e13e37..ffcb9ebb17 100755
--- a/tests/caf/basic/I3
+++ b/tests/caf/basic/I3
@@ -46,7 +46,7 @@ SetPlane D ${aLabel} aPlane1
 NewCommand D
 
 # Save the document
-set aFile ${WorkDirectory}/caf001-I3.std
+set aFile ${imagedir}/caf001-I3.std
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/basic/J3 b/tests/caf/basic/J3
index f22a9c174d..c44be10efc 100755
--- a/tests/caf/basic/J3
+++ b/tests/caf/basic/J3
@@ -18,7 +18,7 @@ SetUAttribute D ${aLabel} ${aSetAttr1}
 NewCommand D
 
 # Save the document
-set aFile ${WorkDirectory}/caf001-J3.std
+set aFile ${imagedir}/caf001-J3.std
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/basic/J6 b/tests/caf/basic/J6
index cc4b05dc25..21543f8253 100755
--- a/tests/caf/basic/J6
+++ b/tests/caf/basic/J6
@@ -24,7 +24,7 @@ set aGetAttr2 [GetUAttribute D ${aLabel} ${aSetAttr2}]
 NewCommand D
 
 # Save the document
-set aFile ${WorkDirectory}/caf001-J6.std
+set aFile ${imagedir}/caf001-J6.std
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/basic/K3 b/tests/caf/basic/K3
index 0ce5843fcf..067a58e67a 100755
--- a/tests/caf/basic/K3
+++ b/tests/caf/basic/K3
@@ -34,7 +34,7 @@ SetShape D ${aLabel} aBox1
 NewCommand D
 
 # Save the document
-set aFile ${WorkDirectory}/caf001-K3.std
+set aFile ${imagedir}/caf001-K3.std
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/basic/L3 b/tests/caf/basic/L3
index f0d9515dda..e2c43b1c7c 100755
--- a/tests/caf/basic/L3
+++ b/tests/caf/basic/L3
@@ -28,7 +28,7 @@ SetReference D ${aLabel4} ${aReference1}
 NewCommand D
 
 # Save the document
-set aFile ${WorkDirectory}/caf001-L3.std
+set aFile ${imagedir}/caf001-L3.std
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/basic/M3 b/tests/caf/basic/M3
index 0c5aab729f..03bad2e176 100755
--- a/tests/caf/basic/M3
+++ b/tests/caf/basic/M3
@@ -31,7 +31,7 @@ SetExtStringArray D ${aLabel} ${isDelta} ${aFrom1} ${aTo1} ${aSetAttr11} ${aSetA
 NewCommand D
 
 # Save the document
-set aFile ${WorkDirectory}/caf001-M3.std
+set aFile ${imagedir}/caf001-M3.std
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/begin b/tests/caf/begin
index 90cb66b09c..140a347bb6 100755
--- a/tests/caf/begin
+++ b/tests/caf/begin
@@ -1,12 +1,5 @@
 # File : begin
 
-if { [info exists WorkDirectory] == 0 } {
-   set WorkDirectory "/tmp"
-   if { [array get env TEMP] != "" } {
-      set WorkDirectory "$env(TEMP)"
-   }
-}
-
 if { [array get Draw_Groups "DF basic commands"] == "" } {
 	pload DCAF
 }
diff --git a/tests/caf/bugs/A1 b/tests/caf/bugs/A1
index 0134d3efcf..2e8c20431e 100755
--- a/tests/caf/bugs/A1
+++ b/tests/caf/bugs/A1
@@ -30,7 +30,7 @@ SetInteger Doc ${aLabel} ${aSetAttr1}
 NewCommand Doc
 
 # Save the document
-set aFile ${WorkDirectory}/OCC1228-[file tail [info script]].cbf
+set aFile ${imagedir}/OCC1228-[file tail [info script]].cbf
 file delete ${aFile}
 catch {SaveAs Doc ${aFile}}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/bugs/A2 b/tests/caf/bugs/A2
index 307e9abcb2..cf7e6cd961 100755
--- a/tests/caf/bugs/A2
+++ b/tests/caf/bugs/A2
@@ -30,7 +30,7 @@ SetReal Doc ${aLabel} ${aSetAttr1}
 NewCommand Doc
 
 # Save the document
-set aFile ${WorkDirectory}/OCC1228-[file tail [info script]].cbf
+set aFile ${imagedir}/OCC1228-[file tail [info script]].cbf
 file delete ${aFile}
 catch {SaveAs Doc ${aFile} }
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/bugs/A3 b/tests/caf/bugs/A3
index faa742416f..6328ad9500 100755
--- a/tests/caf/bugs/A3
+++ b/tests/caf/bugs/A3
@@ -35,7 +35,7 @@ SetRealArray Doc ${aLabel} ${isDelta} ${aFrom1} ${aTo1} ${aSetAttr11} ${aSetAttr
 NewCommand Doc
 
 # Save the document
-set aFile ${WorkDirectory}/OCC1228-[file tail [info script]].cbf
+set aFile ${imagedir}/OCC1228-[file tail [info script]].cbf
 file delete ${aFile}
 catch {SaveAs Doc ${aFile}}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/bugs/A4 b/tests/caf/bugs/A4
index b7cf4daa5c..4bd46cb684 100755
--- a/tests/caf/bugs/A4
+++ b/tests/caf/bugs/A4
@@ -35,7 +35,7 @@ SetIntArray Doc ${aLabel} ${isDelta} ${aFrom1} ${aTo1} ${aSetAttr11} ${aSetAttr1
 NewCommand Doc
 
 # Save the document
-set aFile ${WorkDirectory}/OCC1228-[file tail [info script]].cbf
+set aFile ${imagedir}/OCC1228-[file tail [info script]].cbf
 file delete ${aFile}
 catch {SaveAs Doc ${aFile}}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/bugs/A5 b/tests/caf/bugs/A5
index b2f51c2662..fa12895dc1 100755
--- a/tests/caf/bugs/A5
+++ b/tests/caf/bugs/A5
@@ -31,7 +31,7 @@ SetName Doc ${aLabel} ${aSetAttr1}
 NewCommand Doc
 
 # Save the document
-set aFile ${WorkDirectory}/OCC1228-[file tail [info script]].cbf
+set aFile ${imagedir}/OCC1228-[file tail [info script]].cbf
 file delete ${aFile}
 catch {SaveAs Doc ${aFile}}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/bugs/A6 b/tests/caf/bugs/A6
index 88449bf245..c1a8472e4a 100755
--- a/tests/caf/bugs/A6
+++ b/tests/caf/bugs/A6
@@ -31,7 +31,7 @@ SetComment Doc ${aLabel} ${aSetAttr1}
 NewCommand Doc
 
 # Save the document
-set aFile ${WorkDirectory}/OCC1228-[file tail [info script]].cbf
+set aFile ${imagedir}/OCC1228-[file tail [info script]].cbf
 file delete ${aFile}
 catch {SaveAs Doc ${aFile}}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/bugs/A7 b/tests/caf/bugs/A7
index b4054c1889..0412d4836f 100755
--- a/tests/caf/bugs/A7
+++ b/tests/caf/bugs/A7
@@ -47,7 +47,7 @@ SetPoint Doc ${aLabel} aPoint1
 NewCommand Doc
 
 # Save the document
-set aFile ${WorkDirectory}/OCC1228-[file tail [info script]].cbf
+set aFile ${imagedir}/OCC1228-[file tail [info script]].cbf
 file delete ${aFile}
 catch {SaveAs Doc ${aFile}}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/bugs/A8 b/tests/caf/bugs/A8
index 62379ee6fe..914fc020e1 100755
--- a/tests/caf/bugs/A8
+++ b/tests/caf/bugs/A8
@@ -55,7 +55,7 @@ SetAxis Doc ${aLabel} aLine1
 NewCommand Doc
 
 # Save the document
-set aFile ${WorkDirectory}/OCC1228-[file tail [info script]].cbf
+set aFile ${imagedir}/OCC1228-[file tail [info script]].cbf
 file delete ${aFile}
 catch {SaveAs Doc ${aFile}}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/bugs/A9 b/tests/caf/bugs/A9
index ef59ee20c3..8566a73e78 100755
--- a/tests/caf/bugs/A9
+++ b/tests/caf/bugs/A9
@@ -58,7 +58,7 @@ SetPlane Doc ${aLabel} aPlane1
 NewCommand Doc
 
 # Save the document
-set aFile ${WorkDirectory}/OCC1228-[file tail [info script]].cbf
+set aFile ${imagedir}/OCC1228-[file tail [info script]].cbf
 file delete ${aFile}
 catch {SaveAs Doc ${aFile}}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/bugs/B1 b/tests/caf/bugs/B1
index 3ac04ee9e6..87d277bef0 100755
--- a/tests/caf/bugs/B1
+++ b/tests/caf/bugs/B1
@@ -30,7 +30,7 @@ SetUAttribute Doc ${aLabel} ${aSetAttr1}
 NewCommand Doc
 
 # Save the document
-set aFile ${WorkDirectory}/OCC1228-[file tail [info script]].cbf
+set aFile ${imagedir}/OCC1228-[file tail [info script]].cbf
 file delete ${aFile}
 catch {SaveAs Doc ${aFile}}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/bugs/B2 b/tests/caf/bugs/B2
index 4e21261f6a..68f032365a 100755
--- a/tests/caf/bugs/B2
+++ b/tests/caf/bugs/B2
@@ -34,7 +34,7 @@ SetUAttribute Doc ${aLabel} ${aSetAttr2}
 NewCommand Doc
 
 # Save the document
-set aFile ${WorkDirectory}/OCC1228-[file tail [info script]].cbf
+set aFile ${imagedir}/OCC1228-[file tail [info script]].cbf
 file delete ${aFile}
 catch {SaveAs Doc ${aFile}}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/bugs/B3 b/tests/caf/bugs/B3
index 8afa002374..25076a83a2 100755
--- a/tests/caf/bugs/B3
+++ b/tests/caf/bugs/B3
@@ -46,7 +46,7 @@ SetShape Doc ${aLabel} aBox1
 NewCommand Doc
 
 # Save the document
-set aFile ${WorkDirectory}/OCC1228-[file tail [info script]].cbf
+set aFile ${imagedir}/OCC1228-[file tail [info script]].cbf
 file delete ${aFile}
 catch {SaveAs Doc ${aFile}}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/bugs/B4 b/tests/caf/bugs/B4
index 03dbfafa40..91cd1c407c 100755
--- a/tests/caf/bugs/B4
+++ b/tests/caf/bugs/B4
@@ -40,7 +40,7 @@ SetReference Doc ${aLabel4} ${aReference1}
 NewCommand Doc
 
 # Save the document
-set aFile ${WorkDirectory}/OCC1228-[file tail [info script]].cbf
+set aFile ${imagedir}/OCC1228-[file tail [info script]].cbf
 file delete ${aFile}
 catch {SaveAs Doc ${aFile}}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/bugs/B5 b/tests/caf/bugs/B5
index 6262e4bdd9..11eaf9a934 100755
--- a/tests/caf/bugs/B5
+++ b/tests/caf/bugs/B5
@@ -52,7 +52,7 @@ SetShape Doc ${aLabel} aBox1
 NewCommand Doc
 
 # Save the document
-set aFile ${WorkDirectory}/OCC1228-[file tail [info script]].cbf
+set aFile ${imagedir}/OCC1228-[file tail [info script]].cbf
 file delete ${aFile}
 catch {SaveAs Doc ${aFile}}
 #catch {exec chmod 777 ${aFile}}
diff --git a/tests/caf/bugs/B6 b/tests/caf/bugs/B6
index 98f15080fb..5843509a21 100755
--- a/tests/caf/bugs/B6
+++ b/tests/caf/bugs/B6
@@ -38,7 +38,7 @@ AISSet Doc ${aLabel} NS
 AISDisplay Doc ${aLabel}
 
 # Save the document
-set aFile ${WorkDirectory}/OCC1228-[file tail [info script]].cbf
+set aFile ${imagedir}/OCC1228-[file tail [info script]].cbf
 file delete ${aFile}
 catch {SaveAs Doc ${aFile}}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/bugs/B7 b/tests/caf/bugs/B7
index 1e30c5fc1c..bac87a5cc5 100755
--- a/tests/caf/bugs/B7
+++ b/tests/caf/bugs/B7
@@ -60,7 +60,7 @@ CopyWithLink Doc1 ${aLabel2} Doc1 ${aLabel1}
 NewCommand Doc1
 
 # Save the document
-set aFile ${WorkDirectory}/OCC1228-[file tail [info script]].cbf
+set aFile ${imagedir}/OCC1228-[file tail [info script]].cbf
 file delete ${aFile}
 catch {SaveAs Doc1 ${aFile}}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/bugs/B8 b/tests/caf/bugs/B8
index d208713a70..4f3b0804fd 100755
--- a/tests/caf/bugs/B8
+++ b/tests/caf/bugs/B8
@@ -37,7 +37,7 @@ SetName Doc ${aChild1} ${aName11}
 NewCommand Doc
 
 # Save the document
-set aFile ${WorkDirectory}/OCC1228-[file tail [info script]].cbf
+set aFile ${imagedir}/OCC1228-[file tail [info script]].cbf
 file delete ${aFile}
 catch {SaveAs Doc ${aFile}}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/bugs/B9 b/tests/caf/bugs/B9
index c336e593fc..2a01fe17ff 100755
--- a/tests/caf/bugs/B9
+++ b/tests/caf/bugs/B9
@@ -30,7 +30,7 @@ SetName Doc ${aLabel1} ${aName1}
 NewCommand Doc
 
 # Save the document
-set aFile ${WorkDirectory}/OCC1228-[file tail [info script]].cbf
+set aFile ${imagedir}/OCC1228-[file tail [info script]].cbf
 file delete ${aFile}
 catch {SaveAs Doc ${aFile}}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/bugs/C1 b/tests/caf/bugs/C1
index 1ad846b830..0d39fcc701 100755
--- a/tests/caf/bugs/C1
+++ b/tests/caf/bugs/C1
@@ -33,7 +33,7 @@ SetNode Doc ${aLabel_Root}
 NewCommand Doc
 
 # Save the document
-set aFile ${WorkDirectory}/OCC1228-[file tail [info script]].cbf
+set aFile ${imagedir}/OCC1228-[file tail [info script]].cbf
 file delete ${aFile}
 catch {SaveAs Doc ${aFile}}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/bugs/C2 b/tests/caf/bugs/C2
index 65b5884fe5..35f3aa72c6 100755
--- a/tests/caf/bugs/C2
+++ b/tests/caf/bugs/C2
@@ -38,7 +38,7 @@ SetExtStringArray Doc ${aLabel} ${isDelta} ${aFrom1} ${aTo1} ${aSetAttr11} ${aSe
 NewCommand Doc
 
 # Save the document
-set aFile ${WorkDirectory}/OCC6493-[file tail [info script]].cbf
+set aFile ${imagedir}/OCC6493-[file tail [info script]].cbf
 file delete ${aFile}
 catch {SaveAs Doc ${aFile}}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/named_shape/C1 b/tests/caf/named_shape/C1
index 025c296e55..0d272002b7 100755
--- a/tests/caf/named_shape/C1
+++ b/tests/caf/named_shape/C1
@@ -40,7 +40,7 @@ SetShape D ${aLabel} aBox1
 NewCommand D
 
 # Save the document
-set aFile ${WorkDirectory}/caf002-C1.std
+set aFile ${imagedir}/caf002-C1.std
 file delete ${aFile}
 SaveAs D ${aFile}
 #catch {exec chmod 777 ${aFile}}
diff --git a/tests/caf/presentation/A4 b/tests/caf/presentation/A4
index 623c1d050e..6a7f5803ff 100755
--- a/tests/caf/presentation/A4
+++ b/tests/caf/presentation/A4
@@ -23,7 +23,7 @@ AISSet D ${aLabel} NS
 AISDisplay D ${aLabel}
 
 # Save the document
-set aFile ${WorkDirectory}/caf003-A4.std
+set aFile ${imagedir}/caf003-A4.std
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/tree/A3 b/tests/caf/tree/A3
index b8c4a8e0ce..60272ba373 100755
--- a/tests/caf/tree/A3
+++ b/tests/caf/tree/A3
@@ -25,7 +25,7 @@ SetName D ${aChild1} ${aName11}
 NewCommand D
 
 # Save the document
-set aFile ${WorkDirectory}/caf005-A3.std
+set aFile ${imagedir}/caf005-A3.std
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/tree/B3 b/tests/caf/tree/B3
index 4f56d9f495..d7b3e83301 100755
--- a/tests/caf/tree/B3
+++ b/tests/caf/tree/B3
@@ -18,7 +18,7 @@ SetName D ${aLabel1} ${aName1}
 NewCommand D
 
 # Save the document
-set aFile ${WorkDirectory}/caf001-B3.std
+set aFile ${imagedir}/caf001-B3.std
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/tree/C2 b/tests/caf/tree/C2
index 86c0ea6354..be83c2dbfd 100755
--- a/tests/caf/tree/C2
+++ b/tests/caf/tree/C2
@@ -21,7 +21,7 @@ SetNode D ${aLabel_Root}
 NewCommand D
 
 # Save the document
-set aFile ${WorkDirectory}/caf005-C2.std
+set aFile ${imagedir}/caf005-C2.std
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/xlink/B3 b/tests/caf/xlink/B3
index bd7c5b91b7..8cedf74cc4 100755
--- a/tests/caf/xlink/B3
+++ b/tests/caf/xlink/B3
@@ -55,7 +55,7 @@ CopyWithLink Doc1 ${aLabel2} Doc1 ${aLabel1}
 NewCommand Doc1
 
 # Save the document
-set aFile ${WorkDirectory}/caf004-B3.std
+set aFile ${imagedir}/caf004-B3.std
 file delete ${aFile}
 SaveAs Doc1 ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/chamfer/begin b/tests/chamfer/begin
index a64f4f54f2..ddb2ff1fe8 100644
--- a/tests/chamfer/begin
+++ b/tests/chamfer/begin
@@ -7,11 +7,6 @@ if { [array get Draw_Groups "TOPOLOGY Fillet construction commands"] == "" } {
 	pload TOPTEST
 }
 
-# set location for data
-if { [string compare [datadir] "."] == 0 } {
-     datadir [file dirname [info script]]/data
-}
-
 # This procedure tries to load an EDGE (one point) or EDGE (two points)
 proc get_element { type args } {
 # First point
diff --git a/tests/chamfer/end b/tests/chamfer/end
index d3d15707a0..fb1c01a5c5 100644
--- a/tests/chamfer/end
+++ b/tests/chamfer/end
@@ -1,4 +1,4 @@
-restore $chamf_shape sh
+restore [locate_data_file $chamf_shape] sh
 if { [dval SCALE] != 0 } {
    tscale sh 0 0 0 SCALE
 }
diff --git a/tests/draft/angle/L1 b/tests/draft/angle/L1
index d58337e198..0f7335c98e 100644
--- a/tests/draft/angle/L1
+++ b/tests/draft/angle/L1
@@ -1,4 +1,4 @@
-restore pro10142.rle shp
+restore [locate_data_file pro10142.rle] shp
 explode shp f
 depouille result shp 0 0 1 shp_2 -3 0 0 0 0 0 1 shp_3 -3 0 0 0 0 0 1  shp_4 -3 0 0 0 0 0 1  shp_5 -3 0 0 0 0 0 1  shp_6 -3 0 0 0 0 0 1  shp_7 -3 0 0 0 0 0 1 shp_8 -3 0 0 0 0 0 1 shp_9 -3 0 0 0 0 0 1 shp_10 -3 0 0 0 0 0 1 shp_11 -3 0 0 0 0 0 1 shp_12 -3 0 0 0 0 0 1 shp_13 -3 0 0 0 0 0 1 shp_14 -3 0 0 0 0 0 1 shp_15 -3 0 0 0 0 0 1 shp_16 -3 0 0 0 0 0 1 shp_17 -3 0 0 0 0 0 1 shp_18 -3 0 0 0 0 0 1 shp_19 -3 0 0 0 0 0 1 shp_20 -3 0 0 0 0 0 1 shp_21 -3 0 0 0 0 0 1 
 
diff --git a/tests/draft/angle/L2 b/tests/draft/angle/L2
index 0ebeb353eb..a8bdb6f0e3 100644
--- a/tests/draft/angle/L2
+++ b/tests/draft/angle/L2
@@ -1,7 +1,7 @@
 # Original bug : cts21764
 # Date : 23 Nov 98
 
-restore cts21764_base.brep base
+restore [locate_data_file cts21764_base.brep] base
 
 explode base face
 copy base_14 facdep
diff --git a/tests/draft/angle/L4 b/tests/draft/angle/L4
index 8c8cb5bac0..515a3a5074 100644
--- a/tests/draft/angle/L4
+++ b/tests/draft/angle/L4
@@ -3,7 +3,7 @@
 
 puts "TODO OCC22803 All:Faulty shapes in variables faulty_1 to faulty_2"
 
-restore cts20194_base.brep base
+restore [locate_data_file cts20194_base.brep] base
 
 explode base face
 
diff --git a/tests/draft/angle/L5 b/tests/draft/angle/L5
index 4932aa101e..4b1e062d59 100644
--- a/tests/draft/angle/L5
+++ b/tests/draft/angle/L5
@@ -1,7 +1,7 @@
 # Original bug : pro16635
 # Date : 26 Nov 98
 
-restore pro16635_base.brep base
+restore [locate_data_file pro16635_base.brep] base
 
 nexplode base face
 vertex v1 56.3468437194825 6.86845636367778 100
diff --git a/tests/draft/angle/L6 b/tests/draft/angle/L6
index acf1fb5b66..da07c2ea39 100644
--- a/tests/draft/angle/L6
+++ b/tests/draft/angle/L6
@@ -1,7 +1,7 @@
 # Original bug : cts21899
 # Date : 26 Nov 98
 
-restore cts21899_base.brep base
+restore [locate_data_file cts21899_base.brep] base
 
 nexplode base face
 vertex v1 0 0 0
diff --git a/tests/draft/angle/L7 b/tests/draft/angle/L7
index d8b5f22334..1d3c839a13 100644
--- a/tests/draft/angle/L7
+++ b/tests/draft/angle/L7
@@ -1,7 +1,7 @@
 # Original bug : pro16447
 # Date : 26 Nov 98
 
-restore pro16447_base.brep base
+restore [locate_data_file pro16447_base.brep] base
 
 explode base face
 
diff --git a/tests/draft/angle/L8 b/tests/draft/angle/L8
index f381816653..00c45a31be 100644
--- a/tests/draft/angle/L8
+++ b/tests/draft/angle/L8
@@ -1,7 +1,7 @@
 # Original bug : pro13199
 # Date : 26 Nov 98
 
-restore pro13199_base.brep base
+restore [locate_data_file pro13199_base.brep] base
 
 explode base face
 
diff --git a/tests/draft/angle/L9 b/tests/draft/angle/L9
index b7d5c5aa26..c2a8976c8f 100644
--- a/tests/draft/angle/L9
+++ b/tests/draft/angle/L9
@@ -1,7 +1,7 @@
 # Original bug : cts21804
 # Date : 26 Nov 98
 
-restore cts21804_base.brep base
+restore [locate_data_file cts21804_base.brep] base
 
 nexplode base face
 
diff --git a/tests/draft/angle/M1 b/tests/draft/angle/M1
index 226e798538..1c924b1e39 100644
--- a/tests/draft/angle/M1
+++ b/tests/draft/angle/M1
@@ -2,7 +2,7 @@
 # Date : 26 Nov 98
 puts "TODO OCC22803 All:Faulty shapes in variables faulty_1 to faulty_2"
 
-restore ger60805_base.brep base
+restore [locate_data_file ger60805_base.brep] base
 
 fsameparameter base
 
diff --git a/tests/draft/angle/M2 b/tests/draft/angle/M2
index c7957cdb9c..c169fe8e79 100644
--- a/tests/draft/angle/M2
+++ b/tests/draft/angle/M2
@@ -3,7 +3,7 @@
 
 puts "TODO OCC22803 All:Error: The tolerance of result shape is too big"
 
-restore pro12877_base.brep base
+restore [locate_data_file pro12877_base.brep] base
 
 nexplode base face
 
diff --git a/tests/draft/angle/M3 b/tests/draft/angle/M3
index c2fbf1a280..234eb71465 100644
--- a/tests/draft/angle/M3
+++ b/tests/draft/angle/M3
@@ -6,7 +6,7 @@ puts "TODO OCC22803 All:\\*\\* Exception \\*\\*"
 puts "TODO OCC22803 All:Error in depouille"
 puts "TODO OCC22803 All:Error : The depouille can not be build"
 
-restore cts21900_base.brep base
+restore [locate_data_file cts21900_base.brep] base
 
 explode base face
 
diff --git a/tests/draft/angle/M4 b/tests/draft/angle/M4
index b66059e700..20de2bdadd 100644
--- a/tests/draft/angle/M4
+++ b/tests/draft/angle/M4
@@ -3,7 +3,7 @@
 
 puts "TODO OCC22803 All:Faulty shapes in variables faulty_1 to faulty_4"
 
-restore pro16449_base.brep base
+restore [locate_data_file pro16449_base.brep] base
 
 explode base face
 
diff --git a/tests/draft/angle/M5 b/tests/draft/angle/M5
index 28f81602ab..0c4bd8b86e 100644
--- a/tests/draft/angle/M5
+++ b/tests/draft/angle/M5
@@ -1,7 +1,7 @@
 # Original bug : cts20610
 # Date : 21 Dec 98
 
-restore cts20610_base.brep base
+restore [locate_data_file cts20610_base.brep] base
 
 explode base face
 
diff --git a/tests/draft/begin b/tests/draft/begin
index 3f41f0a011..9e4e9dad20 100755
--- a/tests/draft/begin
+++ b/tests/draft/begin
@@ -7,10 +7,6 @@ if { [array get Draw_Groups "TOPOLOGY Check commands"] == "" } {
 # to prevent loops limit to 10 minutes
 cpulimit 600
 
-if { [string compare [datadir] "."] == 0 } {
-   datadir [file dirname [info script]]/data
-}
-
 if { [info exists imagedir] == 0 } {
    set imagedir .
 }
diff --git a/tests/feat/begin b/tests/feat/begin
index 5ed3193030..1ab45fb6ef 100755
--- a/tests/feat/begin
+++ b/tests/feat/begin
@@ -3,9 +3,6 @@
 ## Date : 01.02.2012
 ## ==================================
 
-if { [string compare [datadir] "."] == 0 } {
-   datadir [file dirname [info script]]/data
-}
 if { [array get Draw_Groups "TOPOLOGY Check commands"] == "" } {
    pload TOPTEST
 }
diff --git a/tests/feat/featdprism/A1 b/tests/feat/featdprism/A1
index 72a8662394..93dc597736 100644
--- a/tests/feat/featdprism/A1
+++ b/tests/feat/featdprism/A1
@@ -1,5 +1,5 @@
-restore cylindre.rle cyl
-restore contour.rle cont
+restore [locate_data_file cylindre.rle] cyl
+restore [locate_data_file contour.rle] cont
 mkplane cont cont
 nexplode cyl F
 
diff --git a/tests/feat/featdprism/A2 b/tests/feat/featdprism/A2
index c37381b65b..22b56b1b19 100644
--- a/tests/feat/featdprism/A2
+++ b/tests/feat/featdprism/A2
@@ -1,5 +1,5 @@
-restore cylindre.rle cyl
-restore contour.rle cont
+restore [locate_data_file cylindre.rle] cyl
+restore [locate_data_file contour.rle] cont
 mkplane cont cont
 nexplode cyl F
 
diff --git a/tests/feat/featdprism/A3 b/tests/feat/featdprism/A3
index 9034b794c6..35c868a6ba 100644
--- a/tests/feat/featdprism/A3
+++ b/tests/feat/featdprism/A3
@@ -1,5 +1,5 @@
-restore cylindre.rle cyl
-restore contour.rle cont
+restore [locate_data_file cylindre.rle] cyl
+restore [locate_data_file contour.rle] cont
 mkplane cont cont
 nexplode cyl F
 
diff --git a/tests/feat/featdprism/A4 b/tests/feat/featdprism/A4
index fa317a6fcd..26e2174d7b 100644
--- a/tests/feat/featdprism/A4
+++ b/tests/feat/featdprism/A4
@@ -1,5 +1,5 @@
-restore cylindre.rle cyl
-restore contour.rle cont
+restore [locate_data_file cylindre.rle] cyl
+restore [locate_data_file contour.rle] cont
 mkplane cont cont
 nexplode cyl F
 
diff --git a/tests/feat/featdprism/A5 b/tests/feat/featdprism/A5
index 25b8ba5bd5..6c03f7223a 100644
--- a/tests/feat/featdprism/A5
+++ b/tests/feat/featdprism/A5
@@ -1,5 +1,5 @@
-restore cylindre.rle cyl
-restore contour.rle cont
+restore [locate_data_file cylindre.rle] cyl
+restore [locate_data_file contour.rle] cont
 mkplane cont cont
 nexplode cyl F
 
diff --git a/tests/feat/featdprism/A6 b/tests/feat/featdprism/A6
index d2c38da527..224eab8400 100644
--- a/tests/feat/featdprism/A6
+++ b/tests/feat/featdprism/A6
@@ -1,5 +1,5 @@
-restore cylindre.rle cyl
-restore contour.rle cont
+restore [locate_data_file cylindre.rle] cyl
+restore [locate_data_file contour.rle] cont
 mkplane cont cont
 nexplode cyl F
 
diff --git a/tests/feat/featdprism/A9 b/tests/feat/featdprism/A9
index 6d5468b1b9..ba26b04f73 100644
--- a/tests/feat/featdprism/A9
+++ b/tests/feat/featdprism/A9
@@ -1,5 +1,5 @@
-restore cylindre.rle cyl
-restore contour.rle cont
+restore [locate_data_file cylindre.rle] cyl
+restore [locate_data_file contour.rle] cont
 mkplane cont cont
 nexplode cyl F
 
diff --git a/tests/feat/featdprism/B1 b/tests/feat/featdprism/B1
index 2d8fb38751..9f95fb1b63 100644
--- a/tests/feat/featdprism/B1
+++ b/tests/feat/featdprism/B1
@@ -1,5 +1,5 @@
-restore cylindre.rle cyl
-restore contour.rle cont
+restore [locate_data_file cylindre.rle] cyl
+restore [locate_data_file contour.rle] cont
 mkplane cont cont
 nexplode cyl F
 
diff --git a/tests/feat/featdprism/B2 b/tests/feat/featdprism/B2
index 4fac8b8802..9b823b7a25 100644
--- a/tests/feat/featdprism/B2
+++ b/tests/feat/featdprism/B2
@@ -1,5 +1,5 @@
-restore cylindre.rle cyl
-restore contour.rle cont
+restore [locate_data_file cylindre.rle] cyl
+restore [locate_data_file contour.rle] cont
 mkplane cont cont
 nexplode cyl F
 
diff --git a/tests/feat/featdprism/B3 b/tests/feat/featdprism/B3
index 72dfc8c060..968224e5e7 100644
--- a/tests/feat/featdprism/B3
+++ b/tests/feat/featdprism/B3
@@ -1,5 +1,5 @@
-restore cylindre.rle cyl
-restore contour.rle cont
+restore [locate_data_file cylindre.rle] cyl
+restore [locate_data_file contour.rle] cont
 mkplane cont cont
 nexplode cyl F
 
diff --git a/tests/feat/featdprism/B4 b/tests/feat/featdprism/B4
index b67c416473..39df0e0b8a 100644
--- a/tests/feat/featdprism/B4
+++ b/tests/feat/featdprism/B4
@@ -1,5 +1,5 @@
-restore cylindre.rle cyl
-restore contour.rle cont
+restore [locate_data_file cylindre.rle] cyl
+restore [locate_data_file contour.rle] cont
 mkplane cont cont
 nexplode cyl F
 
diff --git a/tests/feat/featdprism/B5 b/tests/feat/featdprism/B5
index 7aab0f3ea4..ae0bc64418 100644
--- a/tests/feat/featdprism/B5
+++ b/tests/feat/featdprism/B5
@@ -1,5 +1,5 @@
-restore cylindre.rle cyl
-restore contour.rle cont
+restore [locate_data_file cylindre.rle] cyl
+restore [locate_data_file contour.rle] cont
 mkplane cont cont
 nexplode cyl F
 
diff --git a/tests/feat/featdprism/B6 b/tests/feat/featdprism/B6
index ad2c5c2268..2fa8ad6333 100644
--- a/tests/feat/featdprism/B6
+++ b/tests/feat/featdprism/B6
@@ -1,5 +1,5 @@
-restore cylindre.rle cyl
-restore contour.rle cont
+restore [locate_data_file cylindre.rle] cyl
+restore [locate_data_file contour.rle] cont
 mkplane cont cont
 nexplode cyl F
 
diff --git a/tests/feat/featdprism/B7 b/tests/feat/featdprism/B7
index 17e7fd0c3b..8d3e5b17ba 100644
--- a/tests/feat/featdprism/B7
+++ b/tests/feat/featdprism/B7
@@ -1,8 +1,8 @@
 # Original bug : cts20871
 # Date : 26 Oct 98
 
-restore cts20871_base.rle base
-restore cts20871_face.rle cont
+restore [locate_data_file cts20871_base.rle] base
+restore [locate_data_file cts20871_face.rle] cont
 
 explode base face
 copy base_5 funtil
diff --git a/tests/feat/featdprism/C1 b/tests/feat/featdprism/C1
index e705a98176..8ba65ce517 100644
--- a/tests/feat/featdprism/C1
+++ b/tests/feat/featdprism/C1
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E f
 
 profile cont S E_10 F 0 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featdprism/C2 b/tests/feat/featdprism/C2
index 70c63ebbd3..90f4aa1b70 100644
--- a/tests/feat/featdprism/C2
+++ b/tests/feat/featdprism/C2
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E f
 
 profile cont S E_10 F 0 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featdprism/C3 b/tests/feat/featdprism/C3
index 8f4566397c..663444f1d2 100644
--- a/tests/feat/featdprism/C3
+++ b/tests/feat/featdprism/C3
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E f
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featdprism/C4 b/tests/feat/featdprism/C4
index aec0f7689d..37ea211099 100644
--- a/tests/feat/featdprism/C4
+++ b/tests/feat/featdprism/C4
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E f
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featdprism/C5 b/tests/feat/featdprism/C5
index 10a35713e8..cd2782d854 100644
--- a/tests/feat/featdprism/C5
+++ b/tests/feat/featdprism/C5
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E f
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featdprism/C6 b/tests/feat/featdprism/C6
index aaf8abac8a..b919a6e10a 100644
--- a/tests/feat/featdprism/C6
+++ b/tests/feat/featdprism/C6
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E f
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featdprism/C7 b/tests/feat/featdprism/C7
index b8e632a924..58db50a5cd 100644
--- a/tests/feat/featdprism/C7
+++ b/tests/feat/featdprism/C7
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E f
 
 profile cont S E_10 F 150 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featdprism/C8 b/tests/feat/featdprism/C8
index d7a01e8858..4697a16b51 100644
--- a/tests/feat/featdprism/C8
+++ b/tests/feat/featdprism/C8
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E f
 
 profile cont S E_10 F 150 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featdprism/C9 b/tests/feat/featdprism/C9
index 1e66044e98..e03951a75b 100644
--- a/tests/feat/featdprism/C9
+++ b/tests/feat/featdprism/C9
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E f
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featdprism/D1 b/tests/feat/featdprism/D1
index 6aec29b378..e769b76fd8 100644
--- a/tests/feat/featdprism/D1
+++ b/tests/feat/featdprism/D1
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E f
 
 profile cont S E_10 F 0 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featdprism/D2 b/tests/feat/featdprism/D2
index 4fa82a6160..f9342d3eac 100644
--- a/tests/feat/featdprism/D2
+++ b/tests/feat/featdprism/D2
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E f
 
 profile cont S E_10 F 0 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featdprism/D3 b/tests/feat/featdprism/D3
index e9df743907..ba41db34c0 100644
--- a/tests/feat/featdprism/D3
+++ b/tests/feat/featdprism/D3
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E f
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featdprism/D4 b/tests/feat/featdprism/D4
index a924bb9fee..c2ee8734a8 100644
--- a/tests/feat/featdprism/D4
+++ b/tests/feat/featdprism/D4
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E f
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featdprism/D5 b/tests/feat/featdprism/D5
index d113eaae3d..5e59a4e55b 100644
--- a/tests/feat/featdprism/D5
+++ b/tests/feat/featdprism/D5
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E f
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featdprism/D6 b/tests/feat/featdprism/D6
index 3270dcea54..59c346ec31 100644
--- a/tests/feat/featdprism/D6
+++ b/tests/feat/featdprism/D6
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E f
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featdprism/D7 b/tests/feat/featdprism/D7
index 8d9f5d8f1c..73cf6e249b 100644
--- a/tests/feat/featdprism/D7
+++ b/tests/feat/featdprism/D7
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E f
 
 profile cont S E_10 F 150 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featdprism/D8 b/tests/feat/featdprism/D8
index fac227480e..670519771a 100644
--- a/tests/feat/featdprism/D8
+++ b/tests/feat/featdprism/D8
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E f
 
 profile cont S E_10 F 150 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featdprism/D9 b/tests/feat/featdprism/D9
index bef11b1432..3cb9a34fb2 100644
--- a/tests/feat/featdprism/D9
+++ b/tests/feat/featdprism/D9
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E f
 
 profile cont S E_10 F 150 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featdprism/E1 b/tests/feat/featdprism/E1
index f5850faefc..eb62fb2cae 100644
--- a/tests/feat/featdprism/E1
+++ b/tests/feat/featdprism/E1
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E f
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featdprism/E2 b/tests/feat/featdprism/E2
index fb8de054c7..873b453b98 100644
--- a/tests/feat/featdprism/E2
+++ b/tests/feat/featdprism/E2
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E f
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featdprism/E3 b/tests/feat/featdprism/E3
index 5ed061ffc2..3a7ba78af7 100644
--- a/tests/feat/featdprism/E3
+++ b/tests/feat/featdprism/E3
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E f
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featlf/A5 b/tests/feat/featlf/A5
index 8921db0888..991b9114ee 100644
--- a/tests/feat/featlf/A5
+++ b/tests/feat/featlf/A5
@@ -1,9 +1,9 @@
 # Original bug : cts21530
 # Date : 02 Nov 98
 
-restore cts21530_base.rle base
-restore cts21530_wire.rle wire
-restore cts21530_plan.rle plan
+restore [locate_data_file cts21530_base.rle] base
+restore [locate_data_file cts21530_wire.rle] wire
+restore [locate_data_file cts21530_plan.rle] plan
 
 mkface f plan
 
diff --git a/tests/feat/featlf/A6 b/tests/feat/featlf/A6
index 3270ee6f3f..5c80a5dd46 100644
--- a/tests/feat/featlf/A6
+++ b/tests/feat/featlf/A6
@@ -1,8 +1,8 @@
 # Original bug : cts20638
 # Date : 04 Nov 98
 
-restore cts20638_base.rle base
-restore cts20638_wire.rle wire
+restore [locate_data_file cts20638_base.rle] base
+restore [locate_data_file cts20638_wire.rle] wire
 
 mkplane p wire
 mksurface plan p
diff --git a/tests/feat/featlf/A7 b/tests/feat/featlf/A7
index 57efe0fdea..25f2c911ff 100644
--- a/tests/feat/featlf/A7
+++ b/tests/feat/featlf/A7
@@ -1,9 +1,9 @@
 # Original bug : cts21168
 # Date : 16 Nov 98
 
-restore cts21168_base.rle base
-restore cts21168_plan.rle plan
-restore cts21168_wire.rle wire
+restore [locate_data_file cts21168_base.rle] base
+restore [locate_data_file cts21168_plan.rle] plan
+restore [locate_data_file cts21168_wire.rle] wire
 
 featlf base wire plan 0 10 0 0 -10 0 1 1 
 featperform lf result
diff --git a/tests/feat/featlf/A8 b/tests/feat/featlf/A8
index a34d084d58..89e0c930f9 100644
--- a/tests/feat/featlf/A8
+++ b/tests/feat/featlf/A8
@@ -1,8 +1,8 @@
 # Original bug : cts19573
 # Date : 26 Nov 98
 
-restore cts19573_base.brep base
-restore cts19573_wire.brep wire
+restore [locate_data_file cts19573_base.brep] base
+restore [locate_data_file cts19573_wire.brep] wire
 
 vertex v1 0 -500 120
 plane plan 0 -500 120 1 0 0 
diff --git a/tests/feat/featlf/B8 b/tests/feat/featlf/B8
index afaad3f0d7..8f31d324c8 100644
--- a/tests/feat/featlf/B8
+++ b/tests/feat/featlf/B8
@@ -1,8 +1,8 @@
 # Original bug : cts21832
 # Date : 26 Nov 98
 
-restore cts21832_base.brep base
-restore cts21832_cont.brep cont
+restore [locate_data_file cts21832_base.brep] base
+restore [locate_data_file cts21832_cont.brep] cont
 
 explode cont wire
 copy cont_1 wire
diff --git a/tests/feat/featlf/B9 b/tests/feat/featlf/B9
index e2dfdcd058..68ae109233 100644
--- a/tests/feat/featlf/B9
+++ b/tests/feat/featlf/B9
@@ -1,8 +1,8 @@
 # Original bug : pro15772
 # Date : 30 Nov 98
 
-restore pro15772_cont.brep cont
-restore pro15772_cont1.brep cont1
+restore [locate_data_file pro15772_cont.brep] cont
+restore [locate_data_file pro15772_cont1.brep] cont1
 box boite 0 0 0 200 100 200
 
 explode cont edge
diff --git a/tests/feat/featprism/A1 b/tests/feat/featprism/A1
index 107eaf6bd1..2455fb28fe 100644
--- a/tests/feat/featprism/A1
+++ b/tests/feat/featprism/A1
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 whatis E
diff --git a/tests/feat/featprism/A2 b/tests/feat/featprism/A2
index 4ac81b18e4..0901136800 100644
--- a/tests/feat/featprism/A2
+++ b/tests/feat/featprism/A2
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 0 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/A3 b/tests/feat/featprism/A3
index 614f1bb392..3f57b11331 100644
--- a/tests/feat/featprism/A3
+++ b/tests/feat/featprism/A3
@@ -1,5 +1,5 @@
-restore cylindre.rle cyl
-restore contour.rle cont
+restore [locate_data_file cylindre.rle] cyl
+restore [locate_data_file contour.rle] cont
 mkplane cont cont
 nexplode cyl F
 
diff --git a/tests/feat/featprism/A4 b/tests/feat/featprism/A4
index 7b6a80f984..4b4fedef58 100644
--- a/tests/feat/featprism/A4
+++ b/tests/feat/featprism/A4
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 0 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/A5 b/tests/feat/featprism/A5
index 7ba9106289..c591d1a975 100644
--- a/tests/feat/featprism/A5
+++ b/tests/feat/featprism/A5
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 0 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/A6 b/tests/feat/featprism/A6
index 481a14c05e..899791ba51 100644
--- a/tests/feat/featprism/A6
+++ b/tests/feat/featprism/A6
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 0 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/A7 b/tests/feat/featprism/A7
index 406c40d142..2b2a54bbe4 100644
--- a/tests/feat/featprism/A7
+++ b/tests/feat/featprism/A7
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 0 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/A8 b/tests/feat/featprism/A8
index 29a4d7296b..fabae78f7a 100644
--- a/tests/feat/featprism/A8
+++ b/tests/feat/featprism/A8
@@ -1,5 +1,5 @@
-restore cylindre.rle cyl
-restore contour.rle cont
+restore [locate_data_file cylindre.rle] cyl
+restore [locate_data_file contour.rle] cont
 mkplane cont cont
 nexplode cyl F
  
diff --git a/tests/feat/featprism/A9 b/tests/feat/featprism/A9
index bf0211d09c..dc43c36acb 100644
--- a/tests/feat/featprism/A9
+++ b/tests/feat/featprism/A9
@@ -1,5 +1,5 @@
-restore cylindre.rle cyl
-restore contour.rle cont
+restore [locate_data_file cylindre.rle] cyl
+restore [locate_data_file contour.rle] cont
 mkplane cont cont
 nexplode cyl F
  
diff --git a/tests/feat/featprism/B1 b/tests/feat/featprism/B1
index f8d1ae6f62..7f9320b673 100644
--- a/tests/feat/featprism/B1
+++ b/tests/feat/featprism/B1
@@ -1,5 +1,5 @@
-restore cylindre.rle cyl
-restore contour.rle cont
+restore [locate_data_file cylindre.rle] cyl
+restore [locate_data_file contour.rle] cont
 mkplane cont cont
 nexplode cyl F
  
diff --git a/tests/feat/featprism/B2 b/tests/feat/featprism/B2
index 377f006bf2..7429480661 100644
--- a/tests/feat/featprism/B2
+++ b/tests/feat/featprism/B2
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/B3 b/tests/feat/featprism/B3
index 2dd289836d..806132d650 100644
--- a/tests/feat/featprism/B3
+++ b/tests/feat/featprism/B3
@@ -1,5 +1,5 @@
-restore cylindre.rle cyl
-restore contour.rle cont
+restore [locate_data_file cylindre.rle] cyl
+restore [locate_data_file contour.rle] cont
 mkplane cont cont
 nexplode cyl F
 
diff --git a/tests/feat/featprism/B4 b/tests/feat/featprism/B4
index 501dc1d96c..9c0480da8c 100644
--- a/tests/feat/featprism/B4
+++ b/tests/feat/featprism/B4
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/B5 b/tests/feat/featprism/B5
index 4e31c00af1..6b808689d2 100644
--- a/tests/feat/featprism/B5
+++ b/tests/feat/featprism/B5
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/B6 b/tests/feat/featprism/B6
index e5d5fcf959..4b1ddbc66d 100644
--- a/tests/feat/featprism/B6
+++ b/tests/feat/featprism/B6
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/B7 b/tests/feat/featprism/B7
index c260c29df1..3182f3e2c2 100644
--- a/tests/feat/featprism/B7
+++ b/tests/feat/featprism/B7
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/B8 b/tests/feat/featprism/B8
index 140613bded..0d64c0dcfb 100644
--- a/tests/feat/featprism/B8
+++ b/tests/feat/featprism/B8
@@ -1,5 +1,5 @@
-restore cylindre.rle cyl
-restore contour.rle cont
+restore [locate_data_file cylindre.rle] cyl
+restore [locate_data_file contour.rle] cont
 mkplane cont cont
 nexplode cyl F
 
diff --git a/tests/feat/featprism/B9 b/tests/feat/featprism/B9
index 015ca3de10..797f88074f 100644
--- a/tests/feat/featprism/B9
+++ b/tests/feat/featprism/B9
@@ -1,5 +1,5 @@
-restore cylindre.rle cyl
-restore contour.rle cont
+restore [locate_data_file cylindre.rle] cyl
+restore [locate_data_file contour.rle] cont
 mkplane cont cont
 nexplode cyl F
 
diff --git a/tests/feat/featprism/C1 b/tests/feat/featprism/C1
index b997447746..57ed65af0c 100644
--- a/tests/feat/featprism/C1
+++ b/tests/feat/featprism/C1
@@ -1,5 +1,5 @@
-restore cylindre.rle cyl
-restore contour.rle cont
+restore [locate_data_file cylindre.rle] cyl
+restore [locate_data_file contour.rle] cont
 mkplane cont cont
 nexplode cyl F
 
diff --git a/tests/feat/featprism/C2 b/tests/feat/featprism/C2
index 428d510196..7a0e65fab5 100644
--- a/tests/feat/featprism/C2
+++ b/tests/feat/featprism/C2
@@ -1,5 +1,5 @@
-restore cylindre.rle cyl
-restore contour.rle cont
+restore [locate_data_file cylindre.rle] cyl
+restore [locate_data_file contour.rle] cont
 mkplane cont cont
 nexplode cyl F
 
diff --git a/tests/feat/featprism/C3 b/tests/feat/featprism/C3
index cb3d4f6042..4a540c4c50 100644
--- a/tests/feat/featprism/C3
+++ b/tests/feat/featprism/C3
@@ -1,5 +1,5 @@
-restore cylindre.rle cyl
-restore contour.rle cont
+restore [locate_data_file cylindre.rle] cyl
+restore [locate_data_file contour.rle] cont
 mkplane cont cont
 nexplode cyl F
 
diff --git a/tests/feat/featprism/C4 b/tests/feat/featprism/C4
index dfeb3abb4f..999edc18d5 100644
--- a/tests/feat/featprism/C4
+++ b/tests/feat/featprism/C4
@@ -1,5 +1,5 @@
-restore cylindre.rle cyl
-restore contour.rle cont
+restore [locate_data_file cylindre.rle] cyl
+restore [locate_data_file contour.rle] cont
 mkplane cont cont
 nexplode cyl F
 
diff --git a/tests/feat/featprism/C5 b/tests/feat/featprism/C5
index 17ef017061..ff6c5546d1 100644
--- a/tests/feat/featprism/C5
+++ b/tests/feat/featprism/C5
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 150 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/C6 b/tests/feat/featprism/C6
index 1766397cc3..e9fc50a98d 100644
--- a/tests/feat/featprism/C6
+++ b/tests/feat/featprism/C6
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 150 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/C7 b/tests/feat/featprism/C7
index 8889602c5b..f934ee059d 100644
--- a/tests/feat/featprism/C7
+++ b/tests/feat/featprism/C7
@@ -1,5 +1,5 @@
-restore cylindre.rle cyl
-restore contour.rle cont
+restore [locate_data_file cylindre.rle] cyl
+restore [locate_data_file contour.rle] cont
 mkplane cont cont
 nexplode cyl F
 
diff --git a/tests/feat/featprism/C8 b/tests/feat/featprism/C8
old mode 100755
new mode 100644
index c58a9dde57..b518dc625b
--- a/tests/feat/featprism/C8
+++ b/tests/feat/featprism/C8
@@ -1,5 +1,5 @@
-restore cylindre.rle cyl
-restore contour.rle cont
+restore [locate_data_file cylindre.rle] cyl
+restore [locate_data_file contour.rle] cont
 mkplane cont cont
 nexplode cyl F
 
diff --git a/tests/feat/featprism/D1 b/tests/feat/featprism/D1
index 06bf029550..d39ab74d97 100644
--- a/tests/feat/featprism/D1
+++ b/tests/feat/featprism/D1
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/D2 b/tests/feat/featprism/D2
index 8d32b1ca96..94df1b76ef 100644
--- a/tests/feat/featprism/D2
+++ b/tests/feat/featprism/D2
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/D3 b/tests/feat/featprism/D3
index c369a7cc43..5a29f470c6 100644
--- a/tests/feat/featprism/D3
+++ b/tests/feat/featprism/D3
@@ -1,5 +1,5 @@
-restore cylindre.rle cyl
-restore contour.rle cont
+restore [locate_data_file cylindre.rle] cyl
+restore [locate_data_file contour.rle] cont
 mkplane cont cont
 nexplode cyl F
  
diff --git a/tests/feat/featprism/D4 b/tests/feat/featprism/D4
index d6799a36bd..aec785714f 100644
--- a/tests/feat/featprism/D4
+++ b/tests/feat/featprism/D4
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/D5 b/tests/feat/featprism/D5
index d71c6453e5..2c83311da6 100644
--- a/tests/feat/featprism/D5
+++ b/tests/feat/featprism/D5
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/D6 b/tests/feat/featprism/D6
index 82956eec2a..6f1b0eb7d3 100644
--- a/tests/feat/featprism/D6
+++ b/tests/feat/featprism/D6
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/D7 b/tests/feat/featprism/D7
index 7e5ab41aec..6b06c52d1a 100644
--- a/tests/feat/featprism/D7
+++ b/tests/feat/featprism/D7
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/D8 b/tests/feat/featprism/D8
index a7a4071e5a..51343e1a69 100644
--- a/tests/feat/featprism/D8
+++ b/tests/feat/featprism/D8
@@ -1,5 +1,5 @@
-restore cylindre.rle cyl
-restore contour.rle cont
+restore [locate_data_file cylindre.rle] cyl
+restore [locate_data_file contour.rle] cont
 mkplane cont cont
 nexplode cyl F
 
diff --git a/tests/feat/featprism/D9 b/tests/feat/featprism/D9
index 5fec9e979e..160e2c1f11 100644
--- a/tests/feat/featprism/D9
+++ b/tests/feat/featprism/D9
@@ -1,5 +1,5 @@
-restore cylindre.rle cyl
-restore contour.rle cont
+restore [locate_data_file cylindre.rle] cyl
+restore [locate_data_file contour.rle] cont
 mkplane cont cont
 nexplode cyl F
 
diff --git a/tests/feat/featprism/E1 b/tests/feat/featprism/E1
index 5efc89700a..f5033e2f4d 100644
--- a/tests/feat/featprism/E1
+++ b/tests/feat/featprism/E1
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 0 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/E2 b/tests/feat/featprism/E2
index 03ff518b3f..18745307ff 100644
--- a/tests/feat/featprism/E2
+++ b/tests/feat/featprism/E2
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 0 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/E3 b/tests/feat/featprism/E3
index ce5adacc7d..437704db8a 100644
--- a/tests/feat/featprism/E3
+++ b/tests/feat/featprism/E3
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 0 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/E4 b/tests/feat/featprism/E4
index 80250cee25..4f32e46587 100644
--- a/tests/feat/featprism/E4
+++ b/tests/feat/featprism/E4
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 0 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/E6 b/tests/feat/featprism/E6
index 3e7bccdd19..d91f7c009a 100644
--- a/tests/feat/featprism/E6
+++ b/tests/feat/featprism/E6
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 0 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/E7 b/tests/feat/featprism/E7
index 4970c6521d..a42c41e59c 100644
--- a/tests/feat/featprism/E7
+++ b/tests/feat/featprism/E7
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 0 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/F1 b/tests/feat/featprism/F1
index 9b249cc1e6..19d33f5f04 100644
--- a/tests/feat/featprism/F1
+++ b/tests/feat/featprism/F1
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/F2 b/tests/feat/featprism/F2
index 760e7ca1bd..4f3d057eec 100644
--- a/tests/feat/featprism/F2
+++ b/tests/feat/featprism/F2
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/F4 b/tests/feat/featprism/F4
index 614a456ff5..2969e2e6b6 100644
--- a/tests/feat/featprism/F4
+++ b/tests/feat/featprism/F4
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/F6 b/tests/feat/featprism/F6
index 4625b71024..2a5e2254ed 100644
--- a/tests/feat/featprism/F6
+++ b/tests/feat/featprism/F6
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/F7 b/tests/feat/featprism/F7
index 8fed35d6b5..5ed8919d22 100644
--- a/tests/feat/featprism/F7
+++ b/tests/feat/featprism/F7
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/G1 b/tests/feat/featprism/G1
index 7076af3f61..d804837a22 100644
--- a/tests/feat/featprism/G1
+++ b/tests/feat/featprism/G1
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 150 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/G2 b/tests/feat/featprism/G2
index 07932540c6..94741216d1 100644
--- a/tests/feat/featprism/G2
+++ b/tests/feat/featprism/G2
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 150 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/G4 b/tests/feat/featprism/G4
index a32db2315f..9f68375a58 100644
--- a/tests/feat/featprism/G4
+++ b/tests/feat/featprism/G4
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 150 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/G6 b/tests/feat/featprism/G6
index f1340bb2a1..6949b10f43 100644
--- a/tests/feat/featprism/G6
+++ b/tests/feat/featprism/G6
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 150 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/G7 b/tests/feat/featprism/G7
index eff1f7fd23..18a043ff39 100644
--- a/tests/feat/featprism/G7
+++ b/tests/feat/featprism/G7
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 150 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/H1 b/tests/feat/featprism/H1
index 42cdfe6e05..be114bba7f 100644
--- a/tests/feat/featprism/H1
+++ b/tests/feat/featprism/H1
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/H2 b/tests/feat/featprism/H2
index 597179fb41..8c16b82499 100644
--- a/tests/feat/featprism/H2
+++ b/tests/feat/featprism/H2
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/H4 b/tests/feat/featprism/H4
index 3f7605987e..c2b250b88d 100644
--- a/tests/feat/featprism/H4
+++ b/tests/feat/featprism/H4
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/H6 b/tests/feat/featprism/H6
index e86d3b0c84..9e9599fdea 100644
--- a/tests/feat/featprism/H6
+++ b/tests/feat/featprism/H6
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/H7 b/tests/feat/featprism/H7
index f919de5b5d..c529851fbb 100644
--- a/tests/feat/featprism/H7
+++ b/tests/feat/featprism/H7
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/H8 b/tests/feat/featprism/H8
index 147eae0d11..5c522d70eb 100644
--- a/tests/feat/featprism/H8
+++ b/tests/feat/featprism/H8
@@ -1,5 +1,5 @@
-restore cylindre2.rle cyl
-restore contour2.rle cont
+restore [locate_data_file cylindre2.rle] cyl
+restore [locate_data_file contour2.rle] cont
 
 explode cyl face
 copy cyl_3 funtil
diff --git a/tests/feat/featprism/H9 b/tests/feat/featprism/H9
index e43065a748..859e723815 100644
--- a/tests/feat/featprism/H9
+++ b/tests/feat/featprism/H9
@@ -1,5 +1,5 @@
-restore cylindre2.rle cyl
-restore contour2.rle cont
+restore [locate_data_file cylindre2.rle] cyl
+restore [locate_data_file contour2.rle] cont
 
 explode cyl face
 copy cyl_1 funtil
diff --git a/tests/feat/featprism/I1 b/tests/feat/featprism/I1
index fdf3bc8704..76ed6784e1 100644
--- a/tests/feat/featprism/I1
+++ b/tests/feat/featprism/I1
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/I2 b/tests/feat/featprism/I2
index 718612f63c..9c5b13970c 100644
--- a/tests/feat/featprism/I2
+++ b/tests/feat/featprism/I2
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/I3 b/tests/feat/featprism/I3
index 5330cab015..d75c1324d2 100644
--- a/tests/feat/featprism/I3
+++ b/tests/feat/featprism/I3
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/I4 b/tests/feat/featprism/I4
index a45f3ac851..f6dd4a07fa 100644
--- a/tests/feat/featprism/I4
+++ b/tests/feat/featprism/I4
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/I5 b/tests/feat/featprism/I5
index 1291d189e6..39a5d76fda 100644
--- a/tests/feat/featprism/I5
+++ b/tests/feat/featprism/I5
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/I6 b/tests/feat/featprism/I6
index 54705d3259..426d858ddf 100644
--- a/tests/feat/featprism/I6
+++ b/tests/feat/featprism/I6
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/I7 b/tests/feat/featprism/I7
index c8f24f861e..340f994e04 100644
--- a/tests/feat/featprism/I7
+++ b/tests/feat/featprism/I7
@@ -1,4 +1,4 @@
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 nexplode E face E_1 E_2 E_3 E_4 E_5 E_6 E_7 E_8 E_9 E_10 E_11 E_12 E_13 E_14
 
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/I8 b/tests/feat/featprism/I8
index 0620ed528f..fadd1f63ae 100644
--- a/tests/feat/featprism/I8
+++ b/tests/feat/featprism/I8
@@ -1,5 +1,5 @@
-restore cylindre2.rle cyl
-restore contour2.rle cont
+restore [locate_data_file cylindre2.rle] cyl
+restore [locate_data_file contour2.rle] cont
 
 explode cyl face
 copy cyl_3 funtil
diff --git a/tests/feat/featprism/I9 b/tests/feat/featprism/I9
index 8b76b5f19f..76f26339cd 100644
--- a/tests/feat/featprism/I9
+++ b/tests/feat/featprism/I9
@@ -1,5 +1,5 @@
-restore cylindre2.rle cyl
-restore contour2.rle cont
+restore [locate_data_file cylindre2.rle] cyl
+restore [locate_data_file contour2.rle] cont
 
 explode cyl face
 copy cyl_1 funtil
diff --git a/tests/feat/featprism/J1 b/tests/feat/featprism/J1
index 36571015b8..93ebbc44ad 100644
--- a/tests/feat/featprism/J1
+++ b/tests/feat/featprism/J1
@@ -2,8 +2,8 @@
 # Date : 12 Oct 98
 # Feature distance
 
-restore cts21199_base.rle base
-restore cts21199_face.rle cont
+restore [locate_data_file cts21199_base.rle] base
+restore [locate_data_file cts21199_face.rle] cont
 
 featprism base cont cont 0 0 -1 1 1
 featperformval prism result 50
diff --git a/tests/feat/featprism/J2 b/tests/feat/featprism/J2
index a2a5de8112..55277f135e 100644
--- a/tests/feat/featprism/J2
+++ b/tests/feat/featprism/J2
@@ -4,9 +4,9 @@
 cpulimit 1300
 #increased from default by aki 26.08.04
 
-restore ger50084_baseX.rle base
+restore [locate_data_file ger50084_baseX.rle] base
 fsameparameter base
-restore ger50084_face.rle wire
+restore [locate_data_file ger50084_face.rle] wire
 
 ## contour est un wire -> on en fait une face
 mkplane cont wire
diff --git a/tests/feat/featprism/J3 b/tests/feat/featprism/J3
index e770c5c174..dfcac1bdb5 100644
--- a/tests/feat/featprism/J3
+++ b/tests/feat/featprism/J3
@@ -2,8 +2,8 @@
 # Date : 15 Oct 98
 
 # face non tangente
-restore id260065_base.rle base
-restore id260065_face2.rle cont
+restore [locate_data_file id260065_base.rle] base
+restore [locate_data_file id260065_face2.rle] cont
 
 explode base face
 copy base_26 funtil
diff --git a/tests/feat/featprism/J4 b/tests/feat/featprism/J4
index 16b0e8fb82..0460de99c5 100644
--- a/tests/feat/featprism/J4
+++ b/tests/feat/featprism/J4
@@ -1,6 +1,6 @@
-restore diamant a
-restore diamantprof b
-restore diamantunt un
+restore [locate_data_file diamant] a
+restore [locate_data_file diamantprof] b
+restore [locate_data_file diamantunt] un
 
 featprism a b b 0 0 -1 0 1
 featperform prism result un
diff --git a/tests/feat/featprism/J5 b/tests/feat/featprism/J5
index 8a97456f6a..8769a6a6af 100644
--- a/tests/feat/featprism/J5
+++ b/tests/feat/featprism/J5
@@ -1,8 +1,8 @@
 # Original bug : cts60033
 # Date : 15 Oct 98
 
-restore cts60033_base.rle base
-restore cts60033_face.rle cont
+restore [locate_data_file cts60033_base.rle] base
+restore [locate_data_file cts60033_face.rle] cont
 
 featprism base cont cont 0 1 0 1 1
 featperformval prism result 17
diff --git a/tests/feat/featprism/J6 b/tests/feat/featprism/J6
index 139cfffe2e..4848ab384e 100644
--- a/tests/feat/featprism/J6
+++ b/tests/feat/featprism/J6
@@ -1,8 +1,8 @@
 # Original bug : cts21616
 # Date : 04 Nov 98
 
-restore cts21616_base.rle base
-restore cts21616_face.rle cont
+restore [locate_data_file cts21616_base.rle] base
+restore [locate_data_file cts21616_face.rle] cont
 
 # Funtil in Shape -> failure
 explode base face
diff --git a/tests/feat/featprism/J7 b/tests/feat/featprism/J7
index e8e051024a..d8eff101c8 100644
--- a/tests/feat/featprism/J7
+++ b/tests/feat/featprism/J7
@@ -1,8 +1,8 @@
 # Original bug : cts21616
 # Date : 04 Nov 98
 
-restore cts21616_base.rle base
-restore cts21616_face.rle cont
+restore [locate_data_file cts21616_base.rle] base
+restore [locate_data_file cts21616_face.rle] cont
 
 # Funtil in Shape -> failure
 explode base face
diff --git a/tests/feat/featprism/K1 b/tests/feat/featprism/K1
index 1d7aa0f3ec..7cc8a77654 100644
--- a/tests/feat/featprism/K1
+++ b/tests/feat/featprism/K1
@@ -1,8 +1,8 @@
 # Original bug : cts20170
 # Date : 8April98
 
-restore cts20170_base.rle base
-restore cts20170_face.rle cont
+restore [locate_data_file cts20170_base.rle] base
+restore [locate_data_file cts20170_face.rle] cont
 
 explode base face
 
diff --git a/tests/feat/featprism/K2 b/tests/feat/featprism/K2
index 44d672d3ee..a1ef3305b5 100644
--- a/tests/feat/featprism/K2
+++ b/tests/feat/featprism/K2
@@ -1,8 +1,8 @@
 # Original bug : cts20168
 # Date : 8April98
 
-restore cts20168_base.rle base
-restore cts20168_face.rle cont
+restore [locate_data_file cts20168_base.rle] base
+restore [locate_data_file cts20168_face.rle] cont
 
 explode base face
 copy base_1 ffrom
diff --git a/tests/feat/featprism/K3 b/tests/feat/featprism/K3
index b6587d64e3..52d3285392 100644
--- a/tests/feat/featprism/K3
+++ b/tests/feat/featprism/K3
@@ -1,8 +1,8 @@
 # Original bug : cts20148
 # Date : 8April98
 
-restore cts20148_base.rle base
-restore cts20148_face.rle cont
+restore [locate_data_file cts20148_base.rle] base
+restore [locate_data_file cts20148_face.rle] cont
 
 featprism base cont cont 0 -1 0 0 1 
 featperform prism result
diff --git a/tests/feat/featprism/K4 b/tests/feat/featprism/K4
index b312e30e1d..872ed337b0 100644
--- a/tests/feat/featprism/K4
+++ b/tests/feat/featprism/K4
@@ -1,8 +1,8 @@
 # Original bug : cts20358
 # Date : 17Juillet98
 
-restore cts20358a.rle base
-restore cts20358b.rle cont
+restore [locate_data_file cts20358a.rle] base
+restore [locate_data_file cts20358b.rle] cont
 
 explode base face
 copy base_15 ffrom
diff --git a/tests/feat/featprism/K5 b/tests/feat/featprism/K5
index 27f8b0b2a8..9165f89dbb 100644
--- a/tests/feat/featprism/K5
+++ b/tests/feat/featprism/K5
@@ -1,9 +1,9 @@
 # Original bug : cts20369
 # Date : 17Juillet98
 
-restore cts20369a.rle base0
-restore cts20369b.rle cont0
-restore cts20369c.rle cont
+restore [locate_data_file cts20369a.rle] base0
+restore [locate_data_file cts20369b.rle] cont0
+restore [locate_data_file cts20369c.rle] cont
 
 # OK
 featprism base0 cont0 cont0 0 1 0 0 1
diff --git a/tests/feat/featprism/K6 b/tests/feat/featprism/K6
index 29ff34e1cd..183113ad9e 100644
--- a/tests/feat/featprism/K6
+++ b/tests/feat/featprism/K6
@@ -1,8 +1,8 @@
 # Original bug : cts20924
 # Date : 17Juillet98
 
-restore cts20924a.rle base
-restore cts20924b.rle cont
+restore [locate_data_file cts20924a.rle] base
+restore [locate_data_file cts20924b.rle] cont
 
 explode base face
 copy base_3 funtil
diff --git a/tests/feat/featprism/K7 b/tests/feat/featprism/K7
index 31aeb22fc5..614248b7aa 100644
--- a/tests/feat/featprism/K7
+++ b/tests/feat/featprism/K7
@@ -1,9 +1,9 @@
 # Original bug : cts20722
 # Date : 21August98
 
-restore cts20722a.rle base
-restore cts20722b.rle cont
-restore cts20722c.rle funtil
+restore [locate_data_file cts20722a.rle] base
+restore [locate_data_file cts20722b.rle] cont
+restore [locate_data_file cts20722c.rle] funtil
 
 explode cont face
 #explode base face
diff --git a/tests/feat/featprism/K8 b/tests/feat/featprism/K8
index 45d11d9f3b..e556e1d996 100644
--- a/tests/feat/featprism/K8
+++ b/tests/feat/featprism/K8
@@ -1,8 +1,8 @@
 # Original bug : cts21128
 # Date : 21August98
 
-restore cts21128a.rle base
-restore cts21128b.rle cont
+restore [locate_data_file cts21128a.rle] base
+restore [locate_data_file cts21128b.rle] cont
 
 explode base face
 copy base_3 funtil
diff --git a/tests/feat/featprism/K9 b/tests/feat/featprism/K9
index 92faf8e753..681dcb4d3a 100644
--- a/tests/feat/featprism/K9
+++ b/tests/feat/featprism/K9
@@ -1,8 +1,8 @@
 # Original bug : cts18754
 # Date : 20 Mar 98
 
-restore cts18754-part.rle base
-restore cts18754-tool.rle wire
+restore [locate_data_file cts18754-part.rle] base
+restore [locate_data_file cts18754-tool.rle] wire
 
 mkplane cont wire
 
diff --git a/tests/feat/featprism/L1 b/tests/feat/featprism/L1
index 84c7ac95c0..66b2f91fab 100644
--- a/tests/feat/featprism/L1
+++ b/tests/feat/featprism/L1
@@ -1,8 +1,8 @@
 # Original bug : fra60618
 # Date : 23 Mar 98
 
-restore fra60618-part.rle base
-restore fra60618-tool.rle wire
+restore [locate_data_file fra60618-part.rle] base
+restore [locate_data_file fra60618-tool.rle] wire
 
 mkplane cont wire
 
diff --git a/tests/feat/featprism/L2 b/tests/feat/featprism/L2
index 7cf65d3f7e..3a13ab56b0 100644
--- a/tests/feat/featprism/L2
+++ b/tests/feat/featprism/L2
@@ -1,8 +1,8 @@
 # Original bug : ger60224
 # Date : 23mar98
 
-restore ger60224-part.rle base
-restore ger60224-tool.rle wire
+restore [locate_data_file ger60224-part.rle] base
+restore [locate_data_file ger60224-tool.rle] wire
 
 mkplane cont wire
 
diff --git a/tests/feat/featprism/L3 b/tests/feat/featprism/L3
index 4b74e7d752..66566abd1f 100644
--- a/tests/feat/featprism/L3
+++ b/tests/feat/featprism/L3
@@ -1,7 +1,7 @@
 # Original bug : pro13576
 # Date : 15 Sept 98
 
-restore pro13576_base.rle base
+restore [locate_data_file pro13576_base.rle] base
 profile cont p 1 0 0 0 1 0 O 400 0 0 F 50 -100 y 200 x -100 y -200
 
 nexplode base face
diff --git a/tests/feat/featprism/L4 b/tests/feat/featprism/L4
index cbc458f4fb..36f3f28950 100644
--- a/tests/feat/featprism/L4
+++ b/tests/feat/featprism/L4
@@ -1,8 +1,8 @@
 # Original bug : cts20072
 # Date : 24mar98
 
-restore cts20072_base.rle base
-restore cts20072_face.rle cont
+restore [locate_data_file cts20072_base.rle] base
+restore [locate_data_file cts20072_face.rle] cont
 
 featprism base cont cont 0 0 1 1 1
 featperformval prism result 100
diff --git a/tests/feat/featprism/L5 b/tests/feat/featprism/L5
index 1796f444c4..118de814a4 100644
--- a/tests/feat/featprism/L5
+++ b/tests/feat/featprism/L5
@@ -1,8 +1,8 @@
 # Original bug : pro8951
 # Date : 19mar98
 
-restore pro8951a.rle base
-restore pro8951b.rle wire
+restore [locate_data_file pro8951a.rle] base
+restore [locate_data_file pro8951b.rle] wire
 
 mkplane cont wire
 
diff --git a/tests/feat/featprism/L6 b/tests/feat/featprism/L6
index 35c3817cd8..ddcd8fdb74 100644
--- a/tests/feat/featprism/L6
+++ b/tests/feat/featprism/L6
@@ -1,7 +1,7 @@
 # Original bug : cts21322
 # Date : 16 Sept 98
 
-restore contour.rle cont
+restore [locate_data_file contour.rle] cont
 mkplane cont cont
 
 puts "*"
@@ -9,8 +9,8 @@ puts "*"
 puts "TODO OCC22810 ALL:Error in featperform"
 puts "TODO OCC22810 ALL:Error : The feat can not be build"
 
-restore cts21322_base.rle base
-restore cts21322_face.rle wire
+restore [locate_data_file cts21322_base.rle] base
+restore [locate_data_file cts21322_face.rle] wire
 
 explode base face
 copy base_6 fsketch
diff --git a/tests/feat/featprism/L7 b/tests/feat/featprism/L7
index 479c0eea19..bf89abc439 100644
--- a/tests/feat/featprism/L7
+++ b/tests/feat/featprism/L7
@@ -6,8 +6,8 @@ puts "TODO OCC22810 All:Error in featperform"
 puts "TODO OCC22810 All:Error in fsameparameter"
 puts "TODO OCC22810 All:Error : The feat can not be build"
 
-restore hkg60163_base.rle base
-restore hkg60163_face.rle cont1
+restore [locate_data_file hkg60163_base.rle] base
+restore [locate_data_file hkg60163_face.rle] cont1
 
 ## thickness 2mm
 mkoffset off cont1 1 2
diff --git a/tests/feat/featprism/L8 b/tests/feat/featprism/L8
index 9fb49c8113..a89a1ea376 100644
--- a/tests/feat/featprism/L8
+++ b/tests/feat/featprism/L8
@@ -1,8 +1,8 @@
 # Original bug : pro12880
 # Date : 10 Sept 98
 
-restore pro12880_base.rle base
-restore pro12880_face.rle cont
+restore [locate_data_file pro12880_base.rle] base
+restore [locate_data_file pro12880_face.rle] cont
 
 featprism base cont cont 0 1 0 1 1
 featperformval prism result 100
diff --git a/tests/feat/featprism/L9 b/tests/feat/featprism/L9
index 72faaf16ee..24c079c24b 100644
--- a/tests/feat/featprism/L9
+++ b/tests/feat/featprism/L9
@@ -1,8 +1,8 @@
 # Original bug : pro14240
 # Date : 16 Sept 98
 
-restore pro14240_base.rle base
-restore pro14240_face.rle cont
+restore [locate_data_file pro14240_base.rle] base
+restore [locate_data_file pro14240_face.rle] cont
 
 featprism base cont cont 0 0 1 0 1
 featperformval prism result 100
diff --git a/tests/feat/featprism/M1 b/tests/feat/featprism/M1
index e586f4aa7b..4de87c5c9c 100644
--- a/tests/feat/featprism/M1
+++ b/tests/feat/featprism/M1
@@ -1,8 +1,8 @@
 # Original bug : ger50084
 # Date : 15 Sept 98
 
-restore ger50084_base.rle base
-restore ger50084_face.rle wire
+restore [locate_data_file ger50084_base.rle] base
+restore [locate_data_file ger50084_face.rle] wire
 
 ## contour est un wire -> on en fait une face
 mkplane cont wire
diff --git a/tests/feat/featprism/M2 b/tests/feat/featprism/M2
index 7759a106cb..6192404d0f 100644
--- a/tests/feat/featprism/M2
+++ b/tests/feat/featprism/M2
@@ -1,8 +1,8 @@
 # Original bug : hkg60159
 # Date : 16 Sept 98
 
-restore hkg60159_base.rle base
-restore hkg60159_face.rle cont
+restore [locate_data_file hkg60159_base.rle] base
+restore [locate_data_file hkg60159_face.rle] cont
 
 explode base face
 copy base_5 funtil
diff --git a/tests/feat/featprism/M3 b/tests/feat/featprism/M3
index 4dfbc8bd5b..1313b3ca9c 100644
--- a/tests/feat/featprism/M3
+++ b/tests/feat/featprism/M3
@@ -2,7 +2,7 @@
 # bis pro15024
 # Date : 17 Sept 98
 
-restore E_long.rle E
+restore [locate_data_file E_long.rle] E
 
 nexplode E face
 profile cont S E_10 F 50 -100 X 50 Y -100 X -50
diff --git a/tests/feat/featprism/M4 b/tests/feat/featprism/M4
index 178a91525f..cb6774f1d2 100644
--- a/tests/feat/featprism/M4
+++ b/tests/feat/featprism/M4
@@ -1,9 +1,9 @@
 # Original bug : cts21180
 # Date : 17 Sept 98
 
-restore cts21180_base.rle base
-restore cts21180_face.rle cont
-restore cts21180_until.rle funtil
+restore [locate_data_file cts21180_base.rle] base
+restore [locate_data_file cts21180_face.rle] cont
+restore [locate_data_file cts21180_until.rle] funtil
 
 featprism base cont cont 0 0 -1 1 1
 featperform prism result funtil
diff --git a/tests/feat/featprism/M5 b/tests/feat/featprism/M5
index a3715882f8..bb444eac5f 100644
--- a/tests/feat/featprism/M5
+++ b/tests/feat/featprism/M5
@@ -2,8 +2,8 @@
 # bis cts20212
 # Date : 22 Sept 98
 
-restore cts20872_base.rle base
-restore cts20872_face.rle cont
+restore [locate_data_file cts20872_base.rle] base
+restore [locate_data_file cts20872_face.rle] cont
 
 explode base face
 copy base_12 funtil
diff --git a/tests/feat/featprism/M6 b/tests/feat/featprism/M6
index 9e0baa88ea..66da1271e4 100644
--- a/tests/feat/featprism/M6
+++ b/tests/feat/featprism/M6
@@ -1,8 +1,8 @@
 # Original bug : ger60806
 # Date : 12 Oct 98
 
-restore ger60806_base.rle base
-restore ger60806_face.rle cont
+restore [locate_data_file ger60806_base.rle] base
+restore [locate_data_file ger60806_face.rle] cont
 
 explode base face
 copy base_10 funtil
diff --git a/tests/feat/featprism/M7 b/tests/feat/featprism/M7
index 7915081569..ef8856da94 100644
--- a/tests/feat/featprism/M7
+++ b/tests/feat/featprism/M7
@@ -1,8 +1,8 @@
 # Original bug : cts20196
 # Date : 12 Oct 98
 
-restore cts20196_base.rle base
-restore cts20196_face.rle cont
+restore [locate_data_file cts20196_base.rle] base
+restore [locate_data_file cts20196_face.rle] cont
 
 featprism base cont cont 0 1 0 0 1
 featperformval prism result 20
diff --git a/tests/feat/featprism/M9 b/tests/feat/featprism/M9
index 255dc30049..04d6000155 100644
--- a/tests/feat/featprism/M9
+++ b/tests/feat/featprism/M9
@@ -5,8 +5,8 @@
 cpulimit 700
 #aki 10092004
 
-restore cts21199_base.rle base
-restore cts21199_face.rle cont
+restore [locate_data_file cts21199_base.rle] base
+restore [locate_data_file cts21199_face.rle] cont
 
 explode base face
 copy base_1 funtil
diff --git a/tests/feat/featprism/N1 b/tests/feat/featprism/N1
index 359e6e3e68..3f418ccf74 100644
--- a/tests/feat/featprism/N1
+++ b/tests/feat/featprism/N1
@@ -1,8 +1,8 @@
 # Original bug : id160074
 # Date : 23 Nov 98
 
-restore id160074_base.brep base
-restore id160074_face1.brep cont
+restore [locate_data_file id160074_base.brep] base
+restore [locate_data_file id160074_face1.brep] cont
 
 explode base face
 copy base_8 funtil
diff --git a/tests/feat/featprism/N2 b/tests/feat/featprism/N2
index 687c1022b6..8022ecc122 100644
--- a/tests/feat/featprism/N2
+++ b/tests/feat/featprism/N2
@@ -1,8 +1,8 @@
 # Original bug : id160074
 # Date : 23 Nov 98
 
-restore id160074_base.brep base
-restore id160074_face2.brep cont
+restore [locate_data_file id160074_base.brep] base
+restore [locate_data_file id160074_face2.brep] cont
 
 explode base face
 copy base_8 funtil
diff --git a/tests/feat/featprism/N3 b/tests/feat/featprism/N3
index 356c6cd5b4..ea5fa8fad4 100644
--- a/tests/feat/featprism/N3
+++ b/tests/feat/featprism/N3
@@ -1,8 +1,8 @@
 # Original bug : cts20875
 # Date : 25 Nov 98
 
-restore cts20875_base.brep base
-restore cts20875_face.brep cont
+restore [locate_data_file cts20875_base.brep] base
+restore [locate_data_file cts20875_face.brep] cont
 
 ttranslate cont 0 -5.65 0
 
diff --git a/tests/feat/featprism/N6 b/tests/feat/featprism/N6
index ad346327b3..633c75f458 100644
--- a/tests/feat/featprism/N6
+++ b/tests/feat/featprism/N6
@@ -1,8 +1,8 @@
 # Original bug : cts20445
 # Date : 25 Nov 98
 
-restore cts20445_base.brep base
-restore cts20445_face.brep cont
+restore [locate_data_file cts20445_base.brep] base
+restore [locate_data_file cts20445_face.brep] cont
 
 explode base face
 copy base_7 funtil
diff --git a/tests/feat/featprism/N7 b/tests/feat/featprism/N7
index 41647c004e..75314721f0 100644
--- a/tests/feat/featprism/N7
+++ b/tests/feat/featprism/N7
@@ -1,8 +1,8 @@
 # Original bug : cts20449
 # Date : 25 Nov 98
 
-restore cts20449_base.brep base
-restore cts20449_face.brep cont
+restore [locate_data_file cts20449_base.brep] base
+restore [locate_data_file cts20449_face.brep] cont
 
 explode base face
 copy base_5 funtil
diff --git a/tests/feat/featprism/N8 b/tests/feat/featprism/N8
index 389b59131c..fabf07a1db 100644
--- a/tests/feat/featprism/N8
+++ b/tests/feat/featprism/N8
@@ -1,9 +1,9 @@
 # Original bug : cts20721
 # Date : 25 Nov 98
 
-restore cts20721_base.brep base
-restore cts20721_face.brep cont
-restore cts20721_until.brep funtil
+restore [locate_data_file cts20721_base.brep] base
+restore [locate_data_file cts20721_face.brep] cont
+restore [locate_data_file cts20721_until.brep] funtil
 
 featprism base cont cont 0 0 -1 0 1
 featperform prism result funtil
diff --git a/tests/feat/featprism/N9 b/tests/feat/featprism/N9
index f26e8a77ce..99682371bd 100644
--- a/tests/feat/featprism/N9
+++ b/tests/feat/featprism/N9
@@ -1,8 +1,8 @@
 # Original bug : cts20870
 # Date : 25 Nov 98
 
-restore cts20870_base.brep base
-restore cts20870_face.brep cont
+restore [locate_data_file cts20870_base.brep] base
+restore [locate_data_file cts20870_face.brep] cont
 
 explode base face
 copy base_6 funtil
diff --git a/tests/feat/featprism/O1 b/tests/feat/featprism/O1
index dedd2502eb..a5b73230db 100644
--- a/tests/feat/featprism/O1
+++ b/tests/feat/featprism/O1
@@ -1,7 +1,7 @@
 # Original bug : cts21126
 # Date : 25 Nov 98
 
-restore cts21126_base.brep base
+restore [locate_data_file cts21126_base.brep] base
 
 circle c1 0 0 0 0 0 1 1 0 0 6.3
 mkedge e1 c1
diff --git a/tests/feat/featprism/O2 b/tests/feat/featprism/O2
index 836757aeee..518b143110 100644
--- a/tests/feat/featprism/O2
+++ b/tests/feat/featprism/O2
@@ -1,8 +1,8 @@
 # Original bug : pro13278
 # Date : 25 Nov 98
 
-restore pro13278_base.brep base
-restore pro13278_face.brep cont
+restore [locate_data_file pro13278_base.brep] base
+restore [locate_data_file pro13278_face.brep] cont
 
 explode base face
 copy base_6 funtil
diff --git a/tests/feat/featprism/O5 b/tests/feat/featprism/O5
index 6e41356006..9f4d4d3b14 100644
--- a/tests/feat/featprism/O5
+++ b/tests/feat/featprism/O5
@@ -1,7 +1,7 @@
 # Original bug : pro13573
 # Date : 25 Nov 98
 
-restore pro13573_base.brep base
+restore [locate_data_file pro13573_base.brep] base
 profile cont p 1 0 0 0 1 0 F 0 200 x -100 y -150 x 100
 
 nexplode base face
diff --git a/tests/feat/featprism/O6 b/tests/feat/featprism/O6
index 26d5dc2572..a7982e05aa 100644
--- a/tests/feat/featprism/O6
+++ b/tests/feat/featprism/O6
@@ -6,8 +6,8 @@
 #miv
 cpulimit 2000
 
-restore cts20960_base.brep base
-restore cts20960_face.brep cont
+restore [locate_data_file cts20960_base.brep] base
+restore [locate_data_file cts20960_face.brep] cont
 
 explode base face
 #copy base_26 funtil
diff --git a/tests/feat/featprism/O7 b/tests/feat/featprism/O7
index 16f4eaedf1..cedae65edb 100644
--- a/tests/feat/featprism/O7
+++ b/tests/feat/featprism/O7
@@ -1,8 +1,8 @@
 # Original bug : cts20077
 # Date : 25 Nov 98
 
-restore cts20077_base.brep base
-restore cts20077_face.brep cont
+restore [locate_data_file cts20077_base.brep] base
+restore [locate_data_file cts20077_face.brep] cont
 
 explode base face
 copy base_5 skface
diff --git a/tests/feat/featprism/O8 b/tests/feat/featprism/O8
index e5dd23b940..445b9229ef 100644
--- a/tests/feat/featprism/O8
+++ b/tests/feat/featprism/O8
@@ -1,8 +1,8 @@
 # Original bug : cts20077
 # Date : 25 Nov 98
 
-restore cts20077_base.brep base
-restore cts20077_face.brep cont
+restore [locate_data_file cts20077_base.brep] base
+restore [locate_data_file cts20077_face.brep] cont
 
 explode base face
 copy base_5 skface
diff --git a/tests/feat/featprism/O9 b/tests/feat/featprism/O9
index 29b176130f..f5339b32b9 100644
--- a/tests/feat/featprism/O9
+++ b/tests/feat/featprism/O9
@@ -1,8 +1,8 @@
 # Original bug : cts20088
 # Date : 25 Nov 98
 
-restore cts20088_base.brep base
-restore cts20088_face.brep cont
+restore [locate_data_file cts20088_base.brep] base
+restore [locate_data_file cts20088_face.brep] cont
 
 explode base face
 copy base_54 ffrom
diff --git a/tests/feat/featprism/R1 b/tests/feat/featprism/R1
index 6bddbbdd98..e220236a4b 100644
--- a/tests/feat/featprism/R1
+++ b/tests/feat/featprism/R1
@@ -1,8 +1,8 @@
 # Original bug : pro16769
 # Date : 02 Dec 98
 
-restore pro16769_base.brep base
-restore pro16769_face.brep cont
+restore [locate_data_file pro16769_base.brep] base
+restore [locate_data_file pro16769_face.brep] cont
 
 explode base face
 
diff --git a/tests/feat/featprism/R2 b/tests/feat/featprism/R2
index 02f5d82d43..2357708b24 100644
--- a/tests/feat/featprism/R2
+++ b/tests/feat/featprism/R2
@@ -1,7 +1,7 @@
 # Original bug : pro16810
 # Date : 07 Dec 98
 
-restore pro16810_base.brep base
+restore [locate_data_file pro16810_base.brep] base
 
 circle cercle 0 0 0 0 0 1 10
 mkedge edge cercle
diff --git a/tests/feat/featprism/R4 b/tests/feat/featprism/R4
index 67d8ff289d..953765aa69 100644
--- a/tests/feat/featprism/R4
+++ b/tests/feat/featprism/R4
@@ -1,6 +1,6 @@
-restore shape.rle s
+restore [locate_data_file shape.rle] s
 explode s f
-restore wire.rle w
+restore [locate_data_file wire.rle] w
 mkplane w w
 
 featprism s w w 0 1 0 1 1
diff --git a/tests/feat/featprism/R5 b/tests/feat/featprism/R5
index 446bbc6af3..8acd174ca7 100644
--- a/tests/feat/featprism/R5
+++ b/tests/feat/featprism/R5
@@ -1,6 +1,6 @@
-restore shape.rle s
+restore [locate_data_file shape.rle] s
 explode s f
-restore wire.rle w
+restore [locate_data_file wire.rle] w
 mkplane w w
 
 featprism s w w 0 1 0 1 1
diff --git a/tests/feat/featprism/R6 b/tests/feat/featprism/R6
index 8ea3888b0d..59eecff03d 100644
--- a/tests/feat/featprism/R6
+++ b/tests/feat/featprism/R6
@@ -1,5 +1,5 @@
-restore osa-shape a
-restore osa-contour b
+restore [locate_data_file osa-shape] a
+restore [locate_data_file osa-contour] b
 mkplane f b
 
 featprism a f f 1 0 0 0 1
diff --git a/tests/feat/featprism/R9 b/tests/feat/featprism/R9
index fa53e1c5cd..a6fe4a2819 100644
--- a/tests/feat/featprism/R9
+++ b/tests/feat/featprism/R9
@@ -1,8 +1,8 @@
 # Original bug : spo0139
 # Date : 12June98
 
-restore spo0139a.rle a 
-restore spo0139b.rle b
+restore [locate_data_file spo0139a.rle] a 
+restore [locate_data_file spo0139b.rle] b
 
 featprism b a a 0 1 0 0 1
 featperform prism result
diff --git a/tests/feat/featprism/S1 b/tests/feat/featprism/S1
index 65edc3f4f3..6472b89074 100644
--- a/tests/feat/featprism/S1
+++ b/tests/feat/featprism/S1
@@ -1,7 +1,7 @@
 # cts20088
 
-restore shape_pkv.rle base
-restore contour_pkv.rle cont
+restore [locate_data_file shape_pkv.rle] base
+restore [locate_data_file contour_pkv.rle] cont
 
 explode base face
 copy base_54 ffrom
diff --git a/tests/feat/featprism/S2 b/tests/feat/featprism/S2
index beebdb7dc6..c4fe16e7d1 100644
--- a/tests/feat/featprism/S2
+++ b/tests/feat/featprism/S2
@@ -1,7 +1,7 @@
 # cts20088
 
-restore shape_pkv.rle base
-restore contour_pkv.rle cont
+restore [locate_data_file shape_pkv.rle] base
+restore [locate_data_file contour_pkv.rle] cont
 
 explode base face
 
diff --git a/tests/feat/featrevol/A6 b/tests/feat/featrevol/A6
index 5043eb557d..c005c5ecd1 100644
--- a/tests/feat/featrevol/A6
+++ b/tests/feat/featrevol/A6
@@ -1,8 +1,8 @@
 # Original bug : pro15515
 # Date : 12 Oct 98
 
-restore pro15515_base.rle base
-restore pro15515_face.rle cont
+restore [locate_data_file pro15515_base.rle] base
+restore [locate_data_file pro15515_face.rle] cont
 
 explode base face
 copy base_4 ffrom
diff --git a/tests/feat/featrevol/A7 b/tests/feat/featrevol/A7
index 332174e9dd..2b7d61fa61 100644
--- a/tests/feat/featrevol/A7
+++ b/tests/feat/featrevol/A7
@@ -1,8 +1,8 @@
 # Original bug : fra61146
 # Date : 25 Nov 98
 
-restore fra61146_base.brep base
-restore fra61146_face.brep cont
+restore [locate_data_file fra61146_base.brep] base
+restore [locate_data_file fra61146_face.brep] cont
 
 featrevol base cont cont 200 0 200 1 0 0 1 1
 featperformval revol result 180
diff --git a/tests/feat/featrevol/A8 b/tests/feat/featrevol/A8
index 037b7435fb..b23f985623 100644
--- a/tests/feat/featrevol/A8
+++ b/tests/feat/featrevol/A8
@@ -1,8 +1,8 @@
 # Original bug : pro13402
 # Date : 25 Nov 98
 
-restore pro13402_base.brep base
-restore pro13402_face.brep cont
+restore [locate_data_file pro13402_base.brep] base
+restore [locate_data_file pro13402_face.brep] cont
 
 explode base face
 copy base_2 funtil
diff --git a/tests/feat/featrevol/A9 b/tests/feat/featrevol/A9
index a5be07b418..e8eb0b4c56 100644
--- a/tests/feat/featrevol/A9
+++ b/tests/feat/featrevol/A9
@@ -1,8 +1,8 @@
 # Original bug : pro13403
 # Date : 25 Nov 98
 
-restore pro13403_base.brep base
-restore pro13403_face.brep cont
+restore [locate_data_file pro13403_base.brep] base
+restore [locate_data_file pro13403_face.brep] cont
 
 explode base face
 copy base_2 funtil
diff --git a/tests/feat/featrevol/B6 b/tests/feat/featrevol/B6
index d4346de0ed..da58ee1126 100644
--- a/tests/feat/featrevol/B6
+++ b/tests/feat/featrevol/B6
@@ -1,8 +1,8 @@
 # Original bug : pro16120
 # Date :  2 Feb 99
 
-restore pro16120_base.brep base
-restore pro16120_face.brep cont
+restore [locate_data_file pro16120_base.brep] base
+restore [locate_data_file pro16120_face.brep] cont
 
 featrevol base cont cont 200 0 200 0 1 0 1 1
 featperformval revol result 280
diff --git a/tests/feat/featrevol/B7 b/tests/feat/featrevol/B7
index 945f334be5..cf95c04307 100644
--- a/tests/feat/featrevol/B7
+++ b/tests/feat/featrevol/B7
@@ -1,8 +1,8 @@
 # Original bug : pro16290
 # Date : 12 Nov 98
 
-restore pro16290_base.rle base
-restore pro16290_face.rle cont
+restore [locate_data_file pro16290_base.rle] base
+restore [locate_data_file pro16290_face.rle] cont
 
 explode base face
 copy base_7 funtil
diff --git a/tests/feat/featrevol/B8 b/tests/feat/featrevol/B8
index a69f36f1f2..c59a003b6a 100644
--- a/tests/feat/featrevol/B8
+++ b/tests/feat/featrevol/B8
@@ -1,8 +1,8 @@
 # Original bug : pro16290
 # Date : 12 Nov 98
 
-restore pro16290_base.rle base
-restore pro16290_face.rle cont
+restore [locate_data_file pro16290_base.rle] base
+restore [locate_data_file pro16290_face.rle] cont
 
 explode base face
 copy base_7 funtil
diff --git a/tests/feat/featrevol/J6 b/tests/feat/featrevol/J6
index 373bb621f6..5d95da7464 100644
--- a/tests/feat/featrevol/J6
+++ b/tests/feat/featrevol/J6
@@ -1,5 +1,5 @@
-restore revshape.rle base
-restore revcontour.rle cont
+restore [locate_data_file revshape.rle] base
+restore [locate_data_file revcontour.rle] cont
 
 explode base face
 copy base_4 ffrom
diff --git a/tests/feat/featrevol/J7 b/tests/feat/featrevol/J7
index df033e7f86..546e18456e 100644
--- a/tests/feat/featrevol/J7
+++ b/tests/feat/featrevol/J7
@@ -1,5 +1,5 @@
-restore revshape.rle base
-restore revcontour.rle cont
+restore [locate_data_file revshape.rle] base
+restore [locate_data_file revcontour.rle] cont
 
 explode base face
 copy base_3 ffrom
diff --git a/tests/feat/featrevol/J8 b/tests/feat/featrevol/J8
index 7269ce4373..1e3556b26a 100644
--- a/tests/feat/featrevol/J8
+++ b/tests/feat/featrevol/J8
@@ -1,5 +1,5 @@
-restore revshape.rle base
-restore revcontour.rle cont
+restore [locate_data_file revshape.rle] base
+restore [locate_data_file revcontour.rle] cont
 
 explode base face
 copy base_3 ffrom
diff --git a/tests/feat/featrevol/J9 b/tests/feat/featrevol/J9
index 57f77f719d..3db51ccc9d 100644
--- a/tests/feat/featrevol/J9
+++ b/tests/feat/featrevol/J9
@@ -1,5 +1,5 @@
-restore revshape.rle base
-restore revcontour.rle cont
+restore [locate_data_file revshape.rle] base
+restore [locate_data_file revcontour.rle] cont
 
 explode base face
 copy base_3 ffrom
diff --git a/tests/heal/begin b/tests/heal/begin
index 6fe3ce9059..3d7d8e1ce3 100755
--- a/tests/heal/begin
+++ b/tests/heal/begin
@@ -7,10 +7,6 @@ if { [array get Draw_Groups "Shape Healing"] == "" } {
 # To prevent loops limit to 5 minutes
 cpulimit 300
 
-if {[string compare [datadir] "."] == 0} { 
-   datadir [file dirname [info script]]/data
-}
-
 if { [info exists imagedir] == 0 } {
    set imagedir .
 }
diff --git a/tests/heal/direct_faces/A1 b/tests/heal/direct_faces/A1
index 4ebe19b5c7..f8ddb7294d 100644
--- a/tests/heal/direct_faces/A1
+++ b/tests/heal/direct_faces/A1
@@ -1 +1 @@
-restore BUC60393.rle a
+restore [locate_data_file BUC60393.rle] a
diff --git a/tests/heal/direct_faces/A2 b/tests/heal/direct_faces/A2
index 4406e63848..4ed515b1cd 100644
--- a/tests/heal/direct_faces/A2
+++ b/tests/heal/direct_faces/A2
@@ -1 +1 @@
-restore CCV_2_e1_gsx.rle a
+restore [locate_data_file CCV_2_e1_gsx.rle] a
diff --git a/tests/heal/direct_faces/A3 b/tests/heal/direct_faces/A3
index 6b12ae0f3b..eec5e0c3c3 100644
--- a/tests/heal/direct_faces/A3
+++ b/tests/heal/direct_faces/A3
@@ -1 +1 @@
-restore CFE901_cts21gft.rle a
+restore [locate_data_file CFE901_cts21gft.rle] a
diff --git a/tests/heal/direct_faces/A4 b/tests/heal/direct_faces/A4
index 71bd72900e..00aac4f85f 100644
--- a/tests/heal/direct_faces/A4
+++ b/tests/heal/direct_faces/A4
@@ -1 +1 @@
-restore CFI_ger60656.rle a
+restore [locate_data_file CFI_ger60656.rle] a
diff --git a/tests/heal/direct_faces/A5 b/tests/heal/direct_faces/A5
index 99c16f8ff0..85817a2321 100644
--- a/tests/heal/direct_faces/A5
+++ b/tests/heal/direct_faces/A5
@@ -1 +1 @@
-restore CHE_cc4.rle a
+restore [locate_data_file CHE_cc4.rle] a
diff --git a/tests/heal/direct_faces/A6 b/tests/heal/direct_faces/A6
index eaf8505d11..8be3122652 100644
--- a/tests/heal/direct_faces/A6
+++ b/tests/heal/direct_faces/A6
@@ -1 +1 @@
-restore CIN001_b50.rle a
+restore [locate_data_file CIN001_b50.rle] a
diff --git a/tests/heal/direct_faces/A7 b/tests/heal/direct_faces/A7
index aec4145eed..7f5a98819b 100644
--- a/tests/heal/direct_faces/A7
+++ b/tests/heal/direct_faces/A7
@@ -1 +1 @@
-restore CIN001_b51.rle a
+restore [locate_data_file CIN001_b51.rle] a
diff --git a/tests/heal/direct_faces/A8 b/tests/heal/direct_faces/A8
index 0d142918eb..944d6e14f2 100644
--- a/tests/heal/direct_faces/A8
+++ b/tests/heal/direct_faces/A8
@@ -1 +1 @@
-restore CTO900_cts18078-part.rle a
+restore [locate_data_file CTO900_cts18078-part.rle] a
diff --git a/tests/heal/direct_faces/A9 b/tests/heal/direct_faces/A9
index c730b337d5..37a1ea83d0 100644
--- a/tests/heal/direct_faces/A9
+++ b/tests/heal/direct_faces/A9
@@ -1 +1 @@
-restore CTS18683.rle a
+restore [locate_data_file CTS18683.rle] a
diff --git a/tests/heal/direct_faces/B1 b/tests/heal/direct_faces/B1
index c64d98329f..dec066354b 100644
--- a/tests/heal/direct_faces/B1
+++ b/tests/heal/direct_faces/B1
@@ -1 +1 @@
-restore DF1.rle a
+restore [locate_data_file DF1.rle] a
diff --git a/tests/heal/direct_faces/B2 b/tests/heal/direct_faces/B2
index 4b16e4fe66..ec22b0484f 100644
--- a/tests/heal/direct_faces/B2
+++ b/tests/heal/direct_faces/B2
@@ -1 +1 @@
-restore DF2.rle a
+restore [locate_data_file DF2.rle] a
diff --git a/tests/heal/direct_faces/B3 b/tests/heal/direct_faces/B3
index 2421df0a3d..b26ac37f23 100644
--- a/tests/heal/direct_faces/B3
+++ b/tests/heal/direct_faces/B3
@@ -1 +1 @@
-restore DF3.rle a
+restore [locate_data_file DF3.rle] a
diff --git a/tests/heal/direct_faces/B4 b/tests/heal/direct_faces/B4
index d3eeaddcca..b1459a1e8f 100644
--- a/tests/heal/direct_faces/B4
+++ b/tests/heal/direct_faces/B4
@@ -1 +1 @@
-restore DF4.rle a
+restore [locate_data_file DF4.rle] a
diff --git a/tests/heal/direct_faces/B5 b/tests/heal/direct_faces/B5
index d911fc5952..8f5237f600 100644
--- a/tests/heal/direct_faces/B5
+++ b/tests/heal/direct_faces/B5
@@ -1 +1 @@
-restore neizvestnoeDSE.rle a
+restore [locate_data_file neizvestnoeDSE.rle] a
diff --git a/tests/heal/direct_faces/B6 b/tests/heal/direct_faces/B6
index b1b6f7ab23..f1b427765d 100644
--- a/tests/heal/direct_faces/B6
+++ b/tests/heal/direct_faces/B6
@@ -1 +1 @@
-restore PRO10066.rle a
+restore [locate_data_file PRO10066.rle] a
diff --git a/tests/heal/direct_faces/B7 b/tests/heal/direct_faces/B7
index e9b2ba85af..6ad9e4286c 100644
--- a/tests/heal/direct_faces/B7
+++ b/tests/heal/direct_faces/B7
@@ -1 +1 @@
-restore revface.rle a
+restore [locate_data_file revface.rle] a
diff --git a/tests/heal/direct_faces/B8 b/tests/heal/direct_faces/B8
index 15d1147d22..d6574d0f8e 100644
--- a/tests/heal/direct_faces/B8
+++ b/tests/heal/direct_faces/B8
@@ -1 +1 @@
-restore shljapa.rle a
+restore [locate_data_file shljapa.rle] a
diff --git a/tests/heal/drop_small_edges/A1 b/tests/heal/drop_small_edges/A1
index b769ef35e5..dfa064dcc2 100644
--- a/tests/heal/drop_small_edges/A1
+++ b/tests/heal/drop_small_edges/A1
@@ -1 +1 @@
-restore CFE901_cts21gft.rle  a
+restore [locate_data_file CFE901_cts21gft.rle]  a
diff --git a/tests/heal/drop_small_edges/A2 b/tests/heal/drop_small_edges/A2
index fa2cf3a2d2..7799fbc318 100644
--- a/tests/heal/drop_small_edges/A2
+++ b/tests/heal/drop_small_edges/A2
@@ -1 +1 @@
-restore CFI_pro12305.rle a
+restore [locate_data_file CFI_pro12305.rle] a
diff --git a/tests/heal/drop_small_edges/A3 b/tests/heal/drop_small_edges/A3
index 9fb3c1cb5b..d7bb87c80d 100644
--- a/tests/heal/drop_small_edges/A3
+++ b/tests/heal/drop_small_edges/A3
@@ -1 +1 @@
-restore CHE_friteioa.rle  a
+restore [locate_data_file CHE_friteioa.rle]  a
diff --git a/tests/heal/drop_small_edges/A4 b/tests/heal/drop_small_edges/A4
index d38a898567..212b3c39d2 100644
--- a/tests/heal/drop_small_edges/A4
+++ b/tests/heal/drop_small_edges/A4
@@ -1,2 +1,2 @@
 puts "TODO OCC23127 ALL: Error : result shape is not done"
-restore DSE3.rle a
+restore [locate_data_file DSE3.rle] a
diff --git a/tests/heal/drop_small_edges/A5 b/tests/heal/drop_small_edges/A5
index 9dc3ba62d9..28bee47700 100644
--- a/tests/heal/drop_small_edges/A5
+++ b/tests/heal/drop_small_edges/A5
@@ -1 +1 @@
-restore ForDSE.rle a
+restore [locate_data_file ForDSE.rle] a
diff --git a/tests/heal/elementary_to_revolution/A1 b/tests/heal/elementary_to_revolution/A1
index 7c9d98e945..5138266ad6 100644
--- a/tests/heal/elementary_to_revolution/A1
+++ b/tests/heal/elementary_to_revolution/A1
@@ -1,2 +1,2 @@
-restore DSE3.rle a
+restore [locate_data_file DSE3.rle] a
 set nb_revol 4
diff --git a/tests/heal/elementary_to_revolution/A2 b/tests/heal/elementary_to_revolution/A2
index 2626669901..82a1403d95 100644
--- a/tests/heal/elementary_to_revolution/A2
+++ b/tests/heal/elementary_to_revolution/A2
@@ -1,2 +1,2 @@
-restore coneETR.rle a
+restore [locate_data_file coneETR.rle] a
 set nb_revol 1
diff --git a/tests/heal/elementary_to_revolution/A3 b/tests/heal/elementary_to_revolution/A3
index cd48cd8df3..552d15fa21 100644
--- a/tests/heal/elementary_to_revolution/A3
+++ b/tests/heal/elementary_to_revolution/A3
@@ -1,2 +1,2 @@
-restore sphereETR.rle a
+restore [locate_data_file sphereETR.rle] a
 set nb_revol 1
diff --git a/tests/heal/elementary_to_revolution/A4 b/tests/heal/elementary_to_revolution/A4
index e94f61bf2d..fb17dfdc0b 100644
--- a/tests/heal/elementary_to_revolution/A4
+++ b/tests/heal/elementary_to_revolution/A4
@@ -1,2 +1,2 @@
-restore cylinderETR.rle a
+restore [locate_data_file cylinderETR.rle] a
 set nb_revol 1
diff --git a/tests/heal/elementary_to_revolution/A5 b/tests/heal/elementary_to_revolution/A5
index d71da6af62..377f4b8437 100644
--- a/tests/heal/elementary_to_revolution/A5
+++ b/tests/heal/elementary_to_revolution/A5
@@ -1,2 +1,2 @@
-restore torusETR.rle a
+restore [locate_data_file torusETR.rle] a
 set nb_revol 1
diff --git a/tests/heal/fix_face_size/A1 b/tests/heal/fix_face_size/A1
index dfd9758c5b..d5f8a969fc 100644
--- a/tests/heal/fix_face_size/A1
+++ b/tests/heal/fix_face_size/A1
@@ -1 +1 @@
-restore CCH_coco1.rle a
+restore [locate_data_file CCH_coco1.rle] a
diff --git a/tests/heal/fix_face_size/A2 b/tests/heal/fix_face_size/A2
index d9edcaa23e..61864fb4d8 100644
--- a/tests/heal/fix_face_size/A2
+++ b/tests/heal/fix_face_size/A2
@@ -1 +1 @@
-restore CCV_2_i1_gtb.rle a
+restore [locate_data_file CCV_2_i1_gtb.rle] a
diff --git a/tests/heal/fix_face_size/A3 b/tests/heal/fix_face_size/A3
index 856d8f5792..cb13f98d9d 100644
--- a/tests/heal/fix_face_size/A3
+++ b/tests/heal/fix_face_size/A3
@@ -1 +1 @@
-restore CFE900_ger50gdb.rle a
+restore [locate_data_file CFE900_ger50gdb.rle] a
diff --git a/tests/heal/fix_face_size/A4 b/tests/heal/fix_face_size/A4
index 46b9927031..44b244ac2b 100644
--- a/tests/heal/fix_face_size/A4
+++ b/tests/heal/fix_face_size/A4
@@ -1 +1 @@
-restore CFI_5_l12fgq.rle a
+restore [locate_data_file CFI_5_l12fgq.rle] a
diff --git a/tests/heal/fix_face_size/A5 b/tests/heal/fix_face_size/A5
index e90f1dcce0..00f9fd556f 100644
--- a/tests/heal/fix_face_size/A5
+++ b/tests/heal/fix_face_size/A5
@@ -1 +1 @@
-restore CFI_pro9480.rle a
+restore [locate_data_file CFI_pro9480.rle] a
diff --git a/tests/heal/fix_face_size/A6 b/tests/heal/fix_face_size/A6
index 3ca4d98502..672ee3660a 100644
--- a/tests/heal/fix_face_size/A6
+++ b/tests/heal/fix_face_size/A6
@@ -1 +1 @@
-restore CHE_friteioa.rle a
+restore [locate_data_file CHE_friteioa.rle] a
diff --git a/tests/heal/fix_face_size/A7 b/tests/heal/fix_face_size/A7
index 0babbb756e..f38eac8f28 100644
--- a/tests/heal/fix_face_size/A7
+++ b/tests/heal/fix_face_size/A7
@@ -1 +1 @@
-restore CIN001_a13.rle a
+restore [locate_data_file CIN001_a13.rle] a
diff --git a/tests/heal/fix_face_size/A8 b/tests/heal/fix_face_size/A8
index be04fecd3b..f9b19f5c7e 100644
--- a/tests/heal/fix_face_size/A8
+++ b/tests/heal/fix_face_size/A8
@@ -1 +1 @@
-restore CIN001_b49.rle a
+restore [locate_data_file CIN001_b49.rle] a
diff --git a/tests/heal/fix_face_size/A9 b/tests/heal/fix_face_size/A9
index d14ea9806d..0473cbe86d 100644
--- a/tests/heal/fix_face_size/A9
+++ b/tests/heal/fix_face_size/A9
@@ -1 +1 @@
-restore CIN001_b62.rle a
+restore [locate_data_file CIN001_b62.rle] a
diff --git a/tests/heal/fix_face_size/B1 b/tests/heal/fix_face_size/B1
index be071154ed..271ce484b7 100644
--- a/tests/heal/fix_face_size/B1
+++ b/tests/heal/fix_face_size/B1
@@ -1 +1 @@
-restore CNP002_projoieq.rle a
+restore [locate_data_file CNP002_projoieq.rle] a
diff --git a/tests/heal/fix_face_size/B2 b/tests/heal/fix_face_size/B2
index 78b7c78cd5..116844c0d6 100644
--- a/tests/heal/fix_face_size/B2
+++ b/tests/heal/fix_face_size/B2
@@ -1 +1 @@
-restore CTO900_buc60127-part.rle a
+restore [locate_data_file CTO900_buc60127-part.rle] a
diff --git a/tests/heal/fix_face_size/B3 b/tests/heal/fix_face_size/B3
index d50e52b418..45bf4ca990 100644
--- a/tests/heal/fix_face_size/B3
+++ b/tests/heal/fix_face_size/B3
@@ -1 +1 @@
-restore CTO900_cts60005a.rle a
+restore [locate_data_file CTO900_cts60005a.rle] a
diff --git a/tests/heal/fix_face_size/B4 b/tests/heal/fix_face_size/B4
index 03d0c0688a..f5c9aede6e 100644
--- a/tests/heal/fix_face_size/B4
+++ b/tests/heal/fix_face_size/B4
@@ -1 +1 @@
-restore CTO900_pro5363c.rle a
+restore [locate_data_file CTO900_pro5363c.rle] a
diff --git a/tests/heal/fix_face_size/B5 b/tests/heal/fix_face_size/B5
index c730b337d5..37a1ea83d0 100644
--- a/tests/heal/fix_face_size/B5
+++ b/tests/heal/fix_face_size/B5
@@ -1 +1 @@
-restore CTS18683.rle a
+restore [locate_data_file CTS18683.rle] a
diff --git a/tests/heal/fix_face_size/B6 b/tests/heal/fix_face_size/B6
index 66217f59a3..de2a8d1dd9 100644
--- a/tests/heal/fix_face_size/B6
+++ b/tests/heal/fix_face_size/B6
@@ -1 +1 @@
-restore CTS18826.rle a
+restore [locate_data_file CTS18826.rle] a
diff --git a/tests/heal/fix_face_size/B7 b/tests/heal/fix_face_size/B7
index b1b6f7ab23..f1b427765d 100644
--- a/tests/heal/fix_face_size/B7
+++ b/tests/heal/fix_face_size/B7
@@ -1 +1 @@
-restore PRO10066.rle a
+restore [locate_data_file PRO10066.rle] a
diff --git a/tests/heal/fix_face_size/B8 b/tests/heal/fix_face_size/B8
index 8eabad0cce..f6eca858f5 100644
--- a/tests/heal/fix_face_size/B8
+++ b/tests/heal/fix_face_size/B8
@@ -1 +1 @@
-restore aaa.rle a
+restore [locate_data_file aaa.rle] a
diff --git a/tests/heal/fix_face_size/B9 b/tests/heal/fix_face_size/B9
index a5dfa4b9fe..5acd96432c 100644
--- a/tests/heal/fix_face_size/B9
+++ b/tests/heal/fix_face_size/B9
@@ -1 +1 @@
-restore face.rle a
+restore [locate_data_file face.rle] a
diff --git a/tests/heal/fix_face_size/C1 b/tests/heal/fix_face_size/C1
index 2cd7ae2d4f..e884d85805 100644
--- a/tests/heal/fix_face_size/C1
+++ b/tests/heal/fix_face_size/C1
@@ -1,4 +1,4 @@
 if { [info exists bug23197] == 0 || $bug23197 == 0 } {
     puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_2"
 }
-restore rrr.rle a
+restore [locate_data_file rrr.rle] a
diff --git a/tests/heal/fix_face_size/C2 b/tests/heal/fix_face_size/C2
index 5fa2fa879b..703960a987 100644
--- a/tests/heal/fix_face_size/C2
+++ b/tests/heal/fix_face_size/C2
@@ -1 +1 @@
-restore sh.rle a
+restore [locate_data_file sh.rle] a
diff --git a/tests/heal/fix_gaps/A1 b/tests/heal/fix_gaps/A1
index a13c97e2dd..8141ff8ae0 100644
--- a/tests/heal/fix_gaps/A1
+++ b/tests/heal/fix_gaps/A1
@@ -1 +1 @@
-restore CFI_cfi90fjb.rle a
+restore [locate_data_file CFI_cfi90fjb.rle] a
diff --git a/tests/heal/fix_gaps/A2 b/tests/heal/fix_gaps/A2
index fa2cf3a2d2..7799fbc318 100644
--- a/tests/heal/fix_gaps/A2
+++ b/tests/heal/fix_gaps/A2
@@ -1 +1 @@
-restore CFI_pro12305.rle a
+restore [locate_data_file CFI_pro12305.rle] a
diff --git a/tests/heal/fix_gaps/A3 b/tests/heal/fix_gaps/A3
index e6c3c0c20c..4b4421c99e 100644
--- a/tests/heal/fix_gaps/A3
+++ b/tests/heal/fix_gaps/A3
@@ -1 +1 @@
-restore CFI_pro5807.rle a
+restore [locate_data_file CFI_pro5807.rle] a
diff --git a/tests/heal/fix_gaps/A4 b/tests/heal/fix_gaps/A4
index d50e52b418..45bf4ca990 100644
--- a/tests/heal/fix_gaps/A4
+++ b/tests/heal/fix_gaps/A4
@@ -1 +1 @@
-restore CTO900_cts60005a.rle a
+restore [locate_data_file CTO900_cts60005a.rle] a
diff --git a/tests/heal/fix_gaps/A5 b/tests/heal/fix_gaps/A5
index 7854f28a5f..781dc13ec7 100644
--- a/tests/heal/fix_gaps/A5
+++ b/tests/heal/fix_gaps/A5
@@ -1 +1 @@
-restore CTO900_ger60039a.rle a
+restore [locate_data_file CTO900_ger60039a.rle] a
diff --git a/tests/heal/fix_gaps/A6 b/tests/heal/fix_gaps/A6
index 6bd2c606d8..80e27313b2 100644
--- a/tests/heal/fix_gaps/A6
+++ b/tests/heal/fix_gaps/A6
@@ -1 +1 @@
-restore CTO900_ger60041a.rle a
+restore [locate_data_file CTO900_ger60041a.rle] a
diff --git a/tests/heal/fix_gaps/A7 b/tests/heal/fix_gaps/A7
index 0d03c5fe3e..3a56303df6 100644
--- a/tests/heal/fix_gaps/A7
+++ b/tests/heal/fix_gaps/A7
@@ -1 +1 @@
-restore CTO900_ger60054a.rle a
+restore [locate_data_file CTO900_ger60054a.rle] a
diff --git a/tests/heal/fix_gaps/A8 b/tests/heal/fix_gaps/A8
index c730b337d5..37a1ea83d0 100644
--- a/tests/heal/fix_gaps/A8
+++ b/tests/heal/fix_gaps/A8
@@ -1 +1 @@
-restore CTS18683.rle a
+restore [locate_data_file CTS18683.rle] a
diff --git a/tests/heal/fix_gaps/A9 b/tests/heal/fix_gaps/A9
index 1efe381812..4968d571af 100644
--- a/tests/heal/fix_gaps/A9
+++ b/tests/heal/fix_gaps/A9
@@ -1 +1 @@
-restore CTS18868-2.rle a
+restore [locate_data_file CTS18868-2.rle] a
diff --git a/tests/heal/fix_gaps/B1 b/tests/heal/fix_gaps/B1
index 65622edd2b..569e427a5a 100644
--- a/tests/heal/fix_gaps/B1
+++ b/tests/heal/fix_gaps/B1
@@ -1 +1 @@
-restore FG200.rle a
+restore [locate_data_file FG200.rle] a
diff --git a/tests/heal/fix_gaps/B2 b/tests/heal/fix_gaps/B2
index 2667601065..af92437714 100644
--- a/tests/heal/fix_gaps/B2
+++ b/tests/heal/fix_gaps/B2
@@ -1 +1 @@
-restore boxFG.rle a
+restore [locate_data_file boxFG.rle] a
diff --git a/tests/heal/fix_gaps/B3 b/tests/heal/fix_gaps/B3
index 81ff69fd71..6eab13647e 100644
--- a/tests/heal/fix_gaps/B3
+++ b/tests/heal/fix_gaps/B3
@@ -1 +1 @@
-restore pcpc2_FS_FG.rle a
+restore [locate_data_file pcpc2_FS_FG.rle] a
diff --git a/tests/heal/fix_shape/A1 b/tests/heal/fix_shape/A1
index e8f7305e36..3c415fe9b0 100644
--- a/tests/heal/fix_shape/A1
+++ b/tests/heal/fix_shape/A1
@@ -1,2 +1,2 @@
 puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_1"
-restore aaa.rle a
+restore [locate_data_file aaa.rle] a
diff --git a/tests/heal/fix_shape/A2 b/tests/heal/fix_shape/A2
index dfd9758c5b..d5f8a969fc 100644
--- a/tests/heal/fix_shape/A2
+++ b/tests/heal/fix_shape/A2
@@ -1 +1 @@
-restore CCH_coco1.rle a
+restore [locate_data_file CCH_coco1.rle] a
diff --git a/tests/heal/fix_shape/A3 b/tests/heal/fix_shape/A3
index 1deece72b3..811a0ce57c 100644
--- a/tests/heal/fix_shape/A3
+++ b/tests/heal/fix_shape/A3
@@ -1 +1 @@
-restore CCH_testkhes.rle a
+restore [locate_data_file CCH_testkhes.rle] a
diff --git a/tests/heal/fix_shape/A4 b/tests/heal/fix_shape/A4
index d9edcaa23e..61864fb4d8 100644
--- a/tests/heal/fix_shape/A4
+++ b/tests/heal/fix_shape/A4
@@ -1 +1 @@
-restore CCV_2_i1_gtb.rle a
+restore [locate_data_file CCV_2_i1_gtb.rle] a
diff --git a/tests/heal/fix_shape/A5 b/tests/heal/fix_shape/A5
index 856d8f5792..cb13f98d9d 100644
--- a/tests/heal/fix_shape/A5
+++ b/tests/heal/fix_shape/A5
@@ -1 +1 @@
-restore CFE900_ger50gdb.rle a
+restore [locate_data_file CFE900_ger50gdb.rle] a
diff --git a/tests/heal/fix_shape/A6 b/tests/heal/fix_shape/A6
index 6b12ae0f3b..eec5e0c3c3 100644
--- a/tests/heal/fix_shape/A6
+++ b/tests/heal/fix_shape/A6
@@ -1 +1 @@
-restore CFE901_cts21gft.rle a
+restore [locate_data_file CFE901_cts21gft.rle] a
diff --git a/tests/heal/fix_shape/A7 b/tests/heal/fix_shape/A7
index 09938d06b1..c54aa6e648 100644
--- a/tests/heal/fix_shape/A7
+++ b/tests/heal/fix_shape/A7
@@ -1 +1 @@
-restore CFE903_ger60ggw.rle a
+restore [locate_data_file CFE903_ger60ggw.rle] a
diff --git a/tests/heal/fix_shape/A8 b/tests/heal/fix_shape/A8
index 46b9927031..44b244ac2b 100644
--- a/tests/heal/fix_shape/A8
+++ b/tests/heal/fix_shape/A8
@@ -1 +1 @@
-restore CFI_5_l12fgq.rle a
+restore [locate_data_file CFI_5_l12fgq.rle] a
diff --git a/tests/heal/fix_shape/A9 b/tests/heal/fix_shape/A9
index 0b814a6b25..86c1ac62b1 100644
--- a/tests/heal/fix_shape/A9
+++ b/tests/heal/fix_shape/A9
@@ -1 +1 @@
-restore CFI_6_g56fhe.rle a
+restore [locate_data_file CFI_6_g56fhe.rle] a
diff --git a/tests/heal/fix_shape/B1 b/tests/heal/fix_shape/B1
index 3b8339947d..1b1b64cb5d 100644
--- a/tests/heal/fix_shape/B1
+++ b/tests/heal/fix_shape/B1
@@ -1 +1 @@
-restore CFI_8_i1_fia.rle a
+restore [locate_data_file CFI_8_i1_fia.rle] a
diff --git a/tests/heal/fix_shape/B2 b/tests/heal/fix_shape/B2
index a13c97e2dd..8141ff8ae0 100644
--- a/tests/heal/fix_shape/B2
+++ b/tests/heal/fix_shape/B2
@@ -1 +1 @@
-restore CFI_cfi90fjb.rle a
+restore [locate_data_file CFI_cfi90fjb.rle] a
diff --git a/tests/heal/fix_shape/B3 b/tests/heal/fix_shape/B3
index 9c974d0f1f..6a085b500b 100644
--- a/tests/heal/fix_shape/B3
+++ b/tests/heal/fix_shape/B3
@@ -1 +1 @@
-restore CFI_cts16288.rle a
+restore [locate_data_file CFI_cts16288.rle] a
diff --git a/tests/heal/fix_shape/B4 b/tests/heal/fix_shape/B4
index e1bd298fb7..89ca70f72d 100644
--- a/tests/heal/fix_shape/B4
+++ b/tests/heal/fix_shape/B4
@@ -1 +1 @@
-restore CFI_g1234fio.rle a
+restore [locate_data_file CFI_g1234fio.rle] a
diff --git a/tests/heal/fix_shape/B5 b/tests/heal/fix_shape/B5
index c44c4232f7..90f98a12c3 100644
--- a/tests/heal/fix_shape/B5
+++ b/tests/heal/fix_shape/B5
@@ -1 +1 @@
-restore CFI_g5678fip.rle a
+restore [locate_data_file CFI_g5678fip.rle] a
diff --git a/tests/heal/fix_shape/B6 b/tests/heal/fix_shape/B6
index ce9f7107bb..208cb65cf2 100644
--- a/tests/heal/fix_shape/B6
+++ b/tests/heal/fix_shape/B6
@@ -1 +1 @@
-restore CFI_n12__fiw.rle a
+restore [locate_data_file CFI_n12__fiw.rle] a
diff --git a/tests/heal/fix_shape/B7 b/tests/heal/fix_shape/B7
index 0a7b6da66b..b388ff189c 100644
--- a/tests/heal/fix_shape/B7
+++ b/tests/heal/fix_shape/B7
@@ -1 +1 @@
-restore CFI_o12__fix.rle a
+restore [locate_data_file CFI_o12__fix.rle] a
diff --git a/tests/heal/fix_shape/B8 b/tests/heal/fix_shape/B8
index fa2cf3a2d2..7799fbc318 100644
--- a/tests/heal/fix_shape/B8
+++ b/tests/heal/fix_shape/B8
@@ -1 +1 @@
-restore CFI_pro12305.rle a
+restore [locate_data_file CFI_pro12305.rle] a
diff --git a/tests/heal/fix_shape/B9 b/tests/heal/fix_shape/B9
index d683dc8f9e..c3577cef32 100644
--- a/tests/heal/fix_shape/B9
+++ b/tests/heal/fix_shape/B9
@@ -1 +1 @@
-restore CFI_pro12832.rle a
+restore [locate_data_file CFI_pro12832.rle] a
diff --git a/tests/heal/fix_shape/C1 b/tests/heal/fix_shape/C1
index c6ab5d2bad..7c510c3867 100644
--- a/tests/heal/fix_shape/C1
+++ b/tests/heal/fix_shape/C1
@@ -1 +1 @@
-restore CFI_pro14fjq.rle a
+restore [locate_data_file CFI_pro14fjq.rle] a
diff --git a/tests/heal/fix_shape/C2 b/tests/heal/fix_shape/C2
index e6c3c0c20c..4b4421c99e 100644
--- a/tests/heal/fix_shape/C2
+++ b/tests/heal/fix_shape/C2
@@ -1 +1 @@
-restore CFI_pro5807.rle a
+restore [locate_data_file CFI_pro5807.rle] a
diff --git a/tests/heal/fix_shape/C3 b/tests/heal/fix_shape/C3
index e90f1dcce0..00f9fd556f 100644
--- a/tests/heal/fix_shape/C3
+++ b/tests/heal/fix_shape/C3
@@ -1 +1 @@
-restore CFI_pro9480.rle a
+restore [locate_data_file CFI_pro9480.rle] a
diff --git a/tests/heal/fix_shape/C4 b/tests/heal/fix_shape/C4
index 99c16f8ff0..85817a2321 100644
--- a/tests/heal/fix_shape/C4
+++ b/tests/heal/fix_shape/C4
@@ -1 +1 @@
-restore CHE_cc4.rle a
+restore [locate_data_file CHE_cc4.rle] a
diff --git a/tests/heal/fix_shape/C5 b/tests/heal/fix_shape/C5
index 3ca4d98502..672ee3660a 100644
--- a/tests/heal/fix_shape/C5
+++ b/tests/heal/fix_shape/C5
@@ -1 +1 @@
-restore CHE_friteioa.rle a
+restore [locate_data_file CHE_friteioa.rle] a
diff --git a/tests/heal/fix_shape/C6 b/tests/heal/fix_shape/C6
index 0babbb756e..f38eac8f28 100644
--- a/tests/heal/fix_shape/C6
+++ b/tests/heal/fix_shape/C6
@@ -1 +1 @@
-restore CIN001_a13.rle a
+restore [locate_data_file CIN001_a13.rle] a
diff --git a/tests/heal/fix_shape/C7 b/tests/heal/fix_shape/C7
index 907b3392bf..e90f05f7d3 100644
--- a/tests/heal/fix_shape/C7
+++ b/tests/heal/fix_shape/C7
@@ -1 +1 @@
-restore CIN001_a14.rle a
+restore [locate_data_file CIN001_a14.rle] a
diff --git a/tests/heal/fix_shape/C8 b/tests/heal/fix_shape/C8
index 074b79924c..ff799eee7d 100644
--- a/tests/heal/fix_shape/C8
+++ b/tests/heal/fix_shape/C8
@@ -1 +1 @@
-restore CIN001_a49.rle a
+restore [locate_data_file CIN001_a49.rle] a
diff --git a/tests/heal/fix_shape/C9 b/tests/heal/fix_shape/C9
index a0a426cce4..f2aa73ccd5 100644
--- a/tests/heal/fix_shape/C9
+++ b/tests/heal/fix_shape/C9
@@ -1 +1 @@
-restore CIN001_a51.rle a
+restore [locate_data_file CIN001_a51.rle] a
diff --git a/tests/heal/fix_shape/D1 b/tests/heal/fix_shape/D1
index ac868d8c8a..9a1033e3f4 100644
--- a/tests/heal/fix_shape/D1
+++ b/tests/heal/fix_shape/D1
@@ -1 +1 @@
-restore CIN001_a62.rle a
+restore [locate_data_file CIN001_a62.rle] a
diff --git a/tests/heal/fix_shape/D2 b/tests/heal/fix_shape/D2
index 0dd3b82d64..7becabd7cb 100644
--- a/tests/heal/fix_shape/D2
+++ b/tests/heal/fix_shape/D2
@@ -1 +1 @@
-restore CIN001_a64.rle a
+restore [locate_data_file CIN001_a64.rle] a
diff --git a/tests/heal/fix_shape/D3 b/tests/heal/fix_shape/D3
index 17e627bdfd..900ea4bc34 100644
--- a/tests/heal/fix_shape/D3
+++ b/tests/heal/fix_shape/D3
@@ -1 +1 @@
-restore CIN001_a70.rle a
+restore [locate_data_file CIN001_a70.rle] a
diff --git a/tests/heal/fix_shape/D4 b/tests/heal/fix_shape/D4
index d77a48912b..32f7d62c71 100644
--- a/tests/heal/fix_shape/D4
+++ b/tests/heal/fix_shape/D4
@@ -1 +1 @@
-restore CIN001_b13.rle a
+restore [locate_data_file CIN001_b13.rle] a
diff --git a/tests/heal/fix_shape/D5 b/tests/heal/fix_shape/D5
index 767d05978d..2179e4dfb9 100644
--- a/tests/heal/fix_shape/D5
+++ b/tests/heal/fix_shape/D5
@@ -1 +1 @@
-restore CIN001_b14.rle a
+restore [locate_data_file CIN001_b14.rle] a
diff --git a/tests/heal/fix_shape/D6 b/tests/heal/fix_shape/D6
index be04fecd3b..f9b19f5c7e 100644
--- a/tests/heal/fix_shape/D6
+++ b/tests/heal/fix_shape/D6
@@ -1 +1 @@
-restore CIN001_b49.rle a
+restore [locate_data_file CIN001_b49.rle] a
diff --git a/tests/heal/fix_shape/D7 b/tests/heal/fix_shape/D7
index eaf8505d11..8be3122652 100644
--- a/tests/heal/fix_shape/D7
+++ b/tests/heal/fix_shape/D7
@@ -1 +1 @@
-restore CIN001_b50.rle a
+restore [locate_data_file CIN001_b50.rle] a
diff --git a/tests/heal/fix_shape/D8 b/tests/heal/fix_shape/D8
index aec4145eed..7f5a98819b 100644
--- a/tests/heal/fix_shape/D8
+++ b/tests/heal/fix_shape/D8
@@ -1 +1 @@
-restore CIN001_b51.rle a
+restore [locate_data_file CIN001_b51.rle] a
diff --git a/tests/heal/fix_shape/D9 b/tests/heal/fix_shape/D9
index d14ea9806d..0473cbe86d 100644
--- a/tests/heal/fix_shape/D9
+++ b/tests/heal/fix_shape/D9
@@ -1 +1 @@
-restore CIN001_b62.rle a
+restore [locate_data_file CIN001_b62.rle] a
diff --git a/tests/heal/fix_shape/E1 b/tests/heal/fix_shape/E1
index 6ca193cdd9..e3bd17888a 100644
--- a/tests/heal/fix_shape/E1
+++ b/tests/heal/fix_shape/E1
@@ -1 +1 @@
-restore CNP001_projoien.rle a
+restore [locate_data_file CNP001_projoien.rle] a
diff --git a/tests/heal/fix_shape/E2 b/tests/heal/fix_shape/E2
index be071154ed..271ce484b7 100644
--- a/tests/heal/fix_shape/E2
+++ b/tests/heal/fix_shape/E2
@@ -1 +1 @@
-restore CNP002_projoieq.rle a
+restore [locate_data_file CNP002_projoieq.rle] a
diff --git a/tests/heal/fix_shape/E3 b/tests/heal/fix_shape/E3
index 78b7c78cd5..116844c0d6 100644
--- a/tests/heal/fix_shape/E3
+++ b/tests/heal/fix_shape/E3
@@ -1 +1 @@
-restore CTO900_buc60127-part.rle a
+restore [locate_data_file CTO900_buc60127-part.rle] a
diff --git a/tests/heal/fix_shape/E4 b/tests/heal/fix_shape/E4
index 0d142918eb..944d6e14f2 100644
--- a/tests/heal/fix_shape/E4
+++ b/tests/heal/fix_shape/E4
@@ -1 +1 @@
-restore CTO900_cts18078-part.rle a
+restore [locate_data_file CTO900_cts18078-part.rle] a
diff --git a/tests/heal/fix_shape/E5 b/tests/heal/fix_shape/E5
index d50e52b418..45bf4ca990 100644
--- a/tests/heal/fix_shape/E5
+++ b/tests/heal/fix_shape/E5
@@ -1 +1 @@
-restore CTO900_cts60005a.rle a
+restore [locate_data_file CTO900_cts60005a.rle] a
diff --git a/tests/heal/fix_shape/E6 b/tests/heal/fix_shape/E6
index 7854f28a5f..781dc13ec7 100644
--- a/tests/heal/fix_shape/E6
+++ b/tests/heal/fix_shape/E6
@@ -1 +1 @@
-restore CTO900_ger60039a.rle a
+restore [locate_data_file CTO900_ger60039a.rle] a
diff --git a/tests/heal/fix_shape/E7 b/tests/heal/fix_shape/E7
index 6bd2c606d8..80e27313b2 100644
--- a/tests/heal/fix_shape/E7
+++ b/tests/heal/fix_shape/E7
@@ -1 +1 @@
-restore CTO900_ger60041a.rle a
+restore [locate_data_file CTO900_ger60041a.rle] a
diff --git a/tests/heal/fix_shape/E8 b/tests/heal/fix_shape/E8
index 0d03c5fe3e..3a56303df6 100644
--- a/tests/heal/fix_shape/E8
+++ b/tests/heal/fix_shape/E8
@@ -1 +1 @@
-restore CTO900_ger60054a.rle a
+restore [locate_data_file CTO900_ger60054a.rle] a
diff --git a/tests/heal/fix_shape/E9 b/tests/heal/fix_shape/E9
index 03d0c0688a..f5c9aede6e 100644
--- a/tests/heal/fix_shape/E9
+++ b/tests/heal/fix_shape/E9
@@ -1 +1 @@
-restore CTO900_pro5363c.rle a
+restore [locate_data_file CTO900_pro5363c.rle] a
diff --git a/tests/heal/fix_shape/F1 b/tests/heal/fix_shape/F1
index c730b337d5..37a1ea83d0 100644
--- a/tests/heal/fix_shape/F1
+++ b/tests/heal/fix_shape/F1
@@ -1 +1 @@
-restore CTS18683.rle a
+restore [locate_data_file CTS18683.rle] a
diff --git a/tests/heal/fix_shape/F2 b/tests/heal/fix_shape/F2
index 78f84127f3..8374c60e9b 100644
--- a/tests/heal/fix_shape/F2
+++ b/tests/heal/fix_shape/F2
@@ -1 +1 @@
-restore CTS18868-1.rle a
+restore [locate_data_file CTS18868-1.rle] a
diff --git a/tests/heal/fix_shape/F3 b/tests/heal/fix_shape/F3
index 1efe381812..4968d571af 100644
--- a/tests/heal/fix_shape/F3
+++ b/tests/heal/fix_shape/F3
@@ -1 +1 @@
-restore CTS18868-2.rle a
+restore [locate_data_file CTS18868-2.rle] a
diff --git a/tests/heal/fix_shape/F4 b/tests/heal/fix_shape/F4
index 84bcfe2d67..424b0d6329 100644
--- a/tests/heal/fix_shape/F4
+++ b/tests/heal/fix_shape/F4
@@ -1 +1 @@
-restore err_f_2.rle a
+restore [locate_data_file err_f_2.rle] a
diff --git a/tests/heal/fix_shape/F5 b/tests/heal/fix_shape/F5
index a5dfa4b9fe..5acd96432c 100644
--- a/tests/heal/fix_shape/F5
+++ b/tests/heal/fix_shape/F5
@@ -1 +1 @@
-restore face.rle a
+restore [locate_data_file face.rle] a
diff --git a/tests/heal/fix_shape/F6 b/tests/heal/fix_shape/F6
index b1b6f7ab23..f1b427765d 100644
--- a/tests/heal/fix_shape/F6
+++ b/tests/heal/fix_shape/F6
@@ -1 +1 @@
-restore PRO10066.rle a
+restore [locate_data_file PRO10066.rle] a
diff --git a/tests/heal/fix_shape/F7 b/tests/heal/fix_shape/F7
index 7894d835a4..7e94fe7916 100644
--- a/tests/heal/fix_shape/F7
+++ b/tests/heal/fix_shape/F7
@@ -1,2 +1,2 @@
 puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_1"
-restore rrr.rle a
+restore [locate_data_file rrr.rle] a
diff --git a/tests/heal/fix_shape/F8 b/tests/heal/fix_shape/F8
index 5fa2fa879b..703960a987 100644
--- a/tests/heal/fix_shape/F8
+++ b/tests/heal/fix_shape/F8
@@ -1 +1 @@
-restore sh.rle a
+restore [locate_data_file sh.rle] a
diff --git a/tests/heal/fix_shape/F9 b/tests/heal/fix_shape/F9
index 44da724faa..a38db1d7c5 100644
--- a/tests/heal/fix_shape/F9
+++ b/tests/heal/fix_shape/F9
@@ -1 +1 @@
-restore tmp.rle a
+restore [locate_data_file tmp.rle] a
diff --git a/tests/heal/fix_shape/G1 b/tests/heal/fix_shape/G1
index 88c052655c..f5df0433e9 100644
--- a/tests/heal/fix_shape/G1
+++ b/tests/heal/fix_shape/G1
@@ -1 +1 @@
-restore rotor.brep a
+restore [locate_data_file rotor.brep] a
diff --git a/tests/heal/fix_shape/G2 b/tests/heal/fix_shape/G2
index a9f73ff6d9..3131dd4cc4 100644
--- a/tests/heal/fix_shape/G2
+++ b/tests/heal/fix_shape/G2
@@ -1 +1 @@
-restore BoxAndConeFS.rle a
+restore [locate_data_file BoxAndConeFS.rle] a
diff --git a/tests/heal/fix_shape/G3 b/tests/heal/fix_shape/G3
index 62bc8f6da0..27d14ba445 100644
--- a/tests/heal/fix_shape/G3
+++ b/tests/heal/fix_shape/G3
@@ -1 +1 @@
-restore newFS.rle a
+restore [locate_data_file newFS.rle] a
diff --git a/tests/heal/fix_shape/G4 b/tests/heal/fix_shape/G4
index 81ff69fd71..6eab13647e 100644
--- a/tests/heal/fix_shape/G4
+++ b/tests/heal/fix_shape/G4
@@ -1 +1 @@
-restore pcpc2_FS_FG.rle a
+restore [locate_data_file pcpc2_FS_FG.rle] a
diff --git a/tests/heal/fix_shape/G5 b/tests/heal/fix_shape/G5
index b4dc7f6f8f..4077aafced 100644
--- a/tests/heal/fix_shape/G5
+++ b/tests/heal/fix_shape/G5
@@ -1 +1 @@
-restore csh001i.brep a
+restore [locate_data_file csh001i.brep] a
diff --git a/tests/heal/same_parameter/A1 b/tests/heal/same_parameter/A1
index 4e009581de..59747f9eec 100644
--- a/tests/heal/same_parameter/A1
+++ b/tests/heal/same_parameter/A1
@@ -1 +1 @@
-restore CFE903_ger60ggw.rle result
+restore [locate_data_file CFE903_ger60ggw.rle] result
diff --git a/tests/heal/same_parameter/A2 b/tests/heal/same_parameter/A2
index ad4babd8c6..6896d8de51 100644
--- a/tests/heal/same_parameter/A2
+++ b/tests/heal/same_parameter/A2
@@ -1 +1 @@
-restore CNP001_projoien.rle result
+restore [locate_data_file CNP001_projoien.rle] result
diff --git a/tests/heal/same_parameter/A3 b/tests/heal/same_parameter/A3
index 123268427f..93ef0eead1 100644
--- a/tests/heal/same_parameter/A3
+++ b/tests/heal/same_parameter/A3
@@ -1 +1 @@
-restore CTS18868-1.rle result
+restore [locate_data_file CTS18868-1.rle] result
diff --git a/tests/heal/same_parameter/A4 b/tests/heal/same_parameter/A4
index 1deee76ae0..6f9f653cfb 100644
--- a/tests/heal/same_parameter/A4
+++ b/tests/heal/same_parameter/A4
@@ -1 +1 @@
-restore CTS18868-2.rle result
+restore [locate_data_file CTS18868-2.rle] result
diff --git a/tests/heal/same_parameter/A5 b/tests/heal/same_parameter/A5
index fcf9ccc2c8..5914b00dc4 100644
--- a/tests/heal/same_parameter/A5
+++ b/tests/heal/same_parameter/A5
@@ -1 +1 @@
-restore BUC50070-#53168-good.rle result
+restore [locate_data_file BUC50070-#53168-good.rle] result
diff --git a/tests/heal/same_parameter/A6 b/tests/heal/same_parameter/A6
index fc070a32f5..7f68702d56 100644
--- a/tests/heal/same_parameter/A6
+++ b/tests/heal/same_parameter/A6
@@ -1 +1 @@
-restore self-int.rle result
+restore [locate_data_file self-int.rle] result
diff --git a/tests/heal/same_parameter/A7 b/tests/heal/same_parameter/A7
index 1326c217c6..d8e836dcbb 100644
--- a/tests/heal/same_parameter/A7
+++ b/tests/heal/same_parameter/A7
@@ -1 +1 @@
-restore shell_orient.rle result
+restore [locate_data_file shell_orient.rle] result
diff --git a/tests/heal/same_parameter/A8 b/tests/heal/same_parameter/A8
index b45e7462d3..b3f6ba6f87 100644
--- a/tests/heal/same_parameter/A8
+++ b/tests/heal/same_parameter/A8
@@ -1,2 +1,2 @@
 puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_9"
-restore neizvestnoeDSE.rle result
+restore [locate_data_file neizvestnoeDSE.rle] result
diff --git a/tests/heal/same_parameter/A9 b/tests/heal/same_parameter/A9
index f4d6e02b7e..9b560b7ba9 100644
--- a/tests/heal/same_parameter/A9
+++ b/tests/heal/same_parameter/A9
@@ -1,2 +1,2 @@
 puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_1"
-restore revface.rle result
+restore [locate_data_file revface.rle] result
diff --git a/tests/heal/split_angle/A1 b/tests/heal/split_angle/A1
index dfd9758c5b..d5f8a969fc 100644
--- a/tests/heal/split_angle/A1
+++ b/tests/heal/split_angle/A1
@@ -1 +1 @@
-restore CCH_coco1.rle a
+restore [locate_data_file CCH_coco1.rle] a
diff --git a/tests/heal/split_angle/A2 b/tests/heal/split_angle/A2
index 1deece72b3..811a0ce57c 100644
--- a/tests/heal/split_angle/A2
+++ b/tests/heal/split_angle/A2
@@ -1 +1 @@
-restore CCH_testkhes.rle a
+restore [locate_data_file CCH_testkhes.rle] a
diff --git a/tests/heal/split_angle/A3 b/tests/heal/split_angle/A3
index d9edcaa23e..61864fb4d8 100644
--- a/tests/heal/split_angle/A3
+++ b/tests/heal/split_angle/A3
@@ -1 +1 @@
-restore CCV_2_i1_gtb.rle a
+restore [locate_data_file CCV_2_i1_gtb.rle] a
diff --git a/tests/heal/split_angle/A4 b/tests/heal/split_angle/A4
index 856d8f5792..cb13f98d9d 100644
--- a/tests/heal/split_angle/A4
+++ b/tests/heal/split_angle/A4
@@ -1 +1 @@
-restore CFE900_ger50gdb.rle a
+restore [locate_data_file CFE900_ger50gdb.rle] a
diff --git a/tests/heal/split_angle/A5 b/tests/heal/split_angle/A5
index 6b12ae0f3b..eec5e0c3c3 100644
--- a/tests/heal/split_angle/A5
+++ b/tests/heal/split_angle/A5
@@ -1 +1 @@
-restore CFE901_cts21gft.rle a
+restore [locate_data_file CFE901_cts21gft.rle] a
diff --git a/tests/heal/split_angle/A6 b/tests/heal/split_angle/A6
index 46b9927031..44b244ac2b 100644
--- a/tests/heal/split_angle/A6
+++ b/tests/heal/split_angle/A6
@@ -1 +1 @@
-restore CFI_5_l12fgq.rle a
+restore [locate_data_file CFI_5_l12fgq.rle] a
diff --git a/tests/heal/split_angle/A7 b/tests/heal/split_angle/A7
index 0b814a6b25..86c1ac62b1 100644
--- a/tests/heal/split_angle/A7
+++ b/tests/heal/split_angle/A7
@@ -1 +1 @@
-restore CFI_6_g56fhe.rle a
+restore [locate_data_file CFI_6_g56fhe.rle] a
diff --git a/tests/heal/split_angle/A8 b/tests/heal/split_angle/A8
index 3b8339947d..1b1b64cb5d 100644
--- a/tests/heal/split_angle/A8
+++ b/tests/heal/split_angle/A8
@@ -1 +1 @@
-restore CFI_8_i1_fia.rle a
+restore [locate_data_file CFI_8_i1_fia.rle] a
diff --git a/tests/heal/split_angle/A9 b/tests/heal/split_angle/A9
index a13c97e2dd..8141ff8ae0 100644
--- a/tests/heal/split_angle/A9
+++ b/tests/heal/split_angle/A9
@@ -1 +1 @@
-restore CFI_cfi90fjb.rle a
+restore [locate_data_file CFI_cfi90fjb.rle] a
diff --git a/tests/heal/split_angle/B1 b/tests/heal/split_angle/B1
index 9c974d0f1f..6a085b500b 100644
--- a/tests/heal/split_angle/B1
+++ b/tests/heal/split_angle/B1
@@ -1 +1 @@
-restore CFI_cts16288.rle a
+restore [locate_data_file CFI_cts16288.rle] a
diff --git a/tests/heal/split_angle/B2 b/tests/heal/split_angle/B2
index e1bd298fb7..89ca70f72d 100644
--- a/tests/heal/split_angle/B2
+++ b/tests/heal/split_angle/B2
@@ -1 +1 @@
-restore CFI_g1234fio.rle a
+restore [locate_data_file CFI_g1234fio.rle] a
diff --git a/tests/heal/split_angle/B3 b/tests/heal/split_angle/B3
index c44c4232f7..90f98a12c3 100644
--- a/tests/heal/split_angle/B3
+++ b/tests/heal/split_angle/B3
@@ -1 +1 @@
-restore CFI_g5678fip.rle a
+restore [locate_data_file CFI_g5678fip.rle] a
diff --git a/tests/heal/split_angle/B4 b/tests/heal/split_angle/B4
index ce9f7107bb..208cb65cf2 100644
--- a/tests/heal/split_angle/B4
+++ b/tests/heal/split_angle/B4
@@ -1 +1 @@
-restore CFI_n12__fiw.rle a
+restore [locate_data_file CFI_n12__fiw.rle] a
diff --git a/tests/heal/split_angle/B5 b/tests/heal/split_angle/B5
index 0a7b6da66b..b388ff189c 100644
--- a/tests/heal/split_angle/B5
+++ b/tests/heal/split_angle/B5
@@ -1 +1 @@
-restore CFI_o12__fix.rle a
+restore [locate_data_file CFI_o12__fix.rle] a
diff --git a/tests/heal/split_angle/B6 b/tests/heal/split_angle/B6
index fa2cf3a2d2..7799fbc318 100644
--- a/tests/heal/split_angle/B6
+++ b/tests/heal/split_angle/B6
@@ -1 +1 @@
-restore CFI_pro12305.rle a
+restore [locate_data_file CFI_pro12305.rle] a
diff --git a/tests/heal/split_angle/B7 b/tests/heal/split_angle/B7
index d683dc8f9e..c3577cef32 100644
--- a/tests/heal/split_angle/B7
+++ b/tests/heal/split_angle/B7
@@ -1 +1 @@
-restore CFI_pro12832.rle a
+restore [locate_data_file CFI_pro12832.rle] a
diff --git a/tests/heal/split_angle/B8 b/tests/heal/split_angle/B8
index c6ab5d2bad..7c510c3867 100644
--- a/tests/heal/split_angle/B8
+++ b/tests/heal/split_angle/B8
@@ -1 +1 @@
-restore CFI_pro14fjq.rle a
+restore [locate_data_file CFI_pro14fjq.rle] a
diff --git a/tests/heal/split_angle/B9 b/tests/heal/split_angle/B9
index e6c3c0c20c..4b4421c99e 100644
--- a/tests/heal/split_angle/B9
+++ b/tests/heal/split_angle/B9
@@ -1 +1 @@
-restore CFI_pro5807.rle a
+restore [locate_data_file CFI_pro5807.rle] a
diff --git a/tests/heal/split_angle/C1 b/tests/heal/split_angle/C1
index e90f1dcce0..00f9fd556f 100644
--- a/tests/heal/split_angle/C1
+++ b/tests/heal/split_angle/C1
@@ -1 +1 @@
-restore CFI_pro9480.rle a
+restore [locate_data_file CFI_pro9480.rle] a
diff --git a/tests/heal/split_angle/C2 b/tests/heal/split_angle/C2
index 99c16f8ff0..85817a2321 100644
--- a/tests/heal/split_angle/C2
+++ b/tests/heal/split_angle/C2
@@ -1 +1 @@
-restore CHE_cc4.rle a
+restore [locate_data_file CHE_cc4.rle] a
diff --git a/tests/heal/split_angle/C3 b/tests/heal/split_angle/C3
index 3ca4d98502..672ee3660a 100644
--- a/tests/heal/split_angle/C3
+++ b/tests/heal/split_angle/C3
@@ -1 +1 @@
-restore CHE_friteioa.rle a
+restore [locate_data_file CHE_friteioa.rle] a
diff --git a/tests/heal/split_angle/C4 b/tests/heal/split_angle/C4
index 0babbb756e..f38eac8f28 100644
--- a/tests/heal/split_angle/C4
+++ b/tests/heal/split_angle/C4
@@ -1 +1 @@
-restore CIN001_a13.rle a
+restore [locate_data_file CIN001_a13.rle] a
diff --git a/tests/heal/split_angle/C5 b/tests/heal/split_angle/C5
index 907b3392bf..e90f05f7d3 100644
--- a/tests/heal/split_angle/C5
+++ b/tests/heal/split_angle/C5
@@ -1 +1 @@
-restore CIN001_a14.rle a
+restore [locate_data_file CIN001_a14.rle] a
diff --git a/tests/heal/split_angle/C6 b/tests/heal/split_angle/C6
index 074b79924c..ff799eee7d 100644
--- a/tests/heal/split_angle/C6
+++ b/tests/heal/split_angle/C6
@@ -1 +1 @@
-restore CIN001_a49.rle a
+restore [locate_data_file CIN001_a49.rle] a
diff --git a/tests/heal/split_angle/C7 b/tests/heal/split_angle/C7
index a0a426cce4..f2aa73ccd5 100644
--- a/tests/heal/split_angle/C7
+++ b/tests/heal/split_angle/C7
@@ -1 +1 @@
-restore CIN001_a51.rle a
+restore [locate_data_file CIN001_a51.rle] a
diff --git a/tests/heal/split_angle/C8 b/tests/heal/split_angle/C8
index ac868d8c8a..9a1033e3f4 100644
--- a/tests/heal/split_angle/C8
+++ b/tests/heal/split_angle/C8
@@ -1 +1 @@
-restore CIN001_a62.rle a
+restore [locate_data_file CIN001_a62.rle] a
diff --git a/tests/heal/split_angle/C9 b/tests/heal/split_angle/C9
index d77a48912b..32f7d62c71 100644
--- a/tests/heal/split_angle/C9
+++ b/tests/heal/split_angle/C9
@@ -1 +1 @@
-restore CIN001_b13.rle a
+restore [locate_data_file CIN001_b13.rle] a
diff --git a/tests/heal/split_angle/D1 b/tests/heal/split_angle/D1
index 767d05978d..2179e4dfb9 100644
--- a/tests/heal/split_angle/D1
+++ b/tests/heal/split_angle/D1
@@ -1 +1 @@
-restore CIN001_b14.rle a
+restore [locate_data_file CIN001_b14.rle] a
diff --git a/tests/heal/split_angle/D2 b/tests/heal/split_angle/D2
index be04fecd3b..f9b19f5c7e 100644
--- a/tests/heal/split_angle/D2
+++ b/tests/heal/split_angle/D2
@@ -1 +1 @@
-restore CIN001_b49.rle a
+restore [locate_data_file CIN001_b49.rle] a
diff --git a/tests/heal/split_angle/D3 b/tests/heal/split_angle/D3
index eaf8505d11..8be3122652 100644
--- a/tests/heal/split_angle/D3
+++ b/tests/heal/split_angle/D3
@@ -1 +1 @@
-restore CIN001_b50.rle a
+restore [locate_data_file CIN001_b50.rle] a
diff --git a/tests/heal/split_angle/D4 b/tests/heal/split_angle/D4
index aec4145eed..7f5a98819b 100644
--- a/tests/heal/split_angle/D4
+++ b/tests/heal/split_angle/D4
@@ -1 +1 @@
-restore CIN001_b51.rle a
+restore [locate_data_file CIN001_b51.rle] a
diff --git a/tests/heal/split_angle/D5 b/tests/heal/split_angle/D5
index d14ea9806d..0473cbe86d 100644
--- a/tests/heal/split_angle/D5
+++ b/tests/heal/split_angle/D5
@@ -1 +1 @@
-restore CIN001_b62.rle a
+restore [locate_data_file CIN001_b62.rle] a
diff --git a/tests/heal/split_angle/D6 b/tests/heal/split_angle/D6
index be071154ed..271ce484b7 100644
--- a/tests/heal/split_angle/D6
+++ b/tests/heal/split_angle/D6
@@ -1 +1 @@
-restore CNP002_projoieq.rle a
+restore [locate_data_file CNP002_projoieq.rle] a
diff --git a/tests/heal/split_angle/D7 b/tests/heal/split_angle/D7
index 78b7c78cd5..116844c0d6 100644
--- a/tests/heal/split_angle/D7
+++ b/tests/heal/split_angle/D7
@@ -1 +1 @@
-restore CTO900_buc60127-part.rle a
+restore [locate_data_file CTO900_buc60127-part.rle] a
diff --git a/tests/heal/split_angle/D8 b/tests/heal/split_angle/D8
index 0d142918eb..944d6e14f2 100644
--- a/tests/heal/split_angle/D8
+++ b/tests/heal/split_angle/D8
@@ -1 +1 @@
-restore CTO900_cts18078-part.rle a
+restore [locate_data_file CTO900_cts18078-part.rle] a
diff --git a/tests/heal/split_angle/D9 b/tests/heal/split_angle/D9
index d50e52b418..45bf4ca990 100644
--- a/tests/heal/split_angle/D9
+++ b/tests/heal/split_angle/D9
@@ -1 +1 @@
-restore CTO900_cts60005a.rle a
+restore [locate_data_file CTO900_cts60005a.rle] a
diff --git a/tests/heal/split_angle/E1 b/tests/heal/split_angle/E1
index 7854f28a5f..781dc13ec7 100644
--- a/tests/heal/split_angle/E1
+++ b/tests/heal/split_angle/E1
@@ -1 +1 @@
-restore CTO900_ger60039a.rle a
+restore [locate_data_file CTO900_ger60039a.rle] a
diff --git a/tests/heal/split_angle/E2 b/tests/heal/split_angle/E2
index 6bd2c606d8..80e27313b2 100644
--- a/tests/heal/split_angle/E2
+++ b/tests/heal/split_angle/E2
@@ -1 +1 @@
-restore CTO900_ger60041a.rle a
+restore [locate_data_file CTO900_ger60041a.rle] a
diff --git a/tests/heal/split_angle/E3 b/tests/heal/split_angle/E3
index 0d03c5fe3e..3a56303df6 100644
--- a/tests/heal/split_angle/E3
+++ b/tests/heal/split_angle/E3
@@ -1 +1 @@
-restore CTO900_ger60054a.rle a
+restore [locate_data_file CTO900_ger60054a.rle] a
diff --git a/tests/heal/split_angle/E4 b/tests/heal/split_angle/E4
index c730b337d5..37a1ea83d0 100644
--- a/tests/heal/split_angle/E4
+++ b/tests/heal/split_angle/E4
@@ -1 +1 @@
-restore CTS18683.rle a
+restore [locate_data_file CTS18683.rle] a
diff --git a/tests/heal/split_angle/E5 b/tests/heal/split_angle/E5
index 66217f59a3..de2a8d1dd9 100644
--- a/tests/heal/split_angle/E5
+++ b/tests/heal/split_angle/E5
@@ -1 +1 @@
-restore CTS18826.rle a
+restore [locate_data_file CTS18826.rle] a
diff --git a/tests/heal/split_angle/E6 b/tests/heal/split_angle/E6
index 78f84127f3..8374c60e9b 100644
--- a/tests/heal/split_angle/E6
+++ b/tests/heal/split_angle/E6
@@ -1 +1 @@
-restore CTS18868-1.rle a
+restore [locate_data_file CTS18868-1.rle] a
diff --git a/tests/heal/split_angle/E7 b/tests/heal/split_angle/E7
index 1efe381812..4968d571af 100644
--- a/tests/heal/split_angle/E7
+++ b/tests/heal/split_angle/E7
@@ -1 +1 @@
-restore CTS18868-2.rle a
+restore [locate_data_file CTS18868-2.rle] a
diff --git a/tests/heal/split_angle/E8 b/tests/heal/split_angle/E8
index a5dfa4b9fe..5acd96432c 100644
--- a/tests/heal/split_angle/E8
+++ b/tests/heal/split_angle/E8
@@ -1 +1 @@
-restore face.rle a
+restore [locate_data_file face.rle] a
diff --git a/tests/heal/split_angle/E9 b/tests/heal/split_angle/E9
index b1b6f7ab23..f1b427765d 100644
--- a/tests/heal/split_angle/E9
+++ b/tests/heal/split_angle/E9
@@ -1 +1 @@
-restore PRO10066.rle a
+restore [locate_data_file PRO10066.rle] a
diff --git a/tests/heal/split_angle/F1 b/tests/heal/split_angle/F1
index 5fa2fa879b..703960a987 100644
--- a/tests/heal/split_angle/F1
+++ b/tests/heal/split_angle/F1
@@ -1 +1 @@
-restore sh.rle a
+restore [locate_data_file sh.rle] a
diff --git a/tests/heal/split_angle/F2 b/tests/heal/split_angle/F2
index 382e468ea3..3a4b784619 100644
--- a/tests/heal/split_angle/F2
+++ b/tests/heal/split_angle/F2
@@ -1 +1 @@
-restore wrong_checkshape_2.brep a
+restore [locate_data_file wrong_checkshape_2.brep] a
diff --git a/tests/heal/split_closed_faces/A1 b/tests/heal/split_closed_faces/A1
index 8eabad0cce..f6eca858f5 100644
--- a/tests/heal/split_closed_faces/A1
+++ b/tests/heal/split_closed_faces/A1
@@ -1 +1 @@
-restore aaa.rle a
+restore [locate_data_file aaa.rle] a
diff --git a/tests/heal/split_closed_faces/A2 b/tests/heal/split_closed_faces/A2
index a9f73ff6d9..3131dd4cc4 100644
--- a/tests/heal/split_closed_faces/A2
+++ b/tests/heal/split_closed_faces/A2
@@ -1 +1 @@
-restore BoxAndConeFS.rle a
+restore [locate_data_file BoxAndConeFS.rle] a
diff --git a/tests/heal/split_closed_faces/A3 b/tests/heal/split_closed_faces/A3
index 2667601065..af92437714 100644
--- a/tests/heal/split_closed_faces/A3
+++ b/tests/heal/split_closed_faces/A3
@@ -1 +1 @@
-restore boxFG.rle a
+restore [locate_data_file boxFG.rle] a
diff --git a/tests/heal/split_closed_faces/A4 b/tests/heal/split_closed_faces/A4
index 597ffb8079..e7227a2791 100644
--- a/tests/heal/split_closed_faces/A4
+++ b/tests/heal/split_closed_faces/A4
@@ -1 +1 @@
-restore BUC50070-#53168-good.rle a
+restore [locate_data_file BUC50070-#53168-good.rle] a
diff --git a/tests/heal/split_closed_faces/A5 b/tests/heal/split_closed_faces/A5
index dfd9758c5b..d5f8a969fc 100644
--- a/tests/heal/split_closed_faces/A5
+++ b/tests/heal/split_closed_faces/A5
@@ -1 +1 @@
-restore CCH_coco1.rle a
+restore [locate_data_file CCH_coco1.rle] a
diff --git a/tests/heal/split_closed_faces/A6 b/tests/heal/split_closed_faces/A6
index 1deece72b3..811a0ce57c 100644
--- a/tests/heal/split_closed_faces/A6
+++ b/tests/heal/split_closed_faces/A6
@@ -1 +1 @@
-restore CCH_testkhes.rle a
+restore [locate_data_file CCH_testkhes.rle] a
diff --git a/tests/heal/split_closed_faces/A7 b/tests/heal/split_closed_faces/A7
index d9edcaa23e..61864fb4d8 100644
--- a/tests/heal/split_closed_faces/A7
+++ b/tests/heal/split_closed_faces/A7
@@ -1 +1 @@
-restore CCV_2_i1_gtb.rle a
+restore [locate_data_file CCV_2_i1_gtb.rle] a
diff --git a/tests/heal/split_closed_faces/A8 b/tests/heal/split_closed_faces/A8
index 856d8f5792..cb13f98d9d 100644
--- a/tests/heal/split_closed_faces/A8
+++ b/tests/heal/split_closed_faces/A8
@@ -1 +1 @@
-restore CFE900_ger50gdb.rle a
+restore [locate_data_file CFE900_ger50gdb.rle] a
diff --git a/tests/heal/split_closed_faces/A9 b/tests/heal/split_closed_faces/A9
index 6b12ae0f3b..eec5e0c3c3 100644
--- a/tests/heal/split_closed_faces/A9
+++ b/tests/heal/split_closed_faces/A9
@@ -1 +1 @@
-restore CFE901_cts21gft.rle a
+restore [locate_data_file CFE901_cts21gft.rle] a
diff --git a/tests/heal/split_closed_faces/B1 b/tests/heal/split_closed_faces/B1
index 46b9927031..44b244ac2b 100644
--- a/tests/heal/split_closed_faces/B1
+++ b/tests/heal/split_closed_faces/B1
@@ -1 +1 @@
-restore CFI_5_l12fgq.rle a
+restore [locate_data_file CFI_5_l12fgq.rle] a
diff --git a/tests/heal/split_closed_faces/B2 b/tests/heal/split_closed_faces/B2
index 0b814a6b25..86c1ac62b1 100644
--- a/tests/heal/split_closed_faces/B2
+++ b/tests/heal/split_closed_faces/B2
@@ -1 +1 @@
-restore CFI_6_g56fhe.rle a
+restore [locate_data_file CFI_6_g56fhe.rle] a
diff --git a/tests/heal/split_closed_faces/B3 b/tests/heal/split_closed_faces/B3
index 3b8339947d..1b1b64cb5d 100644
--- a/tests/heal/split_closed_faces/B3
+++ b/tests/heal/split_closed_faces/B3
@@ -1 +1 @@
-restore CFI_8_i1_fia.rle a
+restore [locate_data_file CFI_8_i1_fia.rle] a
diff --git a/tests/heal/split_closed_faces/B4 b/tests/heal/split_closed_faces/B4
index a13c97e2dd..8141ff8ae0 100644
--- a/tests/heal/split_closed_faces/B4
+++ b/tests/heal/split_closed_faces/B4
@@ -1 +1 @@
-restore CFI_cfi90fjb.rle a
+restore [locate_data_file CFI_cfi90fjb.rle] a
diff --git a/tests/heal/split_closed_faces/B5 b/tests/heal/split_closed_faces/B5
index 9c974d0f1f..6a085b500b 100644
--- a/tests/heal/split_closed_faces/B5
+++ b/tests/heal/split_closed_faces/B5
@@ -1 +1 @@
-restore CFI_cts16288.rle a
+restore [locate_data_file CFI_cts16288.rle] a
diff --git a/tests/heal/split_closed_faces/B6 b/tests/heal/split_closed_faces/B6
index e1bd298fb7..89ca70f72d 100644
--- a/tests/heal/split_closed_faces/B6
+++ b/tests/heal/split_closed_faces/B6
@@ -1 +1 @@
-restore CFI_g1234fio.rle a
+restore [locate_data_file CFI_g1234fio.rle] a
diff --git a/tests/heal/split_closed_faces/B7 b/tests/heal/split_closed_faces/B7
index c44c4232f7..90f98a12c3 100644
--- a/tests/heal/split_closed_faces/B7
+++ b/tests/heal/split_closed_faces/B7
@@ -1 +1 @@
-restore CFI_g5678fip.rle a
+restore [locate_data_file CFI_g5678fip.rle] a
diff --git a/tests/heal/split_closed_faces/B8 b/tests/heal/split_closed_faces/B8
index ce9f7107bb..208cb65cf2 100644
--- a/tests/heal/split_closed_faces/B8
+++ b/tests/heal/split_closed_faces/B8
@@ -1 +1 @@
-restore CFI_n12__fiw.rle a
+restore [locate_data_file CFI_n12__fiw.rle] a
diff --git a/tests/heal/split_closed_faces/B9 b/tests/heal/split_closed_faces/B9
index 0a7b6da66b..b388ff189c 100644
--- a/tests/heal/split_closed_faces/B9
+++ b/tests/heal/split_closed_faces/B9
@@ -1 +1 @@
-restore CFI_o12__fix.rle a
+restore [locate_data_file CFI_o12__fix.rle] a
diff --git a/tests/heal/split_closed_faces/C1 b/tests/heal/split_closed_faces/C1
index fa2cf3a2d2..7799fbc318 100644
--- a/tests/heal/split_closed_faces/C1
+++ b/tests/heal/split_closed_faces/C1
@@ -1 +1 @@
-restore CFI_pro12305.rle a
+restore [locate_data_file CFI_pro12305.rle] a
diff --git a/tests/heal/split_closed_faces/C2 b/tests/heal/split_closed_faces/C2
index d683dc8f9e..c3577cef32 100644
--- a/tests/heal/split_closed_faces/C2
+++ b/tests/heal/split_closed_faces/C2
@@ -1 +1 @@
-restore CFI_pro12832.rle a
+restore [locate_data_file CFI_pro12832.rle] a
diff --git a/tests/heal/split_closed_faces/C3 b/tests/heal/split_closed_faces/C3
index c6ab5d2bad..7c510c3867 100644
--- a/tests/heal/split_closed_faces/C3
+++ b/tests/heal/split_closed_faces/C3
@@ -1 +1 @@
-restore CFI_pro14fjq.rle a
+restore [locate_data_file CFI_pro14fjq.rle] a
diff --git a/tests/heal/split_closed_faces/C4 b/tests/heal/split_closed_faces/C4
index e6c3c0c20c..4b4421c99e 100644
--- a/tests/heal/split_closed_faces/C4
+++ b/tests/heal/split_closed_faces/C4
@@ -1 +1 @@
-restore CFI_pro5807.rle a
+restore [locate_data_file CFI_pro5807.rle] a
diff --git a/tests/heal/split_closed_faces/C5 b/tests/heal/split_closed_faces/C5
index e90f1dcce0..00f9fd556f 100644
--- a/tests/heal/split_closed_faces/C5
+++ b/tests/heal/split_closed_faces/C5
@@ -1 +1 @@
-restore CFI_pro9480.rle a
+restore [locate_data_file CFI_pro9480.rle] a
diff --git a/tests/heal/split_closed_faces/C6 b/tests/heal/split_closed_faces/C6
index 99c16f8ff0..85817a2321 100644
--- a/tests/heal/split_closed_faces/C6
+++ b/tests/heal/split_closed_faces/C6
@@ -1 +1 @@
-restore CHE_cc4.rle a
+restore [locate_data_file CHE_cc4.rle] a
diff --git a/tests/heal/split_closed_faces/C7 b/tests/heal/split_closed_faces/C7
index 3ca4d98502..672ee3660a 100644
--- a/tests/heal/split_closed_faces/C7
+++ b/tests/heal/split_closed_faces/C7
@@ -1 +1 @@
-restore CHE_friteioa.rle a
+restore [locate_data_file CHE_friteioa.rle] a
diff --git a/tests/heal/split_closed_faces/C8 b/tests/heal/split_closed_faces/C8
index be071154ed..271ce484b7 100644
--- a/tests/heal/split_closed_faces/C8
+++ b/tests/heal/split_closed_faces/C8
@@ -1 +1 @@
-restore CNP002_projoieq.rle a
+restore [locate_data_file CNP002_projoieq.rle] a
diff --git a/tests/heal/split_closed_faces/C9 b/tests/heal/split_closed_faces/C9
index 78b7c78cd5..116844c0d6 100644
--- a/tests/heal/split_closed_faces/C9
+++ b/tests/heal/split_closed_faces/C9
@@ -1 +1 @@
-restore CTO900_buc60127-part.rle a
+restore [locate_data_file CTO900_buc60127-part.rle] a
diff --git a/tests/heal/split_closed_faces/D1 b/tests/heal/split_closed_faces/D1
index 0d142918eb..944d6e14f2 100644
--- a/tests/heal/split_closed_faces/D1
+++ b/tests/heal/split_closed_faces/D1
@@ -1 +1 @@
-restore CTO900_cts18078-part.rle a
+restore [locate_data_file CTO900_cts18078-part.rle] a
diff --git a/tests/heal/split_closed_faces/D2 b/tests/heal/split_closed_faces/D2
index d50e52b418..45bf4ca990 100644
--- a/tests/heal/split_closed_faces/D2
+++ b/tests/heal/split_closed_faces/D2
@@ -1 +1 @@
-restore CTO900_cts60005a.rle a
+restore [locate_data_file CTO900_cts60005a.rle] a
diff --git a/tests/heal/split_closed_faces/D3 b/tests/heal/split_closed_faces/D3
index 7854f28a5f..781dc13ec7 100644
--- a/tests/heal/split_closed_faces/D3
+++ b/tests/heal/split_closed_faces/D3
@@ -1 +1 @@
-restore CTO900_ger60039a.rle a
+restore [locate_data_file CTO900_ger60039a.rle] a
diff --git a/tests/heal/split_closed_faces/D4 b/tests/heal/split_closed_faces/D4
index 6bd2c606d8..80e27313b2 100644
--- a/tests/heal/split_closed_faces/D4
+++ b/tests/heal/split_closed_faces/D4
@@ -1 +1 @@
-restore CTO900_ger60041a.rle a
+restore [locate_data_file CTO900_ger60041a.rle] a
diff --git a/tests/heal/split_closed_faces/D5 b/tests/heal/split_closed_faces/D5
index 0d03c5fe3e..3a56303df6 100644
--- a/tests/heal/split_closed_faces/D5
+++ b/tests/heal/split_closed_faces/D5
@@ -1 +1 @@
-restore CTO900_ger60054a.rle a
+restore [locate_data_file CTO900_ger60054a.rle] a
diff --git a/tests/heal/split_closed_faces/D6 b/tests/heal/split_closed_faces/D6
index c730b337d5..37a1ea83d0 100644
--- a/tests/heal/split_closed_faces/D6
+++ b/tests/heal/split_closed_faces/D6
@@ -1 +1 @@
-restore CTS18683.rle a
+restore [locate_data_file CTS18683.rle] a
diff --git a/tests/heal/split_closed_faces/D7 b/tests/heal/split_closed_faces/D7
index 66217f59a3..de2a8d1dd9 100644
--- a/tests/heal/split_closed_faces/D7
+++ b/tests/heal/split_closed_faces/D7
@@ -1 +1 @@
-restore CTS18826.rle a
+restore [locate_data_file CTS18826.rle] a
diff --git a/tests/heal/split_closed_faces/D8 b/tests/heal/split_closed_faces/D8
index 78f84127f3..8374c60e9b 100644
--- a/tests/heal/split_closed_faces/D8
+++ b/tests/heal/split_closed_faces/D8
@@ -1 +1 @@
-restore CTS18868-1.rle a
+restore [locate_data_file CTS18868-1.rle] a
diff --git a/tests/heal/split_closed_faces/D9 b/tests/heal/split_closed_faces/D9
index 1efe381812..4968d571af 100644
--- a/tests/heal/split_closed_faces/D9
+++ b/tests/heal/split_closed_faces/D9
@@ -1 +1 @@
-restore CTS18868-2.rle a
+restore [locate_data_file CTS18868-2.rle] a
diff --git a/tests/heal/split_closed_faces/E1 b/tests/heal/split_closed_faces/E1
index 3d86f0609d..0a1f0185ed 100644
--- a/tests/heal/split_closed_faces/E1
+++ b/tests/heal/split_closed_faces/E1
@@ -1,2 +1,2 @@
 puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_2"
-restore DSE3.rle a
+restore [locate_data_file DSE3.rle] a
diff --git a/tests/heal/split_closed_faces/E2 b/tests/heal/split_closed_faces/E2
index 01667a6c87..a592e412fe 100644
--- a/tests/heal/split_closed_faces/E2
+++ b/tests/heal/split_closed_faces/E2
@@ -1 +1 @@
-restore DSEwithTol1.rle a
+restore [locate_data_file DSEwithTol1.rle] a
diff --git a/tests/heal/split_closed_faces/E3 b/tests/heal/split_closed_faces/E3
index a5dfa4b9fe..5acd96432c 100644
--- a/tests/heal/split_closed_faces/E3
+++ b/tests/heal/split_closed_faces/E3
@@ -1 +1 @@
-restore face.rle a
+restore [locate_data_file face.rle] a
diff --git a/tests/heal/split_closed_faces/E4 b/tests/heal/split_closed_faces/E4
index 65622edd2b..569e427a5a 100644
--- a/tests/heal/split_closed_faces/E4
+++ b/tests/heal/split_closed_faces/E4
@@ -1 +1 @@
-restore FG200.rle a
+restore [locate_data_file FG200.rle] a
diff --git a/tests/heal/split_closed_faces/E5 b/tests/heal/split_closed_faces/E5
index 9dc3ba62d9..28bee47700 100644
--- a/tests/heal/split_closed_faces/E5
+++ b/tests/heal/split_closed_faces/E5
@@ -1 +1 @@
-restore ForDSE.rle a
+restore [locate_data_file ForDSE.rle] a
diff --git a/tests/heal/split_closed_faces/E6 b/tests/heal/split_closed_faces/E6
index 62bc8f6da0..27d14ba445 100644
--- a/tests/heal/split_closed_faces/E6
+++ b/tests/heal/split_closed_faces/E6
@@ -1 +1 @@
-restore newFS.rle a
+restore [locate_data_file newFS.rle] a
diff --git a/tests/heal/split_closed_faces/E7 b/tests/heal/split_closed_faces/E7
index 81ff69fd71..6eab13647e 100644
--- a/tests/heal/split_closed_faces/E7
+++ b/tests/heal/split_closed_faces/E7
@@ -1 +1 @@
-restore pcpc2_FS_FG.rle a
+restore [locate_data_file pcpc2_FS_FG.rle] a
diff --git a/tests/heal/split_closed_faces/E8 b/tests/heal/split_closed_faces/E8
index b1b6f7ab23..f1b427765d 100644
--- a/tests/heal/split_closed_faces/E8
+++ b/tests/heal/split_closed_faces/E8
@@ -1 +1 @@
-restore PRO10066.rle a
+restore [locate_data_file PRO10066.rle] a
diff --git a/tests/heal/split_closed_faces/E9 b/tests/heal/split_closed_faces/E9
index 7549f4d2b3..9943256851 100644
--- a/tests/heal/split_closed_faces/E9
+++ b/tests/heal/split_closed_faces/E9
@@ -1 +1 @@
-restore RevolutionFG.rle a
+restore [locate_data_file RevolutionFG.rle] a
diff --git a/tests/heal/split_closed_faces/F1 b/tests/heal/split_closed_faces/F1
index 5fa2fa879b..703960a987 100644
--- a/tests/heal/split_closed_faces/F1
+++ b/tests/heal/split_closed_faces/F1
@@ -1 +1 @@
-restore sh.rle a
+restore [locate_data_file sh.rle] a
diff --git a/tests/heal/split_closed_faces/F2 b/tests/heal/split_closed_faces/F2
index 627c7d12bf..072920f211 100644
--- a/tests/heal/split_closed_faces/F2
+++ b/tests/heal/split_closed_faces/F2
@@ -1 +1 @@
-restore shell_orient.rle a
+restore [locate_data_file shell_orient.rle] a
diff --git a/tests/heal/split_closed_faces/F3 b/tests/heal/split_closed_faces/F3
index b551f22f85..fe54bbfae4 100644
--- a/tests/heal/split_closed_faces/F3
+++ b/tests/heal/split_closed_faces/F3
@@ -1 +1 @@
-restore spheraDSE.rle a
+restore [locate_data_file spheraDSE.rle] a
diff --git a/tests/heal/split_closed_faces/F4 b/tests/heal/split_closed_faces/F4
index d461a46aff..77a7e18edf 100644
--- a/tests/heal/split_closed_faces/F4
+++ b/tests/heal/split_closed_faces/F4
@@ -1 +1 @@
-restore 1-Ring.brep a
+restore [locate_data_file 1-Ring.brep] a
diff --git a/tests/heal/split_closed_faces/F5 b/tests/heal/split_closed_faces/F5
index a794229bc3..ee06bd100e 100644
--- a/tests/heal/split_closed_faces/F5
+++ b/tests/heal/split_closed_faces/F5
@@ -1 +1 @@
-restore bottle.brep a
+restore [locate_data_file bottle.brep] a
diff --git a/tests/heal/split_closed_faces/F6 b/tests/heal/split_closed_faces/F6
index ab65b95df8..ac427e0cf0 100644
--- a/tests/heal/split_closed_faces/F6
+++ b/tests/heal/split_closed_faces/F6
@@ -1 +1 @@
-restore bowl_noremove.brep a
+restore [locate_data_file bowl_noremove.brep] a
diff --git a/tests/heal/split_closed_faces/F7 b/tests/heal/split_closed_faces/F7
index 4e8626d92a..7a6d9703cc 100644
--- a/tests/heal/split_closed_faces/F7
+++ b/tests/heal/split_closed_faces/F7
@@ -1 +1 @@
-restore ec281.brep a
+restore [locate_data_file ec281.brep] a
diff --git a/tests/heal/split_closed_faces/F8 b/tests/heal/split_closed_faces/F8
index 9b05a52037..1f23710992 100644
--- a/tests/heal/split_closed_faces/F8
+++ b/tests/heal/split_closed_faces/F8
@@ -1 +1 @@
-restore ec2820.brep a
+restore [locate_data_file ec2820.brep] a
diff --git a/tests/heal/split_closed_faces/F9 b/tests/heal/split_closed_faces/F9
index f42570c022..2e216bc34e 100644
--- a/tests/heal/split_closed_faces/F9
+++ b/tests/heal/split_closed_faces/F9
@@ -1 +1 @@
-restore Fourche7corrige.brep a
+restore [locate_data_file Fourche7corrige.brep] a
diff --git a/tests/heal/split_closed_faces/G1 b/tests/heal/split_closed_faces/G1
index 1faa887ca8..34e5d7cc21 100644
--- a/tests/heal/split_closed_faces/G1
+++ b/tests/heal/split_closed_faces/G1
@@ -1 +1 @@
-restore hammer.brep a
+restore [locate_data_file hammer.brep] a
diff --git a/tests/heal/split_closed_faces/G2 b/tests/heal/split_closed_faces/G2
index d7d309d1ec..bc71297b39 100644
--- a/tests/heal/split_closed_faces/G2
+++ b/tests/heal/split_closed_faces/G2
@@ -1 +1 @@
-restore seadoo_base.brep a
+restore [locate_data_file seadoo_base.brep] a
diff --git a/tests/heal/split_closed_faces/G3 b/tests/heal/split_closed_faces/G3
index d63577580e..956bd9483f 100644
--- a/tests/heal/split_closed_faces/G3
+++ b/tests/heal/split_closed_faces/G3
@@ -1 +1 @@
-restore sew1.brep a
+restore [locate_data_file sew1.brep] a
diff --git a/tests/heal/split_closed_faces/G4 b/tests/heal/split_closed_faces/G4
index 258de78ae7..e685fa3d7a 100644
--- a/tests/heal/split_closed_faces/G4
+++ b/tests/heal/split_closed_faces/G4
@@ -1 +1 @@
-restore sew2.brep a
+restore [locate_data_file sew2.brep] a
diff --git a/tests/heal/split_closed_faces/G5 b/tests/heal/split_closed_faces/G5
index 382e468ea3..3a4b784619 100644
--- a/tests/heal/split_closed_faces/G5
+++ b/tests/heal/split_closed_faces/G5
@@ -1 +1 @@
-restore wrong_checkshape_2.brep a
+restore [locate_data_file wrong_checkshape_2.brep] a
diff --git a/tests/heal/split_continuity/A1 b/tests/heal/split_continuity/A1
index d376241dd5..a1a614c9e7 100644
--- a/tests/heal/split_continuity/A1
+++ b/tests/heal/split_continuity/A1
@@ -1 +1 @@
-restore CCH_conge1.rle a
+restore [locate_data_file CCH_conge1.rle] a
diff --git a/tests/heal/split_continuity/A2 b/tests/heal/split_continuity/A2
index d9edcaa23e..61864fb4d8 100644
--- a/tests/heal/split_continuity/A2
+++ b/tests/heal/split_continuity/A2
@@ -1 +1 @@
-restore CCV_2_i1_gtb.rle a
+restore [locate_data_file CCV_2_i1_gtb.rle] a
diff --git a/tests/heal/split_continuity/A3 b/tests/heal/split_continuity/A3
index 7a60d39dd5..921e11a320 100644
--- a/tests/heal/split_continuity/A3
+++ b/tests/heal/split_continuity/A3
@@ -1 +1 @@
-restore CCV_2_i2_gtc.rle a
+restore [locate_data_file CCV_2_i2_gtc.rle] a
diff --git a/tests/heal/split_continuity/A4 b/tests/heal/split_continuity/A4
index ce8beb6dfc..ba59400f6c 100644
--- a/tests/heal/split_continuity/A4
+++ b/tests/heal/split_continuity/A4
@@ -1 +1 @@
-restore CFE900_cts20geq.rle a
+restore [locate_data_file CFE900_cts20geq.rle] a
diff --git a/tests/heal/split_continuity/A5 b/tests/heal/split_continuity/A5
index b3fb070c4c..98ed34b8ab 100644
--- a/tests/heal/split_continuity/A5
+++ b/tests/heal/split_continuity/A5
@@ -1 +1 @@
-restore CFE900_ger60gfo.rle a
+restore [locate_data_file CFE900_ger60gfo.rle] a
diff --git a/tests/heal/split_continuity/A6 b/tests/heal/split_continuity/A6
index b8cc906741..87dc4daf2a 100644
--- a/tests/heal/split_continuity/A6
+++ b/tests/heal/split_continuity/A6
@@ -1 +1 @@
-restore CFI_6_i12fhh.rle a
+restore [locate_data_file CFI_6_i12fhh.rle] a
diff --git a/tests/heal/split_continuity/A7 b/tests/heal/split_continuity/A7
index 6a9077991d..3bc0d0567d 100644
--- a/tests/heal/split_continuity/A7
+++ b/tests/heal/split_continuity/A7
@@ -1 +1 @@
-restore CFI_6_i56fhi.rle a
+restore [locate_data_file CFI_6_i56fhi.rle] a
diff --git a/tests/heal/split_continuity/A8 b/tests/heal/split_continuity/A8
index 7d353da072..9947f0009d 100644
--- a/tests/heal/split_continuity/A8
+++ b/tests/heal/split_continuity/A8
@@ -1 +1 @@
-restore CFI_ger60206.rle a
+restore [locate_data_file CFI_ger60206.rle] a
diff --git a/tests/heal/split_continuity/A9 b/tests/heal/split_continuity/A9
index 4136e331c8..e9026d114b 100644
--- a/tests/heal/split_continuity/A9
+++ b/tests/heal/split_continuity/A9
@@ -1 +1 @@
-restore CFI_m12__fiv.rle a
+restore [locate_data_file CFI_m12__fiv.rle] a
diff --git a/tests/heal/split_continuity/B1 b/tests/heal/split_continuity/B1
index 7a90f79b56..b38a95b32a 100644
--- a/tests/heal/split_continuity/B1
+++ b/tests/heal/split_continuity/B1
@@ -1 +1 @@
-restore CFI_pro5477.rle a
+restore [locate_data_file CFI_pro5477.rle] a
diff --git a/tests/heal/split_continuity/B2 b/tests/heal/split_continuity/B2
index 804c4979ee..b39d73e313 100644
--- a/tests/heal/split_continuity/B2
+++ b/tests/heal/split_continuity/B2
@@ -1 +1 @@
-restore CFI_pro5545.rle a
+restore [locate_data_file CFI_pro5545.rle] a
diff --git a/tests/heal/split_continuity/B3 b/tests/heal/split_continuity/B3
index 8b8b860c0f..8cd762e27a 100644
--- a/tests/heal/split_continuity/B3
+++ b/tests/heal/split_continuity/B3
@@ -1 +1 @@
-restore CFI_pro6309c.rle a
+restore [locate_data_file CFI_pro6309c.rle] a
diff --git a/tests/heal/split_continuity/B4 b/tests/heal/split_continuity/B4
index b4e7f63c1b..2b8271107b 100644
--- a/tests/heal/split_continuity/B4
+++ b/tests/heal/split_continuity/B4
@@ -1 +1 @@
-restore CFI_pro6309d.rle a
+restore [locate_data_file CFI_pro6309d.rle] a
diff --git a/tests/heal/split_continuity/B5 b/tests/heal/split_continuity/B5
index e90f1dcce0..00f9fd556f 100644
--- a/tests/heal/split_continuity/B5
+++ b/tests/heal/split_continuity/B5
@@ -1 +1 @@
-restore CFI_pro9480.rle a
+restore [locate_data_file CFI_pro9480.rle] a
diff --git a/tests/heal/split_continuity/B6 b/tests/heal/split_continuity/B6
index dc5d2b45fd..6bceb8f429 100644
--- a/tests/heal/split_continuity/B6
+++ b/tests/heal/split_continuity/B6
@@ -1 +1 @@
-restore CHE900_cts21271.rle a
+restore [locate_data_file CHE900_cts21271.rle] a
diff --git a/tests/heal/split_continuity/B7 b/tests/heal/split_continuity/B7
index e8615c2e06..c45b649127 100644
--- a/tests/heal/split_continuity/B7
+++ b/tests/heal/split_continuity/B7
@@ -1 +1 @@
-restore CHE900_hkg60ioc.rle a
+restore [locate_data_file CHE900_hkg60ioc.rle] a
diff --git a/tests/heal/split_continuity/B8 b/tests/heal/split_continuity/B8
index 294ef1df8d..8197ed192a 100644
--- a/tests/heal/split_continuity/B8
+++ b/tests/heal/split_continuity/B8
@@ -1 +1 @@
-restore CIN001_a6.rle a
+restore [locate_data_file CIN001_a6.rle] a
diff --git a/tests/heal/split_continuity/B9 b/tests/heal/split_continuity/B9
index 0d142918eb..944d6e14f2 100644
--- a/tests/heal/split_continuity/B9
+++ b/tests/heal/split_continuity/B9
@@ -1 +1 @@
-restore CTO900_cts18078-part.rle a
+restore [locate_data_file CTO900_cts18078-part.rle] a
diff --git a/tests/heal/split_continuity/C1 b/tests/heal/split_continuity/C1
index 0d03c5fe3e..3a56303df6 100644
--- a/tests/heal/split_continuity/C1
+++ b/tests/heal/split_continuity/C1
@@ -1 +1 @@
-restore CTO900_ger60054a.rle a
+restore [locate_data_file CTO900_ger60054a.rle] a
diff --git a/tests/heal/split_continuity/C2 b/tests/heal/split_continuity/C2
index f768224ee3..d58b2465f6 100644
--- a/tests/heal/split_continuity/C2
+++ b/tests/heal/split_continuity/C2
@@ -1 +1 @@
-restore CTO900_ger60239a.rle a
+restore [locate_data_file CTO900_ger60239a.rle] a
diff --git a/tests/heal/split_continuity/C3 b/tests/heal/split_continuity/C3
index 673d51f4b8..18dbcff20e 100644
--- a/tests/heal/split_continuity/C3
+++ b/tests/heal/split_continuity/C3
@@ -1 +1 @@
-restore CTO900_ger60598c.rle a
+restore [locate_data_file CTO900_ger60598c.rle] a
diff --git a/tests/heal/split_continuity/C4 b/tests/heal/split_continuity/C4
index 320b166954..1e5531efd0 100644
--- a/tests/heal/split_continuity/C4
+++ b/tests/heal/split_continuity/C4
@@ -1 +1 @@
-restore CTO900_pro10505a.rle a
+restore [locate_data_file CTO900_pro10505a.rle] a
diff --git a/tests/heal/split_continuity/C5 b/tests/heal/split_continuity/C5
index 4b084ca359..07602404ae 100644
--- a/tests/heal/split_continuity/C5
+++ b/tests/heal/split_continuity/C5
@@ -1 +1 @@
-restore CTO900_pro10505b.rle a
+restore [locate_data_file CTO900_pro10505b.rle] a
diff --git a/tests/heal/split_continuity/C6 b/tests/heal/split_continuity/C6
index 4cafb0b1bf..1bdbf94542 100644
--- a/tests/heal/split_continuity/C6
+++ b/tests/heal/split_continuity/C6
@@ -1 +1 @@
-restore CTO900_pro12896a.rle a
+restore [locate_data_file CTO900_pro12896a.rle] a
diff --git a/tests/heal/split_continuity/C7 b/tests/heal/split_continuity/C7
index 1bd2aff9a9..7c57119f14 100644
--- a/tests/heal/split_continuity/C7
+++ b/tests/heal/split_continuity/C7
@@ -1 +1 @@
-restore CTO900_pro12913a.rle a
+restore [locate_data_file CTO900_pro12913a.rle] a
diff --git a/tests/heal/split_continuity/C8 b/tests/heal/split_continuity/C8
index 7c3b84d905..becbc0d3a2 100644
--- a/tests/heal/split_continuity/C8
+++ b/tests/heal/split_continuity/C8
@@ -1 +1 @@
-restore CTO900_pro8934a.rle a
+restore [locate_data_file CTO900_pro8934a.rle] a
diff --git a/tests/heal/split_continuity/C9 b/tests/heal/split_continuity/C9
index ea8d6f89e2..0620ed030f 100644
--- a/tests/heal/split_continuity/C9
+++ b/tests/heal/split_continuity/C9
@@ -1 +1 @@
-restore CTO901_cts20172_base.rle a
+restore [locate_data_file CTO901_cts20172_base.rle] a
diff --git a/tests/heal/split_continuity/D1 b/tests/heal/split_continuity/D1
index 568ea40af8..fa408efdf8 100644
--- a/tests/heal/split_continuity/D1
+++ b/tests/heal/split_continuity/D1
@@ -1 +1 @@
-restore CTO904_cts20960a.rle a
+restore [locate_data_file CTO904_cts20960a.rle] a
diff --git a/tests/heal/split_continuity/D2 b/tests/heal/split_continuity/D2
index dbbd98849c..a38afd788b 100644
--- a/tests/heal/split_continuity/D2
+++ b/tests/heal/split_continuity/D2
@@ -1 +1 @@
-restore CTO904_cts21364a.rle a
+restore [locate_data_file CTO904_cts21364a.rle] a
diff --git a/tests/heal/split_continuity/D3 b/tests/heal/split_continuity/D3
index 2ec0596dce..6a5c26cdfe 100644
--- a/tests/heal/split_continuity/D3
+++ b/tests/heal/split_continuity/D3
@@ -1 +1 @@
-restore CTO909_Bug3_Tr_obj.rle a
+restore [locate_data_file CTO909_Bug3_Tr_obj.rle] a
diff --git a/tests/heal/surface_to_bezier/A1 b/tests/heal/surface_to_bezier/A1
index 17c7e6aafe..8958f481ac 100644
--- a/tests/heal/surface_to_bezier/A1
+++ b/tests/heal/surface_to_bezier/A1
@@ -1 +1 @@
-restore BUC60328.rle a
+restore [locate_data_file BUC60328.rle] a
diff --git a/tests/heal/surface_to_bezier/A2 b/tests/heal/surface_to_bezier/A2
index 85561aae1c..b277602dfd 100644
--- a/tests/heal/surface_to_bezier/A2
+++ b/tests/heal/surface_to_bezier/A2
@@ -1 +1 @@
-restore BUC60329.rle a
+restore [locate_data_file BUC60329.rle] a
diff --git a/tests/heal/surface_to_bezier/A3 b/tests/heal/surface_to_bezier/A3
index d376241dd5..a1a614c9e7 100644
--- a/tests/heal/surface_to_bezier/A3
+++ b/tests/heal/surface_to_bezier/A3
@@ -1 +1 @@
-restore CCH_conge1.rle a
+restore [locate_data_file CCH_conge1.rle] a
diff --git a/tests/heal/surface_to_bezier/A4 b/tests/heal/surface_to_bezier/A4
index 6a73968eb7..61e280f899 100644
--- a/tests/heal/surface_to_bezier/A4
+++ b/tests/heal/surface_to_bezier/A4
@@ -1 +1 @@
-restore CCH_propag.rle a
+restore [locate_data_file CCH_propag.rle] a
diff --git a/tests/heal/surface_to_bezier/A5 b/tests/heal/surface_to_bezier/A5
index 0677f0c126..22a7f0a317 100644
--- a/tests/heal/surface_to_bezier/A5
+++ b/tests/heal/surface_to_bezier/A5
@@ -1 +1 @@
-restore CCH_r2.rle a
+restore [locate_data_file CCH_r2.rle] a
diff --git a/tests/heal/surface_to_bezier/A6 b/tests/heal/surface_to_bezier/A6
index f5ed420aba..1589450dd6 100644
--- a/tests/heal/surface_to_bezier/A6
+++ b/tests/heal/surface_to_bezier/A6
@@ -1 +1 @@
-restore CCI60005.rle a
+restore [locate_data_file CCI60005.rle] a
diff --git a/tests/heal/surface_to_bezier/A7 b/tests/heal/surface_to_bezier/A7
index 5d7faf57df..839eba5a09 100644
--- a/tests/heal/surface_to_bezier/A7
+++ b/tests/heal/surface_to_bezier/A7
@@ -1 +1 @@
-restore CCV_2_h1_gta.rle a
+restore [locate_data_file CCV_2_h1_gta.rle] a
diff --git a/tests/heal/surface_to_bezier/A8 b/tests/heal/surface_to_bezier/A8
index d9edcaa23e..61864fb4d8 100644
--- a/tests/heal/surface_to_bezier/A8
+++ b/tests/heal/surface_to_bezier/A8
@@ -1 +1 @@
-restore CCV_2_i1_gtb.rle a
+restore [locate_data_file CCV_2_i1_gtb.rle] a
diff --git a/tests/heal/surface_to_bezier/A9 b/tests/heal/surface_to_bezier/A9
index 7a60d39dd5..921e11a320 100644
--- a/tests/heal/surface_to_bezier/A9
+++ b/tests/heal/surface_to_bezier/A9
@@ -1 +1 @@
-restore CCV_2_i2_gtc.rle a
+restore [locate_data_file CCV_2_i2_gtc.rle] a
diff --git a/tests/heal/surface_to_bezier/B1 b/tests/heal/surface_to_bezier/B1
index 5dd02c5c2b..9132ecaba7 100644
--- a/tests/heal/surface_to_bezier/B1
+++ b/tests/heal/surface_to_bezier/B1
@@ -1 +1 @@
-restore CFE900_cts20gcu.rle a
+restore [locate_data_file CFE900_cts20gcu.rle] a
diff --git a/tests/heal/surface_to_bezier/B2 b/tests/heal/surface_to_bezier/B2
index 4b15c980ff..d9848493d2 100644
--- a/tests/heal/surface_to_bezier/B2
+++ b/tests/heal/surface_to_bezier/B2
@@ -1 +1 @@
-restore CFE900_cts20gdx.rle a
+restore [locate_data_file CFE900_cts20gdx.rle] a
diff --git a/tests/heal/surface_to_bezier/B3 b/tests/heal/surface_to_bezier/B3
index ce8beb6dfc..ba59400f6c 100644
--- a/tests/heal/surface_to_bezier/B3
+++ b/tests/heal/surface_to_bezier/B3
@@ -1 +1 @@
-restore CFE900_cts20geq.rle a
+restore [locate_data_file CFE900_cts20geq.rle] a
diff --git a/tests/heal/surface_to_bezier/B4 b/tests/heal/surface_to_bezier/B4
index fb12cdcfa4..9995b92115 100644
--- a/tests/heal/surface_to_bezier/B4
+++ b/tests/heal/surface_to_bezier/B4
@@ -1 +1 @@
-restore CFE900_cts21ges.rle a
+restore [locate_data_file CFE900_cts21ges.rle] a
diff --git a/tests/heal/surface_to_bezier/B5 b/tests/heal/surface_to_bezier/B5
index 856d8f5792..cb13f98d9d 100644
--- a/tests/heal/surface_to_bezier/B5
+++ b/tests/heal/surface_to_bezier/B5
@@ -1 +1 @@
-restore CFE900_ger50gdb.rle a
+restore [locate_data_file CFE900_ger50gdb.rle] a
diff --git a/tests/heal/surface_to_bezier/B6 b/tests/heal/surface_to_bezier/B6
index b3fb070c4c..98ed34b8ab 100644
--- a/tests/heal/surface_to_bezier/B6
+++ b/tests/heal/surface_to_bezier/B6
@@ -1 +1 @@
-restore CFE900_ger60gfo.rle a
+restore [locate_data_file CFE900_ger60gfo.rle] a
diff --git a/tests/heal/surface_to_bezier/B7 b/tests/heal/surface_to_bezier/B7
index 50223edf6d..3ed9ae8f14 100644
--- a/tests/heal/surface_to_bezier/B7
+++ b/tests/heal/surface_to_bezier/B7
@@ -1 +1 @@
-restore CFE900_pro15gcj.rle a
+restore [locate_data_file CFE900_pro15gcj.rle] a
diff --git a/tests/heal/surface_to_bezier/B8 b/tests/heal/surface_to_bezier/B8
index 1c02f1d78d..6d41e1f208 100644
--- a/tests/heal/surface_to_bezier/B8
+++ b/tests/heal/surface_to_bezier/B8
@@ -1 +1 @@
-restore CFE900_pro16gdo.rle a
+restore [locate_data_file CFE900_pro16gdo.rle] a
diff --git a/tests/heal/surface_to_bezier/B9 b/tests/heal/surface_to_bezier/B9
index 7d9284f11e..e5e22fdd09 100644
--- a/tests/heal/surface_to_bezier/B9
+++ b/tests/heal/surface_to_bezier/B9
@@ -1 +1 @@
-restore CFE900_pro16gff.rle a
+restore [locate_data_file CFE900_pro16gff.rle] a
diff --git a/tests/heal/surface_to_bezier/C1 b/tests/heal/surface_to_bezier/C1
index 90072e0943..5f49ad4768 100644
--- a/tests/heal/surface_to_bezier/C1
+++ b/tests/heal/surface_to_bezier/C1
@@ -1 +1 @@
-restore CFE900_uki60gfk.rle a
+restore [locate_data_file CFE900_uki60gfk.rle] a
diff --git a/tests/heal/surface_to_bezier/C2 b/tests/heal/surface_to_bezier/C2
index 0e2a24adf3..47d372a6d1 100644
--- a/tests/heal/surface_to_bezier/C2
+++ b/tests/heal/surface_to_bezier/C2
@@ -1 +1 @@
-restore CFE902_cts20ggk.rle a
+restore [locate_data_file CFE902_cts20ggk.rle] a
diff --git a/tests/heal/surface_to_bezier/C3 b/tests/heal/surface_to_bezier/C3
index 05ce641d74..b81974b186 100644
--- a/tests/heal/surface_to_bezier/C3
+++ b/tests/heal/surface_to_bezier/C3
@@ -1 +1 @@
-restore CFI_5_d12fgi.rle a
+restore [locate_data_file CFI_5_d12fgi.rle] a
diff --git a/tests/heal/surface_to_bezier/C4 b/tests/heal/surface_to_bezier/C4
index 46b9927031..44b244ac2b 100644
--- a/tests/heal/surface_to_bezier/C4
+++ b/tests/heal/surface_to_bezier/C4
@@ -1 +1 @@
-restore CFI_5_l12fgq.rle a
+restore [locate_data_file CFI_5_l12fgq.rle] a
diff --git a/tests/heal/surface_to_bezier/C5 b/tests/heal/surface_to_bezier/C5
index 5aa722efe4..0a6eff69ae 100644
--- a/tests/heal/surface_to_bezier/C5
+++ b/tests/heal/surface_to_bezier/C5
@@ -1 +1 @@
-restore CFI_6_g12fhd.rle a
+restore [locate_data_file CFI_6_g12fhd.rle] a
diff --git a/tests/heal/surface_to_bezier/C6 b/tests/heal/surface_to_bezier/C6
index 0b814a6b25..86c1ac62b1 100644
--- a/tests/heal/surface_to_bezier/C6
+++ b/tests/heal/surface_to_bezier/C6
@@ -1 +1 @@
-restore CFI_6_g56fhe.rle a
+restore [locate_data_file CFI_6_g56fhe.rle] a
diff --git a/tests/heal/surface_to_bezier/C7 b/tests/heal/surface_to_bezier/C7
index 375e854e12..71bebcb60a 100644
--- a/tests/heal/surface_to_bezier/C7
+++ b/tests/heal/surface_to_bezier/C7
@@ -1 +1 @@
-restore CFI_cts21363.rle a
+restore [locate_data_file CFI_cts21363.rle] a
diff --git a/tests/heal/surface_to_bezier/C8 b/tests/heal/surface_to_bezier/C8
index 7d353da072..9947f0009d 100644
--- a/tests/heal/surface_to_bezier/C8
+++ b/tests/heal/surface_to_bezier/C8
@@ -1 +1 @@
-restore CFI_ger60206.rle a
+restore [locate_data_file CFI_ger60206.rle] a
diff --git a/tests/heal/surface_to_bezier/C9 b/tests/heal/surface_to_bezier/C9
index b3de0b833b..f8d57900ba 100644
--- a/tests/heal/surface_to_bezier/C9
+++ b/tests/heal/surface_to_bezier/C9
@@ -1 +1 @@
-restore CFI_id260039.rle a
+restore [locate_data_file CFI_id260039.rle] a
diff --git a/tests/heal/surface_to_bezier/D1 b/tests/heal/surface_to_bezier/D1
index 4283471e20..9897b4f9f7 100644
--- a/tests/heal/surface_to_bezier/D1
+++ b/tests/heal/surface_to_bezier/D1
@@ -1 +1 @@
-restore CFI_pro10117.rle a
+restore [locate_data_file CFI_pro10117.rle] a
diff --git a/tests/heal/surface_to_bezier/D2 b/tests/heal/surface_to_bezier/D2
index d96f9259da..3e0b035c44 100644
--- a/tests/heal/surface_to_bezier/D2
+++ b/tests/heal/surface_to_bezier/D2
@@ -1 +1 @@
-restore CFI_pro10522.rle a
+restore [locate_data_file CFI_pro10522.rle] a
diff --git a/tests/heal/surface_to_bezier/D3 b/tests/heal/surface_to_bezier/D3
index 3e35fb68c6..ca4d09ee75 100644
--- a/tests/heal/surface_to_bezier/D3
+++ b/tests/heal/surface_to_bezier/D3
@@ -1 +1 @@
-restore CFI_pro10631.rle a
+restore [locate_data_file CFI_pro10631.rle] a
diff --git a/tests/heal/surface_to_bezier/D4 b/tests/heal/surface_to_bezier/D4
index dc5d2b45fd..6bceb8f429 100644
--- a/tests/heal/surface_to_bezier/D4
+++ b/tests/heal/surface_to_bezier/D4
@@ -1 +1 @@
-restore CHE900_cts21271.rle a
+restore [locate_data_file CHE900_cts21271.rle] a
diff --git a/tests/heal/surface_to_bezier/D5 b/tests/heal/surface_to_bezier/D5
index e8615c2e06..c45b649127 100644
--- a/tests/heal/surface_to_bezier/D5
+++ b/tests/heal/surface_to_bezier/D5
@@ -1 +1 @@
-restore CHE900_hkg60ioc.rle a
+restore [locate_data_file CHE900_hkg60ioc.rle] a
diff --git a/tests/heal/surface_to_bezier/D6 b/tests/heal/surface_to_bezier/D6
index 48c26fa6bb..3d393aae3e 100644
--- a/tests/heal/surface_to_bezier/D6
+++ b/tests/heal/surface_to_bezier/D6
@@ -1 +1 @@
-restore CIN001_a1.rle a
+restore [locate_data_file CIN001_a1.rle] a
diff --git a/tests/heal/surface_to_bezier/D7 b/tests/heal/surface_to_bezier/D7
index d812e172cc..20c753e5d6 100644
--- a/tests/heal/surface_to_bezier/D7
+++ b/tests/heal/surface_to_bezier/D7
@@ -1 +1 @@
-restore CIN001_a20.rle a
+restore [locate_data_file CIN001_a20.rle] a
diff --git a/tests/heal/surface_to_bezier/D8 b/tests/heal/surface_to_bezier/D8
index 1deece72b3..811a0ce57c 100644
--- a/tests/heal/surface_to_bezier/D8
+++ b/tests/heal/surface_to_bezier/D8
@@ -1 +1 @@
-restore CCH_testkhes.rle a
+restore [locate_data_file CCH_testkhes.rle] a
diff --git a/tests/heal/surface_to_bezier/D9 b/tests/heal/surface_to_bezier/D9
index a4eb3d2d15..7337eec622 100644
--- a/tests/heal/surface_to_bezier/D9
+++ b/tests/heal/surface_to_bezier/D9
@@ -1 +1 @@
-restore CIN001_b6.rle a
+restore [locate_data_file CIN001_b6.rle] a
diff --git a/tests/heal/surface_to_bezier/E1 b/tests/heal/surface_to_bezier/E1
index 799f3e3b6b..910333983c 100644
--- a/tests/heal/surface_to_bezier/E1
+++ b/tests/heal/surface_to_bezier/E1
@@ -1 +1 @@
-restore CIN900_buc60204.rle a
+restore [locate_data_file CIN900_buc60204.rle] a
diff --git a/tests/heal/surface_to_bezier/E2 b/tests/heal/surface_to_bezier/E2
index 648820f992..13b0c941bd 100644
--- a/tests/heal/surface_to_bezier/E2
+++ b/tests/heal/surface_to_bezier/E2
@@ -1 +1 @@
-restore CTO900_cts20124a.rle a
+restore [locate_data_file CTO900_cts20124a.rle] a
diff --git a/tests/heal/surface_to_bezier/E3 b/tests/heal/surface_to_bezier/E3
index 0d03c5fe3e..3a56303df6 100644
--- a/tests/heal/surface_to_bezier/E3
+++ b/tests/heal/surface_to_bezier/E3
@@ -1 +1 @@
-restore CTO900_ger60054a.rle a
+restore [locate_data_file CTO900_ger60054a.rle] a
diff --git a/tests/heal/surface_to_bezier/E4 b/tests/heal/surface_to_bezier/E4
index 415d4b75ef..384848a516 100644
--- a/tests/heal/surface_to_bezier/E4
+++ b/tests/heal/surface_to_bezier/E4
@@ -1 +1 @@
-restore CTO900_ger60224-part.rle a
+restore [locate_data_file CTO900_ger60224-part.rle] a
diff --git a/tests/heal/surface_to_bezier/E5 b/tests/heal/surface_to_bezier/E5
index 2af35f6066..3eae37a39d 100644
--- a/tests/heal/surface_to_bezier/E5
+++ b/tests/heal/surface_to_bezier/E5
@@ -1 +1 @@
-restore CTO900_ger60224c.rle a
+restore [locate_data_file CTO900_ger60224c.rle] a
diff --git a/tests/heal/surface_to_bezier/E6 b/tests/heal/surface_to_bezier/E6
index ea8d6f89e2..0620ed030f 100644
--- a/tests/heal/surface_to_bezier/E6
+++ b/tests/heal/surface_to_bezier/E6
@@ -1 +1 @@
-restore CTO901_cts20172_base.rle a
+restore [locate_data_file CTO901_cts20172_base.rle] a
diff --git a/tests/heal/surface_to_bezier/E7 b/tests/heal/surface_to_bezier/E7
index c015fb8c30..001b9d84fe 100644
--- a/tests/heal/surface_to_bezier/E7
+++ b/tests/heal/surface_to_bezier/E7
@@ -1 +1 @@
-restore CTO904_cts20148a.rle a
+restore [locate_data_file CTO904_cts20148a.rle] a
diff --git a/tests/heal/surface_to_bezier/E8 b/tests/heal/surface_to_bezier/E8
index fb5b6f3d37..ba77e445ed 100644
--- a/tests/heal/surface_to_bezier/E8
+++ b/tests/heal/surface_to_bezier/E8
@@ -1 +1 @@
-restore CTO904_cts20176a.rle a
+restore [locate_data_file CTO904_cts20176a.rle] a
diff --git a/tests/heal/surface_to_bezier/E9 b/tests/heal/surface_to_bezier/E9
index f4b2d5da4e..a654d96872 100644
--- a/tests/heal/surface_to_bezier/E9
+++ b/tests/heal/surface_to_bezier/E9
@@ -1 +1 @@
-restore CTO904_cts20974a.rle a
+restore [locate_data_file CTO904_cts20974a.rle] a
diff --git a/tests/heal/surface_to_bezier/F1 b/tests/heal/surface_to_bezier/F1
index 99c16f8ff0..85817a2321 100644
--- a/tests/heal/surface_to_bezier/F1
+++ b/tests/heal/surface_to_bezier/F1
@@ -1 +1 @@
-restore CHE_cc4.rle a
+restore [locate_data_file CHE_cc4.rle] a
diff --git a/tests/heal/surface_to_bezier/F2 b/tests/heal/surface_to_bezier/F2
index 281849c3c7..7f5a0b8568 100644
--- a/tests/heal/surface_to_bezier/F2
+++ b/tests/heal/surface_to_bezier/F2
@@ -1 +1 @@
-restore PRO17826.rle a
+restore [locate_data_file PRO17826.rle] a
diff --git a/tests/heal/surface_to_bezier/F3 b/tests/heal/surface_to_bezier/F3
index c26f605f3b..3f3d9b86d1 100644
--- a/tests/heal/surface_to_bezier/F3
+++ b/tests/heal/surface_to_bezier/F3
@@ -1 +1 @@
-restore PRO8434.rle a
+restore [locate_data_file PRO8434.rle] a
diff --git a/tests/heal/surface_to_bezier/F4 b/tests/heal/surface_to_bezier/F4
index 58a2364938..0970eaa0f5 100644
--- a/tests/heal/surface_to_bezier/F4
+++ b/tests/heal/surface_to_bezier/F4
@@ -1 +1 @@
-restore ma-test3.rle a
+restore [locate_data_file ma-test3.rle] a
diff --git a/tests/heal/surface_to_bezier/F5 b/tests/heal/surface_to_bezier/F5
index 3f3d076d14..644f2c193a 100644
--- a/tests/heal/surface_to_bezier/F5
+++ b/tests/heal/surface_to_bezier/F5
@@ -1 +1 @@
-restore ma-test5.rle a
+restore [locate_data_file ma-test5.rle] a
diff --git a/tests/heal/surface_to_bspline/A1 b/tests/heal/surface_to_bspline/A1
index 17fbfbef32..d4662f049e 100644
--- a/tests/heal/surface_to_bspline/A1
+++ b/tests/heal/surface_to_bspline/A1
@@ -1,2 +1,2 @@
 puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_2"
-restore aaa.rle a
+restore [locate_data_file aaa.rle] a
diff --git a/tests/heal/surface_to_bspline/A2 b/tests/heal/surface_to_bspline/A2
index a9f73ff6d9..3131dd4cc4 100644
--- a/tests/heal/surface_to_bspline/A2
+++ b/tests/heal/surface_to_bspline/A2
@@ -1 +1 @@
-restore BoxAndConeFS.rle a
+restore [locate_data_file BoxAndConeFS.rle] a
diff --git a/tests/heal/surface_to_bspline/A3 b/tests/heal/surface_to_bspline/A3
index 2667601065..af92437714 100644
--- a/tests/heal/surface_to_bspline/A3
+++ b/tests/heal/surface_to_bspline/A3
@@ -1 +1 @@
-restore boxFG.rle a
+restore [locate_data_file boxFG.rle] a
diff --git a/tests/heal/surface_to_bspline/A4 b/tests/heal/surface_to_bspline/A4
index 597ffb8079..e7227a2791 100644
--- a/tests/heal/surface_to_bspline/A4
+++ b/tests/heal/surface_to_bspline/A4
@@ -1 +1 @@
-restore BUC50070-#53168-good.rle a
+restore [locate_data_file BUC50070-#53168-good.rle] a
diff --git a/tests/heal/surface_to_bspline/A5 b/tests/heal/surface_to_bspline/A5
index 8f70847a78..fd91713184 100644
--- a/tests/heal/surface_to_bspline/A5
+++ b/tests/heal/surface_to_bspline/A5
@@ -1,2 +1,2 @@
 puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_1"
-restore cc.rle a
+restore [locate_data_file cc.rle] a
diff --git a/tests/heal/surface_to_bspline/A6 b/tests/heal/surface_to_bspline/A6
index dfd9758c5b..d5f8a969fc 100644
--- a/tests/heal/surface_to_bspline/A6
+++ b/tests/heal/surface_to_bspline/A6
@@ -1 +1 @@
-restore CCH_coco1.rle a
+restore [locate_data_file CCH_coco1.rle] a
diff --git a/tests/heal/surface_to_bspline/A7 b/tests/heal/surface_to_bspline/A7
index 1deece72b3..811a0ce57c 100644
--- a/tests/heal/surface_to_bspline/A7
+++ b/tests/heal/surface_to_bspline/A7
@@ -1 +1 @@
-restore CCH_testkhes.rle a
+restore [locate_data_file CCH_testkhes.rle] a
diff --git a/tests/heal/surface_to_bspline/A8 b/tests/heal/surface_to_bspline/A8
index d9edcaa23e..61864fb4d8 100644
--- a/tests/heal/surface_to_bspline/A8
+++ b/tests/heal/surface_to_bspline/A8
@@ -1 +1 @@
-restore CCV_2_i1_gtb.rle a
+restore [locate_data_file CCV_2_i1_gtb.rle] a
diff --git a/tests/heal/surface_to_bspline/A9 b/tests/heal/surface_to_bspline/A9
index 856d8f5792..cb13f98d9d 100644
--- a/tests/heal/surface_to_bspline/A9
+++ b/tests/heal/surface_to_bspline/A9
@@ -1 +1 @@
-restore CFE900_ger50gdb.rle a
+restore [locate_data_file CFE900_ger50gdb.rle] a
diff --git a/tests/heal/surface_to_bspline/B1 b/tests/heal/surface_to_bspline/B1
index 6b12ae0f3b..eec5e0c3c3 100644
--- a/tests/heal/surface_to_bspline/B1
+++ b/tests/heal/surface_to_bspline/B1
@@ -1 +1 @@
-restore CFE901_cts21gft.rle a
+restore [locate_data_file CFE901_cts21gft.rle] a
diff --git a/tests/heal/surface_to_bspline/B2 b/tests/heal/surface_to_bspline/B2
index 46b9927031..44b244ac2b 100644
--- a/tests/heal/surface_to_bspline/B2
+++ b/tests/heal/surface_to_bspline/B2
@@ -1 +1 @@
-restore CFI_5_l12fgq.rle a
+restore [locate_data_file CFI_5_l12fgq.rle] a
diff --git a/tests/heal/surface_to_bspline/B3 b/tests/heal/surface_to_bspline/B3
index 0b814a6b25..86c1ac62b1 100644
--- a/tests/heal/surface_to_bspline/B3
+++ b/tests/heal/surface_to_bspline/B3
@@ -1 +1 @@
-restore CFI_6_g56fhe.rle a
+restore [locate_data_file CFI_6_g56fhe.rle] a
diff --git a/tests/heal/surface_to_bspline/B4 b/tests/heal/surface_to_bspline/B4
index 3b8339947d..1b1b64cb5d 100644
--- a/tests/heal/surface_to_bspline/B4
+++ b/tests/heal/surface_to_bspline/B4
@@ -1 +1 @@
-restore CFI_8_i1_fia.rle a
+restore [locate_data_file CFI_8_i1_fia.rle] a
diff --git a/tests/heal/surface_to_bspline/B5 b/tests/heal/surface_to_bspline/B5
index a13c97e2dd..8141ff8ae0 100644
--- a/tests/heal/surface_to_bspline/B5
+++ b/tests/heal/surface_to_bspline/B5
@@ -1 +1 @@
-restore CFI_cfi90fjb.rle a
+restore [locate_data_file CFI_cfi90fjb.rle] a
diff --git a/tests/heal/surface_to_bspline/B6 b/tests/heal/surface_to_bspline/B6
index 9c974d0f1f..6a085b500b 100644
--- a/tests/heal/surface_to_bspline/B6
+++ b/tests/heal/surface_to_bspline/B6
@@ -1 +1 @@
-restore CFI_cts16288.rle a
+restore [locate_data_file CFI_cts16288.rle] a
diff --git a/tests/heal/surface_to_bspline/B7 b/tests/heal/surface_to_bspline/B7
index e1bd298fb7..89ca70f72d 100644
--- a/tests/heal/surface_to_bspline/B7
+++ b/tests/heal/surface_to_bspline/B7
@@ -1 +1 @@
-restore CFI_g1234fio.rle a
+restore [locate_data_file CFI_g1234fio.rle] a
diff --git a/tests/heal/surface_to_bspline/B8 b/tests/heal/surface_to_bspline/B8
index c44c4232f7..90f98a12c3 100644
--- a/tests/heal/surface_to_bspline/B8
+++ b/tests/heal/surface_to_bspline/B8
@@ -1 +1 @@
-restore CFI_g5678fip.rle a
+restore [locate_data_file CFI_g5678fip.rle] a
diff --git a/tests/heal/surface_to_bspline/B9 b/tests/heal/surface_to_bspline/B9
index ce9f7107bb..208cb65cf2 100644
--- a/tests/heal/surface_to_bspline/B9
+++ b/tests/heal/surface_to_bspline/B9
@@ -1 +1 @@
-restore CFI_n12__fiw.rle a
+restore [locate_data_file CFI_n12__fiw.rle] a
diff --git a/tests/heal/surface_to_bspline/C1 b/tests/heal/surface_to_bspline/C1
index 0a7b6da66b..b388ff189c 100644
--- a/tests/heal/surface_to_bspline/C1
+++ b/tests/heal/surface_to_bspline/C1
@@ -1 +1 @@
-restore CFI_o12__fix.rle a
+restore [locate_data_file CFI_o12__fix.rle] a
diff --git a/tests/heal/surface_to_bspline/C2 b/tests/heal/surface_to_bspline/C2
index fa2cf3a2d2..7799fbc318 100644
--- a/tests/heal/surface_to_bspline/C2
+++ b/tests/heal/surface_to_bspline/C2
@@ -1 +1 @@
-restore CFI_pro12305.rle a
+restore [locate_data_file CFI_pro12305.rle] a
diff --git a/tests/heal/surface_to_bspline/C3 b/tests/heal/surface_to_bspline/C3
index d683dc8f9e..c3577cef32 100644
--- a/tests/heal/surface_to_bspline/C3
+++ b/tests/heal/surface_to_bspline/C3
@@ -1 +1 @@
-restore CFI_pro12832.rle a
+restore [locate_data_file CFI_pro12832.rle] a
diff --git a/tests/heal/surface_to_bspline/C4 b/tests/heal/surface_to_bspline/C4
index c6ab5d2bad..7c510c3867 100644
--- a/tests/heal/surface_to_bspline/C4
+++ b/tests/heal/surface_to_bspline/C4
@@ -1 +1 @@
-restore CFI_pro14fjq.rle a
+restore [locate_data_file CFI_pro14fjq.rle] a
diff --git a/tests/heal/surface_to_bspline/C5 b/tests/heal/surface_to_bspline/C5
index e6c3c0c20c..4b4421c99e 100644
--- a/tests/heal/surface_to_bspline/C5
+++ b/tests/heal/surface_to_bspline/C5
@@ -1 +1 @@
-restore CFI_pro5807.rle a
+restore [locate_data_file CFI_pro5807.rle] a
diff --git a/tests/heal/surface_to_bspline/C6 b/tests/heal/surface_to_bspline/C6
index e90f1dcce0..00f9fd556f 100644
--- a/tests/heal/surface_to_bspline/C6
+++ b/tests/heal/surface_to_bspline/C6
@@ -1 +1 @@
-restore CFI_pro9480.rle a
+restore [locate_data_file CFI_pro9480.rle] a
diff --git a/tests/heal/surface_to_bspline/C7 b/tests/heal/surface_to_bspline/C7
index 99c16f8ff0..85817a2321 100644
--- a/tests/heal/surface_to_bspline/C7
+++ b/tests/heal/surface_to_bspline/C7
@@ -1 +1 @@
-restore CHE_cc4.rle a
+restore [locate_data_file CHE_cc4.rle] a
diff --git a/tests/heal/surface_to_bspline/C8 b/tests/heal/surface_to_bspline/C8
index 3ca4d98502..672ee3660a 100644
--- a/tests/heal/surface_to_bspline/C8
+++ b/tests/heal/surface_to_bspline/C8
@@ -1 +1 @@
-restore CHE_friteioa.rle a
+restore [locate_data_file CHE_friteioa.rle] a
diff --git a/tests/heal/surface_to_bspline/C9 b/tests/heal/surface_to_bspline/C9
index be071154ed..271ce484b7 100644
--- a/tests/heal/surface_to_bspline/C9
+++ b/tests/heal/surface_to_bspline/C9
@@ -1 +1 @@
-restore CNP002_projoieq.rle a
+restore [locate_data_file CNP002_projoieq.rle] a
diff --git a/tests/heal/surface_to_bspline/D1 b/tests/heal/surface_to_bspline/D1
index 78b7c78cd5..116844c0d6 100644
--- a/tests/heal/surface_to_bspline/D1
+++ b/tests/heal/surface_to_bspline/D1
@@ -1 +1 @@
-restore CTO900_buc60127-part.rle a
+restore [locate_data_file CTO900_buc60127-part.rle] a
diff --git a/tests/heal/surface_to_bspline/D2 b/tests/heal/surface_to_bspline/D2
index 0d142918eb..944d6e14f2 100644
--- a/tests/heal/surface_to_bspline/D2
+++ b/tests/heal/surface_to_bspline/D2
@@ -1 +1 @@
-restore CTO900_cts18078-part.rle a
+restore [locate_data_file CTO900_cts18078-part.rle] a
diff --git a/tests/heal/surface_to_bspline/D3 b/tests/heal/surface_to_bspline/D3
index d50e52b418..45bf4ca990 100644
--- a/tests/heal/surface_to_bspline/D3
+++ b/tests/heal/surface_to_bspline/D3
@@ -1 +1 @@
-restore CTO900_cts60005a.rle a
+restore [locate_data_file CTO900_cts60005a.rle] a
diff --git a/tests/heal/surface_to_bspline/D4 b/tests/heal/surface_to_bspline/D4
index 7854f28a5f..781dc13ec7 100644
--- a/tests/heal/surface_to_bspline/D4
+++ b/tests/heal/surface_to_bspline/D4
@@ -1 +1 @@
-restore CTO900_ger60039a.rle a
+restore [locate_data_file CTO900_ger60039a.rle] a
diff --git a/tests/heal/surface_to_bspline/D5 b/tests/heal/surface_to_bspline/D5
index 6bd2c606d8..80e27313b2 100644
--- a/tests/heal/surface_to_bspline/D5
+++ b/tests/heal/surface_to_bspline/D5
@@ -1 +1 @@
-restore CTO900_ger60041a.rle a
+restore [locate_data_file CTO900_ger60041a.rle] a
diff --git a/tests/heal/surface_to_bspline/D6 b/tests/heal/surface_to_bspline/D6
index 0d03c5fe3e..3a56303df6 100644
--- a/tests/heal/surface_to_bspline/D6
+++ b/tests/heal/surface_to_bspline/D6
@@ -1 +1 @@
-restore CTO900_ger60054a.rle a
+restore [locate_data_file CTO900_ger60054a.rle] a
diff --git a/tests/heal/surface_to_bspline/D7 b/tests/heal/surface_to_bspline/D7
index c730b337d5..37a1ea83d0 100644
--- a/tests/heal/surface_to_bspline/D7
+++ b/tests/heal/surface_to_bspline/D7
@@ -1 +1 @@
-restore CTS18683.rle a
+restore [locate_data_file CTS18683.rle] a
diff --git a/tests/heal/surface_to_bspline/D8 b/tests/heal/surface_to_bspline/D8
index 66217f59a3..de2a8d1dd9 100644
--- a/tests/heal/surface_to_bspline/D8
+++ b/tests/heal/surface_to_bspline/D8
@@ -1 +1 @@
-restore CTS18826.rle a
+restore [locate_data_file CTS18826.rle] a
diff --git a/tests/heal/surface_to_bspline/D9 b/tests/heal/surface_to_bspline/D9
index 78f84127f3..8374c60e9b 100644
--- a/tests/heal/surface_to_bspline/D9
+++ b/tests/heal/surface_to_bspline/D9
@@ -1 +1 @@
-restore CTS18868-1.rle a
+restore [locate_data_file CTS18868-1.rle] a
diff --git a/tests/heal/surface_to_bspline/E1 b/tests/heal/surface_to_bspline/E1
index 1efe381812..4968d571af 100644
--- a/tests/heal/surface_to_bspline/E1
+++ b/tests/heal/surface_to_bspline/E1
@@ -1 +1 @@
-restore CTS18868-2.rle a
+restore [locate_data_file CTS18868-2.rle] a
diff --git a/tests/heal/surface_to_bspline/E2 b/tests/heal/surface_to_bspline/E2
index 3d86f0609d..0a1f0185ed 100644
--- a/tests/heal/surface_to_bspline/E2
+++ b/tests/heal/surface_to_bspline/E2
@@ -1,2 +1,2 @@
 puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_2"
-restore DSE3.rle a
+restore [locate_data_file DSE3.rle] a
diff --git a/tests/heal/surface_to_bspline/E3 b/tests/heal/surface_to_bspline/E3
index 01667a6c87..a592e412fe 100644
--- a/tests/heal/surface_to_bspline/E3
+++ b/tests/heal/surface_to_bspline/E3
@@ -1 +1 @@
-restore DSEwithTol1.rle a
+restore [locate_data_file DSEwithTol1.rle] a
diff --git a/tests/heal/surface_to_bspline/E4 b/tests/heal/surface_to_bspline/E4
index a5dfa4b9fe..5acd96432c 100644
--- a/tests/heal/surface_to_bspline/E4
+++ b/tests/heal/surface_to_bspline/E4
@@ -1 +1 @@
-restore face.rle a
+restore [locate_data_file face.rle] a
diff --git a/tests/heal/surface_to_bspline/E5 b/tests/heal/surface_to_bspline/E5
index 65622edd2b..569e427a5a 100644
--- a/tests/heal/surface_to_bspline/E5
+++ b/tests/heal/surface_to_bspline/E5
@@ -1 +1 @@
-restore FG200.rle a
+restore [locate_data_file FG200.rle] a
diff --git a/tests/heal/surface_to_bspline/E6 b/tests/heal/surface_to_bspline/E6
index 9dc3ba62d9..28bee47700 100644
--- a/tests/heal/surface_to_bspline/E6
+++ b/tests/heal/surface_to_bspline/E6
@@ -1 +1 @@
-restore ForDSE.rle a
+restore [locate_data_file ForDSE.rle] a
diff --git a/tests/heal/surface_to_bspline/E7 b/tests/heal/surface_to_bspline/E7
index 62bc8f6da0..27d14ba445 100644
--- a/tests/heal/surface_to_bspline/E7
+++ b/tests/heal/surface_to_bspline/E7
@@ -1 +1 @@
-restore newFS.rle a
+restore [locate_data_file newFS.rle] a
diff --git a/tests/heal/surface_to_bspline/E8 b/tests/heal/surface_to_bspline/E8
index 81ff69fd71..6eab13647e 100644
--- a/tests/heal/surface_to_bspline/E8
+++ b/tests/heal/surface_to_bspline/E8
@@ -1 +1 @@
-restore pcpc2_FS_FG.rle a
+restore [locate_data_file pcpc2_FS_FG.rle] a
diff --git a/tests/heal/surface_to_bspline/E9 b/tests/heal/surface_to_bspline/E9
index b1b6f7ab23..f1b427765d 100644
--- a/tests/heal/surface_to_bspline/E9
+++ b/tests/heal/surface_to_bspline/E9
@@ -1 +1 @@
-restore PRO10066.rle a
+restore [locate_data_file PRO10066.rle] a
diff --git a/tests/heal/surface_to_bspline/F1 b/tests/heal/surface_to_bspline/F1
index 7549f4d2b3..9943256851 100644
--- a/tests/heal/surface_to_bspline/F1
+++ b/tests/heal/surface_to_bspline/F1
@@ -1 +1 @@
-restore RevolutionFG.rle a
+restore [locate_data_file RevolutionFG.rle] a
diff --git a/tests/heal/surface_to_bspline/F2 b/tests/heal/surface_to_bspline/F2
index af0ff19cb5..8b17d3a08a 100644
--- a/tests/heal/surface_to_bspline/F2
+++ b/tests/heal/surface_to_bspline/F2
@@ -1,2 +1,2 @@
 puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_2"
-restore rrr.rle a
+restore [locate_data_file rrr.rle] a
diff --git a/tests/heal/surface_to_bspline/F3 b/tests/heal/surface_to_bspline/F3
index 5fa2fa879b..703960a987 100644
--- a/tests/heal/surface_to_bspline/F3
+++ b/tests/heal/surface_to_bspline/F3
@@ -1 +1 @@
-restore sh.rle a
+restore [locate_data_file sh.rle] a
diff --git a/tests/heal/surface_to_bspline/F4 b/tests/heal/surface_to_bspline/F4
index 627c7d12bf..072920f211 100644
--- a/tests/heal/surface_to_bspline/F4
+++ b/tests/heal/surface_to_bspline/F4
@@ -1 +1 @@
-restore shell_orient.rle a
+restore [locate_data_file shell_orient.rle] a
diff --git a/tests/heal/surface_to_bspline/F5 b/tests/heal/surface_to_bspline/F5
index b551f22f85..fe54bbfae4 100644
--- a/tests/heal/surface_to_bspline/F5
+++ b/tests/heal/surface_to_bspline/F5
@@ -1 +1 @@
-restore spheraDSE.rle a
+restore [locate_data_file spheraDSE.rle] a
diff --git a/tests/heal/surface_to_bspline/F6 b/tests/heal/surface_to_bspline/F6
index d461a46aff..77a7e18edf 100644
--- a/tests/heal/surface_to_bspline/F6
+++ b/tests/heal/surface_to_bspline/F6
@@ -1 +1 @@
-restore 1-Ring.brep a
+restore [locate_data_file 1-Ring.brep] a
diff --git a/tests/heal/surface_to_bspline/F7 b/tests/heal/surface_to_bspline/F7
index a794229bc3..ee06bd100e 100644
--- a/tests/heal/surface_to_bspline/F7
+++ b/tests/heal/surface_to_bspline/F7
@@ -1 +1 @@
-restore bottle.brep a
+restore [locate_data_file bottle.brep] a
diff --git a/tests/heal/surface_to_bspline/F8 b/tests/heal/surface_to_bspline/F8
index ab65b95df8..ac427e0cf0 100644
--- a/tests/heal/surface_to_bspline/F8
+++ b/tests/heal/surface_to_bspline/F8
@@ -1 +1 @@
-restore bowl_noremove.brep a
+restore [locate_data_file bowl_noremove.brep] a
diff --git a/tests/heal/surface_to_bspline/F9 b/tests/heal/surface_to_bspline/F9
index 4e8626d92a..7a6d9703cc 100644
--- a/tests/heal/surface_to_bspline/F9
+++ b/tests/heal/surface_to_bspline/F9
@@ -1 +1 @@
-restore ec281.brep a
+restore [locate_data_file ec281.brep] a
diff --git a/tests/heal/surface_to_bspline/G1 b/tests/heal/surface_to_bspline/G1
index 9b05a52037..1f23710992 100644
--- a/tests/heal/surface_to_bspline/G1
+++ b/tests/heal/surface_to_bspline/G1
@@ -1 +1 @@
-restore ec2820.brep a
+restore [locate_data_file ec2820.brep] a
diff --git a/tests/heal/surface_to_bspline/G2 b/tests/heal/surface_to_bspline/G2
index f42570c022..2e216bc34e 100644
--- a/tests/heal/surface_to_bspline/G2
+++ b/tests/heal/surface_to_bspline/G2
@@ -1 +1 @@
-restore Fourche7corrige.brep a
+restore [locate_data_file Fourche7corrige.brep] a
diff --git a/tests/heal/surface_to_bspline/G3 b/tests/heal/surface_to_bspline/G3
index 1faa887ca8..34e5d7cc21 100644
--- a/tests/heal/surface_to_bspline/G3
+++ b/tests/heal/surface_to_bspline/G3
@@ -1 +1 @@
-restore hammer.brep a
+restore [locate_data_file hammer.brep] a
diff --git a/tests/heal/surface_to_bspline/G4 b/tests/heal/surface_to_bspline/G4
index d7d309d1ec..bc71297b39 100644
--- a/tests/heal/surface_to_bspline/G4
+++ b/tests/heal/surface_to_bspline/G4
@@ -1 +1 @@
-restore seadoo_base.brep a
+restore [locate_data_file seadoo_base.brep] a
diff --git a/tests/mesh/begin b/tests/mesh/begin
index 0dde554917..5d6a7d4ad4 100755
--- a/tests/mesh/begin
+++ b/tests/mesh/begin
@@ -1,7 +1,3 @@
-if { [string compare [datadir] "."] == 0 } {
-   datadir "[file dirname [info script]]/data"
-}
-
 set Deflection 0.1
 set percent_max 5.
 
diff --git a/tests/mesh/data/standard/K2 b/tests/mesh/data/standard/K2
index a52b01698a..8b364f346a 100755
--- a/tests/mesh/data/standard/K2
+++ b/tests/mesh/data/standard/K2
@@ -1,2 +1,4 @@
 set TheFileName shading_092.brep
-set count_parallel 1000
+# count_parallel variable was used in order to control instability in parallel incmesh algorithm.
+# It is not needed anymore
+#set count_parallel 1000
diff --git a/tests/mesh/data/standard/R3 b/tests/mesh/data/standard/R3
index 10e935b5ce..7571074cfa 100755
--- a/tests/mesh/data/standard/R3
+++ b/tests/mesh/data/standard/R3
@@ -1,2 +1,4 @@
 set TheFileName shading_156.brep
-set count_parallel 1000
+# count_parallel variable was used in order to control instability in parallel incmesh algorithm.
+# It is not needed anymore
+#set count_parallel 1000
diff --git a/tests/mesh/data/standard/X3 b/tests/mesh/data/standard/X3
index a3b3f8e35e..625a2abf72 100644
--- a/tests/mesh/data/standard/X3
+++ b/tests/mesh/data/standard/X3
@@ -1,5 +1,5 @@
 set TheFileName ""
 
-restore OCC358a.brep f
-restore OCC358b.brep w
+restore [locate_data_file OCC358a.brep] f
+restore [locate_data_file OCC358b.brep] w
 pipe res w f
diff --git a/tests/mesh/end b/tests/mesh/end
index 5602e3620a..c4cf67f614 100644
--- a/tests/mesh/end
+++ b/tests/mesh/end
@@ -3,13 +3,13 @@
 if { [string compare ${TheFileName} ""] != 0 } {
     set is_brep [regexp "\.brep" $TheFileName]
     if {$is_brep == 1} {
-        puts [brestore [datadir]/${TheFileName} res]
+        puts [brestore [locate_data_file ${TheFileName}] res]
     } else {
         if { [array get Draw_Groups "DE: STEP"] == "" } {
 	    pload XDE
         }
         
-        stepread [datadir]/${TheFileName} a *
+        stepread [locate_data_file ${TheFileName}] a *
         tpcompound res
     }
 }
@@ -30,17 +30,6 @@ if { [string compare $command "incmesh"] == 0 } {
     if {[array get env os_type] != ""} {
 	set os $env(os_type)
     }
-    if { $parallel == 1 && [regexp {Windows} $os] == 0 && [string compare $group "standard"] == 0 } {
-        puts "TODO ?#23260 $os: An exception was caught"
-        puts "TODO ?#23260 $os: \\*\\* Exception \\*\\*"
-        puts "TODO ?#23260 $os: TEST INCOMPLETE"
-	if { [string compare $bug_freelinks ""] == 0 } {
-	    puts "TODO ?#23260 $os: Error: Free links:"
-	}
-	if { [string compare $bug_area ""] == 0 } {
-	    puts "TODO ?#23260 $os: Error   : area by triangles differs from true area by"
-	}
-    }
     if { $parallel != 1 || [info exists count_parallel] == 0 } {
        set count_parallel 1
     }
diff --git a/tests/mkface/after_offset/B6 b/tests/mkface/after_offset/B6
index ead2086ad7..1256234557 100644
--- a/tests/mkface/after_offset/B6
+++ b/tests/mkface/after_offset/B6
@@ -1,4 +1,4 @@
-restore bs_s_np_r a
+restore [locate_data_file bs_s_np_r] a
 offset r a 3
 set MaxFTol 9.9999999999999995e-08
 set MaxETol 6.4872185770379736e-07
diff --git a/tests/mkface/after_offset/B7 b/tests/mkface/after_offset/B7
index 4f930da7f7..8f81ef95d7 100644
--- a/tests/mkface/after_offset/B7
+++ b/tests/mkface/after_offset/B7
@@ -1,4 +1,4 @@
-restore bs_s_np_r a
+restore [locate_data_file bs_s_np_r] a
 offset a_of a 3
 offset r a_of 3
 set MaxFTol 9.9999999999999995e-08
diff --git a/tests/mkface/after_offset/B8 b/tests/mkface/after_offset/B8
index 86cee3dadd..8f02cc2451 100644
--- a/tests/mkface/after_offset/B8
+++ b/tests/mkface/after_offset/B8
@@ -1,4 +1,4 @@
-restore bs_s_np_nr a
+restore [locate_data_file bs_s_np_nr] a
 offset r a 3
 set MaxFTol 9.9999999999999995e-08
 set MaxETol 6.087704510617566e-07
diff --git a/tests/mkface/after_offset/B9 b/tests/mkface/after_offset/B9
index 979883aca5..adfd393bfc 100644
--- a/tests/mkface/after_offset/B9
+++ b/tests/mkface/after_offset/B9
@@ -1,4 +1,4 @@
-restore bs_s_np_nr a
+restore [locate_data_file bs_s_np_nr] a
 offset a_of a 3
 offset r a_of 3
 set MaxFTol 9.9999999999999995e-08
diff --git a/tests/mkface/after_offset/C1 b/tests/mkface/after_offset/C1
index afd230182c..0e17955bb7 100644
--- a/tests/mkface/after_offset/C1
+++ b/tests/mkface/after_offset/C1
@@ -1,4 +1,4 @@
-restore bs_s_p_nr a
+restore [locate_data_file bs_s_p_nr] a
 offset r a 3
 set MaxFTol 9.9999999999999995e-08
 set MaxETol 6.3134781826794206e-07
diff --git a/tests/mkface/after_offset/C2 b/tests/mkface/after_offset/C2
index 73fc046285..4f35c2c323 100644
--- a/tests/mkface/after_offset/C2
+++ b/tests/mkface/after_offset/C2
@@ -1,4 +1,4 @@
-restore bs_s_p_nr a
+restore [locate_data_file bs_s_p_nr] a
 offset a_of a 3
 offset r a_of 3
 set MaxFTol 9.9999999999999995e-08
diff --git a/tests/mkface/after_trim/B6 b/tests/mkface/after_trim/B6
index 825c143d59..2cf7d7634b 100644
--- a/tests/mkface/after_trim/B6
+++ b/tests/mkface/after_trim/B6
@@ -1,4 +1,4 @@
-restore bs_s_np_r a
+restore [locate_data_file bs_s_np_r] a
 trim r a 0.5 0.8 0.5 0.8
 set MaxFTol 9.9999999999999995e-08
 set MaxETol 9.9999999999999995e-08
diff --git a/tests/mkface/after_trim/B7 b/tests/mkface/after_trim/B7
index 1275dcceb2..811d3f0f7b 100644
--- a/tests/mkface/after_trim/B7
+++ b/tests/mkface/after_trim/B7
@@ -1,4 +1,4 @@
-restore bs_s_np_r a
+restore [locate_data_file bs_s_np_r] a
 trim a_tr a 0.5 0.8 0.5 0.8
 trim r a_tr 0.3 0.5 0.3 0.5
 set MaxFTol 9.9999999999999995e-08
diff --git a/tests/mkface/after_trim/B8 b/tests/mkface/after_trim/B8
index e980b77ecd..2a8537916f 100644
--- a/tests/mkface/after_trim/B8
+++ b/tests/mkface/after_trim/B8
@@ -1,4 +1,4 @@
-restore bs_s_np_nr a
+restore [locate_data_file bs_s_np_nr] a
 trim r a 0.5 0.8 0.5 0.8
 set MaxFTol 9.9999999999999995e-08
 set MaxETol 9.9999999999999995e-08
diff --git a/tests/mkface/after_trim/B9 b/tests/mkface/after_trim/B9
index a0be65be7b..ef07a12e67 100644
--- a/tests/mkface/after_trim/B9
+++ b/tests/mkface/after_trim/B9
@@ -1,4 +1,4 @@
-restore bs_s_np_nr a
+restore [locate_data_file bs_s_np_nr] a
 trim a_tr a 0.5 0.8 0.5 0.8
 trim r a_tr 0.3 0.5 0.3 0.5
 set MaxFTol 9.9999999999999995e-08
diff --git a/tests/mkface/after_trim/C1 b/tests/mkface/after_trim/C1
index 6bb59eeee4..8048d53230 100644
--- a/tests/mkface/after_trim/C1
+++ b/tests/mkface/after_trim/C1
@@ -1,4 +1,4 @@
-restore bs_s_p_nr a
+restore [locate_data_file bs_s_p_nr] a
 trim r a 0.5 0.8 0.5 0.8
 set MaxFTol 9.9999999999999995e-08
 set MaxETol 9.9999999999999995e-08
diff --git a/tests/mkface/after_trim/C2 b/tests/mkface/after_trim/C2
index e5e41205c0..2e51e81cef 100644
--- a/tests/mkface/after_trim/C2
+++ b/tests/mkface/after_trim/C2
@@ -1,4 +1,4 @@
-restore bs_s_p_nr a
+restore [locate_data_file bs_s_p_nr] a
 trim a_tr a 0.5 0.8 0.5 0.8
 trim r a_tr 0.3 0.5 0.3 0.5
 set MaxFTol 9.9999999999999995e-08
diff --git a/tests/mkface/after_trim/C3 b/tests/mkface/after_trim/C3
index 179488e63e..f96ec21549 100644
--- a/tests/mkface/after_trim/C3
+++ b/tests/mkface/after_trim/C3
@@ -1,4 +1,4 @@
-restore bs_s_p_r a
+restore [locate_data_file bs_s_p_r] a
 trim r a 0.5 0.8 0.5 0.8
 set MaxFTol 9.9999999999999995e-08
 set MaxETol 9.9999999999999995e-08
diff --git a/tests/mkface/after_trim/C4 b/tests/mkface/after_trim/C4
index e96d92a506..dbe392d69a 100644
--- a/tests/mkface/after_trim/C4
+++ b/tests/mkface/after_trim/C4
@@ -1,4 +1,4 @@
-restore bs_s_p_r a
+restore [locate_data_file bs_s_p_r] a
 trim a_tr a 0.5 0.8 0.5 0.8
 trim r a_tr 0.3 0.5 0.3 0.5
 set MaxFTol 9.9999999999999995e-08
diff --git a/tests/mkface/begin b/tests/mkface/begin
index c9e93028d3..2b5c08f6a9 100755
--- a/tests/mkface/begin
+++ b/tests/mkface/begin
@@ -2,10 +2,6 @@
 # To prevent loops limit to 10 minutes
 cpulimit 600
 
-if {[string compare [datadir] "."] == 0} { 
-   datadir [file dirname [info script]]/data
-}
-
 if { [array get Draw_Groups "TOPOLOGY Feature commands"] == "" } {
 	pload TOPTEST
 }
diff --git a/tests/mkface/mkplane/A1 b/tests/mkface/mkplane/A1
old mode 100755
new mode 100644
index d7518c0369..4aae3a787a
--- a/tests/mkface/mkplane/A1
+++ b/tests/mkface/mkplane/A1
@@ -1,6 +1,6 @@
 puts "TODO #23240 ALL: Faulty shapes in variables faulty_1 to faulty_2"
 
-restore pro6668a.rle a
+restore [locate_data_file pro6668a.rle] a
 explode a e
 
 wire w a_1 a_2 a_3 a_4 a_5 a_6 a_7 a_8 a_9 a_10 a_11 a_12 a_13 a_14 a_15 a_16
diff --git a/tests/nproject/base/A1 b/tests/nproject/base/A1
old mode 100755
new mode 100644
index 3c4ad23a4f..9c3df852a5
--- a/tests/nproject/base/A1
+++ b/tests/nproject/base/A1
@@ -1,4 +1,4 @@
-restore projortho001.brep p 
+restore [locate_data_file projortho001.brep] p 
 explode p
 compound p_2 p_3 c 
 nproject result c p_1 0.001 2 14 10
diff --git a/tests/nproject/base/A2 b/tests/nproject/base/A2
old mode 100755
new mode 100644
index d426930663..13e3b79763
--- a/tests/nproject/base/A2
+++ b/tests/nproject/base/A2
@@ -1,4 +1,4 @@
-restore projortho002.brep p 
+restore [locate_data_file projortho002.brep] p 
 explode p
 compound p_2 p_3 s 
 nproject result s p_1 0.001 2 14 10
diff --git a/tests/nproject/base/A3 b/tests/nproject/base/A3
old mode 100755
new mode 100644
index 2b575bdca9..b753a26ab0
--- a/tests/nproject/base/A3
+++ b/tests/nproject/base/A3
@@ -1,4 +1,4 @@
-restore projortho003.brep p 
+restore [locate_data_file projortho003.brep] p 
 explode p
 nproject result p_1 p_2 0.001 2 14 10
 set length 581.299
diff --git a/tests/nproject/base/A4 b/tests/nproject/base/A4
old mode 100755
new mode 100644
index 88ee76ca87..95faee78ca
--- a/tests/nproject/base/A4
+++ b/tests/nproject/base/A4
@@ -1,4 +1,4 @@
-restore projortho004.brep p 
+restore [locate_data_file projortho004.brep] p 
 explode p
 nproject result p_1 p_2 0.001 2 14 10
 set length 300
diff --git a/tests/nproject/base/A5 b/tests/nproject/base/A5
old mode 100755
new mode 100644
index 9f8c4d0b4f..705418844f
--- a/tests/nproject/base/A5
+++ b/tests/nproject/base/A5
@@ -1,4 +1,4 @@
-restore projortho005.brep p 
+restore [locate_data_file projortho005.brep] p 
 explode p
 compound p_1 p_2 c
 nproject result p_3 c 0.001 2 14 10
diff --git a/tests/nproject/base/A6 b/tests/nproject/base/A6
old mode 100755
new mode 100644
index 6d3eb6ee07..85bf1a7d4a
--- a/tests/nproject/base/A6
+++ b/tests/nproject/base/A6
@@ -1,4 +1,4 @@
-restore projortho006.brep p 
+restore [locate_data_file projortho006.brep] p 
 explode p
 compound p_1 p_2 p_3 p_4 p_5 p_6 p_7 p_8 p_9 p_10 p_11 p_12 p_13 c
 nproject result c p_14 0.001 2 14 10
diff --git a/tests/nproject/base/A7 b/tests/nproject/base/A7
old mode 100755
new mode 100644
index 74116723ef..e01352c226
--- a/tests/nproject/base/A7
+++ b/tests/nproject/base/A7
@@ -1,4 +1,4 @@
-restore projortho007.brep p 
+restore [locate_data_file projortho007.brep] p 
 explode p
 compound p_2 p_3 c
 nproject result c p_1 0.001 2 14 10
diff --git a/tests/nproject/base/A8 b/tests/nproject/base/A8
old mode 100755
new mode 100644
index e194138349..7fd000b3f1
--- a/tests/nproject/base/A8
+++ b/tests/nproject/base/A8
@@ -1,4 +1,4 @@
-restore projortho008.brep p 
+restore [locate_data_file projortho008.brep] p 
 explode p
 compound p_4 p_5 c1
 compound p_1 p_2 p_6 p_7 p_3 p_8 c2
diff --git a/tests/nproject/begin b/tests/nproject/begin
index 92c84f28f5..f49fc763cd 100644
--- a/tests/nproject/begin
+++ b/tests/nproject/begin
@@ -4,10 +4,6 @@ if { [array get Draw_Groups "TOPOLOGY Check commands"] == "" } {
 # To prevent loops limit to 10 minutes
 cpulimit 600
 
-if {[string compare [datadir] "."] == 0} { 
-   datadir [file dirname [info script]]/data
-}
-  
 if { [info exists imagedir] == 0 } {
    set imagedir .
 }
diff --git a/tests/offset/begin b/tests/offset/begin
index e52e4b627c..ccb399247a 100644
--- a/tests/offset/begin
+++ b/tests/offset/begin
@@ -1,10 +1,6 @@
 # To prevent loops limit to 10 minutes
 cpulimit 600
 
-if { [string compare [datadir] "."] == 0 } {
-   datadir [file dirname [info script]]/data
-}
-
 if { [array get Draw_Groups "TOPOLOGY Feature commands"] == "" } {
 	pload TOPTEST
 }
diff --git a/tests/offset/compshape/A1 b/tests/offset/compshape/A1
index b81b620906..5fdba5cdae 100644
--- a/tests/offset/compshape/A1
+++ b/tests/offset/compshape/A1
@@ -4,7 +4,7 @@
 ## Comment : From CV tests serie page 56
 ## ======================================
 
-restore 2_A1.rle s
+restore [locate_data_file 2_A1.rle] s
 explode s F
 offsetcompshape result s -10 s_1
 
diff --git a/tests/offset/compshape/A2 b/tests/offset/compshape/A2
index 17b39df30c..1296af70dd 100644
--- a/tests/offset/compshape/A2
+++ b/tests/offset/compshape/A2
@@ -4,7 +4,7 @@
 ## Comment : From CV tests serie page 57
 ## ======================================
 
-restore 2_B1.rle s
+restore [locate_data_file 2_B1.rle] s
 explode s F
 offsetcompshape result s -10 s_10
 
diff --git a/tests/offset/compshape/A3 b/tests/offset/compshape/A3
index 799f48c86b..270c679fd9 100644
--- a/tests/offset/compshape/A3
+++ b/tests/offset/compshape/A3
@@ -7,7 +7,7 @@
 puts "TODO ?OCC22740 ALL:Error\\s*:\\s*The offset is not valid. The volume is"
 puts "TODO ?OCC23068 ALL:Error\\s*:\\s*.*The volume"
 
-restore 2_C1.rle s
+restore [locate_data_file 2_C1.rle] s
 explode s F
 catch {offsetcompshape result s -10 s_8 s_10}
 
diff --git a/tests/offset/compshape/A4 b/tests/offset/compshape/A4
index 41f5e52e46..dd67c30ab6 100644
--- a/tests/offset/compshape/A4
+++ b/tests/offset/compshape/A4
@@ -9,7 +9,7 @@ puts "TODO OCC22740 ALL: An exception was caught"
 puts "TODO OCC22740 ALL: \\*\\* Exception \\*\\*"
 puts "TODO OCC22740 ALL: Error : The offset can not be build"
 
-restore 2_D1.rle s
+restore [locate_data_file 2_D1.rle] s
 explode s F
 catch {offsetcompshape result s -2 s_17}
 
diff --git a/tests/offset/compshape/A5 b/tests/offset/compshape/A5
index d5e7b7559b..3a139603d3 100644
--- a/tests/offset/compshape/A5
+++ b/tests/offset/compshape/A5
@@ -4,7 +4,7 @@
 ## Comment : From CV tests serie page 61/62
 ## ======================================
 
-restore 2_E1.rle s
+restore [locate_data_file 2_E1.rle] s
 explode s F
 offsetcompshape result s -3 s_2
 
diff --git a/tests/offset/compshape/A6 b/tests/offset/compshape/A6
index e610cc983b..2682bf866f 100644
--- a/tests/offset/compshape/A6
+++ b/tests/offset/compshape/A6
@@ -4,7 +4,7 @@
 ## Comment : From CV tests serie page 63
 ## ======================================
 
-restore 2_F1.rle s
+restore [locate_data_file 2_F1.rle] s
 explode s F
 offsetcompshape result s -5 s_10
 
diff --git a/tests/offset/compshape/A7 b/tests/offset/compshape/A7
index 99ee582c72..fcf1982686 100644
--- a/tests/offset/compshape/A7
+++ b/tests/offset/compshape/A7
@@ -4,7 +4,7 @@
 ## Comment : From CV tests serie page 64
 ## ======================================
 
-restore 2_G1.rle s
+restore [locate_data_file 2_G1.rle] s
 explode s F
 offsetcompshape result s -5 s_7
 
diff --git a/tests/offset/faces_type_a/A1 b/tests/offset/faces_type_a/A1
index c74f1f9c32..7c1fbf0e6d 100644
--- a/tests/offset/faces_type_a/A1
+++ b/tests/offset/faces_type_a/A1
@@ -1,6 +1,6 @@
 #old file filtercb
 
-restore filter s
+restore [locate_data_file filter] s
 OFFSETSHAPE -.0015 {s_26 s_27 s_28 s_29} $calcul $type
 
 set volume 6.38048e-05
diff --git a/tests/offset/faces_type_a/A2 b/tests/offset/faces_type_a/A2
index 1decd6a374..b365d145d9 100644
--- a/tests/offset/faces_type_a/A2
+++ b/tests/offset/faces_type_a/A2
@@ -3,7 +3,7 @@ puts "TODO OCC23068 ALL: \\*\\* Exception \\*\\*"
 puts "TODO OCC23068 ALL: TEST INCOMPLETE"
 #old file fritesb
 
-restore fritehaut s
+restore [locate_data_file fritehaut] s
 OFFSETSHAPE -.004 {s_3} $calcul $type
 
 
diff --git a/tests/offset/faces_type_a/A3 b/tests/offset/faces_type_a/A3
index 875dcc050d..a6c0d967b0 100644
--- a/tests/offset/faces_type_a/A3
+++ b/tests/offset/faces_type_a/A3
@@ -1,6 +1,6 @@
 #old file ofcb19
 
-restore bb17 s
+restore [locate_data_file bb17] s
 OFFSETSHAPE -0.04 {s_4 s_9 s_3 s_5 s_2 s_7 s_11} $calcul $type
 
 set volume 0.182288
diff --git a/tests/offset/faces_type_a/A4 b/tests/offset/faces_type_a/A4
index ed7db36903..049a4d27ab 100644
--- a/tests/offset/faces_type_a/A4
+++ b/tests/offset/faces_type_a/A4
@@ -1,6 +1,6 @@
 #old file ofcb23
 
-restore cc3 s
+restore [locate_data_file cc3] s
 OFFSETSHAPE -0.01 {s_6} $calcul $type
 
 set volume 0.0228808
diff --git a/tests/offset/faces_type_a/A5 b/tests/offset/faces_type_a/A5
index bb35719172..8b7b90fd06 100644
--- a/tests/offset/faces_type_a/A5
+++ b/tests/offset/faces_type_a/A5
@@ -1,6 +1,6 @@
 #old file ofcb26
 
-restore bb26 s
+restore [locate_data_file bb26] s
 OFFSETSHAPE -0.1 {s_4} $calcul $type
 
 set volume 0.391709
diff --git a/tests/offset/faces_type_a/A6 b/tests/offset/faces_type_a/A6
index bd42f116ae..b5a1514b64 100644
--- a/tests/offset/faces_type_a/A6
+++ b/tests/offset/faces_type_a/A6
@@ -1,6 +1,6 @@
 #old file ofcbborne
 
-restore borne s
+restore [locate_data_file borne] s
 OFFSETSHAPE -0.1 {s_2 s_3} $calcul $type
 
 set volume 0.47668
diff --git a/tests/offset/faces_type_a/A7 b/tests/offset/faces_type_a/A7
index d68f54b4bf..f39fdedbeb 100644
--- a/tests/offset/faces_type_a/A7
+++ b/tests/offset/faces_type_a/A7
@@ -1,6 +1,6 @@
 #old file ofsb2
 
-restore bb2 s
+restore [locate_data_file bb2] s
 OFFSETSHAPE -0.1 {s_8} $calcul $type
 
 set volume 0.982069
diff --git a/tests/offset/faces_type_a/A8 b/tests/offset/faces_type_a/A8
index 926a7a29d5..29c83733f7 100644
--- a/tests/offset/faces_type_a/A8
+++ b/tests/offset/faces_type_a/A8
@@ -1,6 +1,6 @@
 #old file ofsb15
 
-restore bb15 s
+restore [locate_data_file bb15] s
 OFFSETSHAPE -0.1 {s_8 s_7} $calcul $type
 
 set volume 4.50601
diff --git a/tests/offset/faces_type_a/A9 b/tests/offset/faces_type_a/A9
index 17e7470607..7ccc19a7eb 100644
--- a/tests/offset/faces_type_a/A9
+++ b/tests/offset/faces_type_a/A9
@@ -1,6 +1,6 @@
 #old file ofsb20
 
-restore bb20 s
+restore [locate_data_file bb20] s
 OFFSETSHAPE -0.1 {s_4 s_7} $calcul $type
 
 set volume 0.491586
diff --git a/tests/offset/faces_type_a/B1 b/tests/offset/faces_type_a/B1
index 66cee6d0a8..f480624978 100644
--- a/tests/offset/faces_type_a/B1
+++ b/tests/offset/faces_type_a/B1
@@ -1,6 +1,6 @@
 #old file ofscb16
 
-restore vevopar s
+restore [locate_data_file vevopar] s
 OFFSETSHAPE -0.3 {s_5 s_11 s_3 s_7 s_8 s_9} $calcul $type
 
 set volume 0.707259
diff --git a/tests/offset/faces_type_i/E9 b/tests/offset/faces_type_i/E9
index a3661b5fab..a43a438cdb 100644
--- a/tests/offset/faces_type_i/E9
+++ b/tests/offset/faces_type_i/E9
@@ -11,7 +11,7 @@ if {
     || [string compare $os "Mandriva2010"   ] == 0
     || [string compare $os "Mandriva2010-64"] == 0
     || [string compare $os "SUSE10-64"] == 0
-    || [regexp {Windows} $os] == 1
+    || [regexp -nocase {Windows} $os] == 1
    } {
   puts "TODO OCC23068 $os: An exception was caught"
   puts "TODO OCC23068 $os: \\*\\* Exception \\*\\*"
diff --git a/tests/offset/shape/A1 b/tests/offset/shape/A1
index 7a0b3b0ad8..d113c10ce4 100644
--- a/tests/offset/shape/A1
+++ b/tests/offset/shape/A1
@@ -2,7 +2,7 @@ puts "TODO OCC23068 ALL: Error : The offset is not valid"
 # Original bug : hkg60144
 # Date : 17Juillet98
 
-restore  hkg60144a.rle s
+restore [locate_data_file hkg60144a.rle] s
 explode s f
 
 offsetshape result s -5 s_1
diff --git a/tests/offset/shape/A2 b/tests/offset/shape/A2
index 35c02ff79a..2776d75e8d 100644
--- a/tests/offset/shape/A2
+++ b/tests/offset/shape/A2
@@ -4,7 +4,7 @@ puts "TODO OCC23068 ALL: TEST INCOMPLETE"
 # Original bug : hkg60144/pro15325
 # Date : 17Juillet98
 
-restore  hkg60144b.rle s
+restore [locate_data_file hkg60144b.rle] s
 explode s f
 
 offsetshape result s -5 s_1
diff --git a/tests/offset/shape/A3 b/tests/offset/shape/A3
index cdaa0382a2..edfc5d92ae 100644
--- a/tests/offset/shape/A3
+++ b/tests/offset/shape/A3
@@ -4,7 +4,7 @@ puts "TODO OCC23068 ALL: TEST INCOMPLETE"
 # Original bug : cts21271
 # Date : 11Sept98
 
-restore cts21271.rle s
+restore [locate_data_file cts21271.rle] s
 explode s f
 
 ## leaving out bottom face s_35
diff --git a/tests/offset/shape_type_a/A1 b/tests/offset/shape_type_a/A1
index df40872b8c..ba50a95be6 100644
--- a/tests/offset/shape_type_a/A1
+++ b/tests/offset/shape_type_a/A1
@@ -1,6 +1,6 @@
 #old file ofc22
 
-restore cc2 s
+restore [locate_data_file cc2] s
 OFFSETSHAPE 0.01 {} $calcul $type
 
 set volume 0.0709583
diff --git a/tests/offset/shape_type_a/A2 b/tests/offset/shape_type_a/A2
index 3cffbe5144..63adc738b7 100644
--- a/tests/offset/shape_type_a/A2
+++ b/tests/offset/shape_type_a/A2
@@ -1,5 +1,5 @@
 #old file ofc25
-restore bb60 s
+restore [locate_data_file bb60] s
 OFFSETSHAPE 0.37 {} $calcul $type
 
 set volume 30.1125
diff --git a/tests/offset/shape_type_a/A3 b/tests/offset/shape_type_a/A3
index 56b00a988c..f85d3cc4e7 100644
--- a/tests/offset/shape_type_a/A3
+++ b/tests/offset/shape_type_a/A3
@@ -1,6 +1,6 @@
 #old file ofs2
 
-restore bb2 s
+restore [locate_data_file bb2] s
 OFFSETSHAPE -0.1 {} $calcul $type
 
 set volume 1.79372
diff --git a/tests/offset/shape_type_a/A4 b/tests/offset/shape_type_a/A4
index 42891518e0..e5c7918b99 100644
--- a/tests/offset/shape_type_a/A4
+++ b/tests/offset/shape_type_a/A4
@@ -1,6 +1,6 @@
 #old file ofs9
 
-restore bb9 s
+restore [locate_data_file bb9] s
 OFFSETSHAPE -0.1 {} $calcul $type
 
 set volume 24.6541
diff --git a/tests/offset/shape_type_a/A5 b/tests/offset/shape_type_a/A5
index 273fcba8e0..3bc333cedd 100644
--- a/tests/offset/shape_type_a/A5
+++ b/tests/offset/shape_type_a/A5
@@ -1,6 +1,6 @@
 #old file ofs11
 
-restore bb11 s
+restore [locate_data_file bb11] s
 OFFSETSHAPE -0.2 {} $calcul $type
 
 set volume 52.676
diff --git a/tests/offset/shape_type_a/A6 b/tests/offset/shape_type_a/A6
index 9436d69fd0..7845acbce9 100644
--- a/tests/offset/shape_type_a/A6
+++ b/tests/offset/shape_type_a/A6
@@ -1,6 +1,6 @@
 #old file ofs14
 
-restore bb14 s
+restore [locate_data_file bb14] s
 OFFSETSHAPE -0.1 {} $calcul $type
 
 
diff --git a/tests/offset/shape_type_a/A7 b/tests/offset/shape_type_a/A7
index 37748cec01..b903fef2c1 100644
--- a/tests/offset/shape_type_a/A7
+++ b/tests/offset/shape_type_a/A7
@@ -1,6 +1,6 @@
 #old file ofs15
 
-restore bb15 s
+restore [locate_data_file bb15] s
 OFFSETSHAPE -0.1 {} $calcul $type
 
 set volume 15.2493
diff --git a/tests/offset/shape_type_a/A8 b/tests/offset/shape_type_a/A8
index 2f3973693a..4dc3d91862 100644
--- a/tests/offset/shape_type_a/A8
+++ b/tests/offset/shape_type_a/A8
@@ -1,6 +1,6 @@
 #old file ofs16
 
-restore vevopar s
+restore [locate_data_file vevopar] s
 OFFSETSHAPE -0.1 {} $calcul $type
 
 set volume 0.650881
diff --git a/tests/offset/shape_type_a/A9 b/tests/offset/shape_type_a/A9
index 816e7c2318..3c4e904fe9 100644
--- a/tests/offset/shape_type_a/A9
+++ b/tests/offset/shape_type_a/A9
@@ -1,6 +1,6 @@
 #old file ofs14 part 2
 
-restore bb14 s
+restore [locate_data_file bb14] s
 OFFSETSHAPE 0.1 {} $calcul $type
 
 
diff --git a/tests/offset/shape_type_a/B1 b/tests/offset/shape_type_a/B1
index d953f0d43c..2931f5ee92 100644
--- a/tests/offset/shape_type_a/B1
+++ b/tests/offset/shape_type_a/B1
@@ -1,6 +1,6 @@
 #old file ofs15 part two
 
-restore bb15 s
+restore [locate_data_file bb15] s
 OFFSETSHAPE 0.1 {} $calcul $type
 
 set volume 26.4725
diff --git a/tests/offset/shape_type_a/B2 b/tests/offset/shape_type_a/B2
index 1c9f538b3a..a3783b798f 100644
--- a/tests/offset/shape_type_a/B2
+++ b/tests/offset/shape_type_a/B2
@@ -1,6 +1,6 @@
 #old file ofsc9
 
-restore bb9 s
+restore [locate_data_file bb9] s
 OFFSETSHAPE 0.8 {} $calcul $type
 
 set volume 100.616
diff --git a/tests/offset/shape_type_a/B3 b/tests/offset/shape_type_a/B3
index f13943cdeb..98b6d45c5c 100644
--- a/tests/offset/shape_type_a/B3
+++ b/tests/offset/shape_type_a/B3
@@ -1,6 +1,6 @@
 #old file ofsc11
 
-restore bb11 s
+restore [locate_data_file bb11] s
 OFFSETSHAPE -0.5 {} $calcul $type
 
 set volume 15.9691
diff --git a/tests/offset/shape_type_a/B4 b/tests/offset/shape_type_a/B4
index 71b278732e..07016b6fd9 100644
--- a/tests/offset/shape_type_a/B4
+++ b/tests/offset/shape_type_a/B4
@@ -1,6 +1,6 @@
 #old file ofs16 part two 
 
-restore vevopar s
+restore [locate_data_file vevopar] s
 OFFSETSHAPE 0.1 {} $calcul $type
 
 set volume 1.89228
diff --git a/tests/offset/shape_type_a/B5 b/tests/offset/shape_type_a/B5
index 91954cf972..eaa17cfb5b 100644
--- a/tests/offset/shape_type_a/B5
+++ b/tests/offset/shape_type_a/B5
@@ -1,6 +1,6 @@
 #old file ofs2 part two 
 
-restore bb2 s
+restore [locate_data_file bb2] s
 OFFSETSHAPE 0.1 {} $calcul $type
 
 set volume 4.55884
diff --git a/tests/offset/shape_type_a/B6 b/tests/offset/shape_type_a/B6
index 9e525573d7..96609a5b80 100644
--- a/tests/offset/shape_type_a/B6
+++ b/tests/offset/shape_type_a/B6
@@ -1,6 +1,6 @@
 #old file ofs9 part two
 
-restore bb9 s
+restore [locate_data_file bb9] s
 OFFSETSHAPE 0.1 {} $calcul $type
 
 set volume 36.8614
diff --git a/tests/offset/shape_type_i/D7 b/tests/offset/shape_type_i/D7
index fa221d1f40..5414578f4c 100644
--- a/tests/offset/shape_type_i/D7
+++ b/tests/offset/shape_type_i/D7
@@ -1,4 +1,5 @@
-puts "TODO OCC23068 Mandriva2010: Error: bsection of result and s is not equal zero"
+puts "TODO ?OCC23068 Mandriva2010: Faulty shapes in variables faulty_1 to faulty_"
+puts "TODO ?OCC23068 Mandriva2010: Error: bsection of result and s is not equal zero"
 puts "TODO OCC23068 Mandriva2010: Error : The volume of result shape "
 ellipse w1 0 0 0 15 10
 mkedge w1 w1 0 pi/2
diff --git a/tests/parse.rules b/tests/parse.rules
index d96520edb7..dcf7b11e05 100644
--- a/tests/parse.rules
+++ b/tests/parse.rules
@@ -1,5 +1,6 @@
 SKIPPED /Cannot open file for reading/ data file is missing
 SKIPPED /Could not read file .*, abandon/ data file is missing
+SKIPPED /Tcl Exception: Error: file .* could not be found neither in script/ data file is missing
 IGNORE /Tcl Exception: [*][*] Exception [*][*]/ duplicate report on exception on Tcl level
 FAILED /\b[Ee]xception\b/ exception
 FAILED /\bError\b/ error
diff --git a/tests/pipe/begin b/tests/pipe/begin
index 8328d8190b..7da14325b7 100644
--- a/tests/pipe/begin
+++ b/tests/pipe/begin
@@ -1,10 +1,6 @@
 # To prevent loops limit to 10 minutes
 cpulimit 600
 
-if { [string compare [datadir] "."] == 0 } {
-   datadir [file dirname [info script]]/data
-}
-
 if { [array get Draw_Groups "TOPOLOGY Feature commands"] == "" } {
 	pload TOPTEST
 }
diff --git a/tests/pipe/standard/A1 b/tests/pipe/standard/A1
index 92b10876d4..1e7dae44a5 100644
--- a/tests/pipe/standard/A1
+++ b/tests/pipe/standard/A1
@@ -4,9 +4,9 @@
 ## Comment : From CV tests serie page 68
 ## ======================================
 
-restore 3_base.rle base
+restore [locate_data_file 3_base.rle] base
 mkplane fbase base
-restore 3_A1.rle profile
+restore [locate_data_file 3_A1.rle] profile
 
 pipe result profile fbase
 
diff --git a/tests/pipe/standard/B1 b/tests/pipe/standard/B1
index 8c0316afa1..38c2fbe291 100644
--- a/tests/pipe/standard/B1
+++ b/tests/pipe/standard/B1
@@ -6,9 +6,9 @@
 
 puts "TODO OCC22741 All: Faulty shapes in variables faulty_1 to faulty_2"
 
-restore 3_base.rle base
+restore [locate_data_file 3_base.rle] base
 mkplane fbase base
-restore 3_B1.rle profile
+restore [locate_data_file 3_B1.rle] profile
 
 pipe result profile fbase
 
diff --git a/tests/pipe/standard/C1 b/tests/pipe/standard/C1
index 71bb1d52ed..b47d85dff5 100644
--- a/tests/pipe/standard/C1
+++ b/tests/pipe/standard/C1
@@ -5,9 +5,9 @@
 ## ======================================
 
 
-restore 3_base.rle base
+restore [locate_data_file 3_base.rle] base
 mkplane fbase base
-restore 3_C1.rle profile
+restore [locate_data_file 3_C1.rle] profile
 
 pipe result profile fbase
 
diff --git a/tests/prism/begin b/tests/prism/begin
index 8328d8190b..7da14325b7 100644
--- a/tests/prism/begin
+++ b/tests/prism/begin
@@ -1,10 +1,6 @@
 # To prevent loops limit to 10 minutes
 cpulimit 600
 
-if { [string compare [datadir] "."] == 0 } {
-   datadir [file dirname [info script]]/data
-}
-
 if { [array get Draw_Groups "TOPOLOGY Feature commands"] == "" } {
 	pload TOPTEST
 }
diff --git a/tests/sewing/begin b/tests/sewing/begin
index 9e09cccd86..1e01d0314c 100644
--- a/tests/sewing/begin
+++ b/tests/sewing/begin
@@ -1,10 +1,6 @@
 # To prevent loops limit to 5 minutes
 cpulimit 300
 
-if {[string compare [datadir] "."] == 0} { 
-  datadir [file dirname [info script]]/data
-}
-
 if { [array get Draw_Groups "TOPOLOGY Feature commands"] == "" } {
 	pload TOPTEST
 }
diff --git a/tests/sewing/tol_0_01/A1 b/tests/sewing/tol_0_01/A1
index 3e6ddef3ad..e4283fa2ca 100644
--- a/tests/sewing/tol_0_01/A1
+++ b/tests/sewing/tol_0_01/A1
@@ -1 +1 @@
-restore CCH_001_ahdb.rle a
+restore [locate_data_file CCH_001_ahdb.rle] a
diff --git a/tests/sewing/tol_0_01/A2 b/tests/sewing/tol_0_01/A2
index c6ac8891c6..41f45b1a24 100644
--- a/tests/sewing/tol_0_01/A2
+++ b/tests/sewing/tol_0_01/A2
@@ -1 +1 @@
-restore CCH_001_ahev.rle a
+restore [locate_data_file CCH_001_ahev.rle] a
diff --git a/tests/sewing/tol_0_01/A3 b/tests/sewing/tol_0_01/A3
index 17c7e6aafe..8958f481ac 100644
--- a/tests/sewing/tol_0_01/A3
+++ b/tests/sewing/tol_0_01/A3
@@ -1 +1 @@
-restore BUC60328.rle a
+restore [locate_data_file BUC60328.rle] a
diff --git a/tests/sewing/tol_0_01/A4 b/tests/sewing/tol_0_01/A4
index 85561aae1c..b277602dfd 100644
--- a/tests/sewing/tol_0_01/A4
+++ b/tests/sewing/tol_0_01/A4
@@ -1 +1 @@
-restore BUC60329.rle a
+restore [locate_data_file BUC60329.rle] a
diff --git a/tests/sewing/tol_0_01/A5 b/tests/sewing/tol_0_01/A5
index b7accca328..7b2d4c281b 100644
--- a/tests/sewing/tol_0_01/A5
+++ b/tests/sewing/tol_0_01/A5
@@ -1 +1 @@
-restore BUC60391.rle a
+restore [locate_data_file BUC60391.rle] a
diff --git a/tests/sewing/tol_0_01/A6 b/tests/sewing/tol_0_01/A6
index 23c4945684..1d282bb1d8 100644
--- a/tests/sewing/tol_0_01/A6
+++ b/tests/sewing/tol_0_01/A6
@@ -1 +1 @@
-restore BUC60392.rle a
+restore [locate_data_file BUC60392.rle] a
diff --git a/tests/sewing/tol_0_01/A7 b/tests/sewing/tol_0_01/A7
index 856d8f5792..cb13f98d9d 100644
--- a/tests/sewing/tol_0_01/A7
+++ b/tests/sewing/tol_0_01/A7
@@ -1 +1 @@
-restore CFE900_ger50gdb.rle a
+restore [locate_data_file CFE900_ger50gdb.rle] a
diff --git a/tests/sewing/tol_0_01/A8 b/tests/sewing/tol_0_01/A8
index 8e8c2c8abb..744b6a5f22 100644
--- a/tests/sewing/tol_0_01/A8
+++ b/tests/sewing/tol_0_01/A8
@@ -1 +1 @@
-restore BUC60394.rle a
+restore [locate_data_file BUC60394.rle] a
diff --git a/tests/sewing/tol_0_01/A9 b/tests/sewing/tol_0_01/A9
index 97e37d9e2e..eb4470a225 100644
--- a/tests/sewing/tol_0_01/A9
+++ b/tests/sewing/tol_0_01/A9
@@ -1 +1 @@
-restore CHE_bb11.rle a
+restore [locate_data_file CHE_bb11.rle] a
diff --git a/tests/sewing/tol_0_01/B1 b/tests/sewing/tol_0_01/B1
index cda6b28126..db1a04a6b9 100644
--- a/tests/sewing/tol_0_01/B1
+++ b/tests/sewing/tol_0_01/B1
@@ -1 +1 @@
-restore CCH_001_ahew.rle a
+restore [locate_data_file CCH_001_ahew.rle] a
diff --git a/tests/sewing/tol_0_01/B2 b/tests/sewing/tol_0_01/B2
index 6ae9b60f35..f9db0db89f 100644
--- a/tests/sewing/tol_0_01/B2
+++ b/tests/sewing/tol_0_01/B2
@@ -1 +1 @@
-restore CCH_001_bhdc.rle a
+restore [locate_data_file CCH_001_bhdc.rle] a
diff --git a/tests/sewing/tol_0_01/B3 b/tests/sewing/tol_0_01/B3
index 1f8a97919e..0df3afbd95 100644
--- a/tests/sewing/tol_0_01/B3
+++ b/tests/sewing/tol_0_01/B3
@@ -1 +1 @@
-restore CCH_001_chde.rle a
+restore [locate_data_file CCH_001_chde.rle] a
diff --git a/tests/sewing/tol_0_01/B4 b/tests/sewing/tol_0_01/B4
index 3d6ba5671d..9078e4d595 100644
--- a/tests/sewing/tol_0_01/B4
+++ b/tests/sewing/tol_0_01/B4
@@ -1 +1 @@
-restore CCH_001_chez.rle a
+restore [locate_data_file CCH_001_chez.rle] a
diff --git a/tests/sewing/tol_0_01/B5 b/tests/sewing/tol_0_01/B5
index df89b949d3..081977ece9 100644
--- a/tests/sewing/tol_0_01/B5
+++ b/tests/sewing/tol_0_01/B5
@@ -1 +1 @@
-restore CCH_001_chfa.rle a
+restore [locate_data_file CCH_001_chfa.rle] a
diff --git a/tests/sewing/tol_0_01/B6 b/tests/sewing/tol_0_01/B6
index 3d60580bd3..3e1f7d5cca 100644
--- a/tests/sewing/tol_0_01/B6
+++ b/tests/sewing/tol_0_01/B6
@@ -1 +1 @@
-restore CCH_001_dhdd.rle a
+restore [locate_data_file CCH_001_dhdd.rle] a
diff --git a/tests/sewing/tol_0_01/B7 b/tests/sewing/tol_0_01/B7
index 8a35ce25a8..f0368e35f4 100644
--- a/tests/sewing/tol_0_01/B7
+++ b/tests/sewing/tol_0_01/B7
@@ -1 +1 @@
-restore CCH_001_ehdg.rle a
+restore [locate_data_file CCH_001_ehdg.rle] a
diff --git a/tests/sewing/tol_0_01/B8 b/tests/sewing/tol_0_01/B8
index d9fbdb0424..fcdb85de7b 100644
--- a/tests/sewing/tol_0_01/B8
+++ b/tests/sewing/tol_0_01/B8
@@ -1 +1 @@
-restore CCH_001_ghdh.rle a
+restore [locate_data_file CCH_001_ghdh.rle] a
diff --git a/tests/sewing/tol_0_01/B9 b/tests/sewing/tol_0_01/B9
index 14d30f29d8..53812310ce 100644
--- a/tests/sewing/tol_0_01/B9
+++ b/tests/sewing/tol_0_01/B9
@@ -1 +1 @@
-restore CCH_001_ghfb.rle a
+restore [locate_data_file CCH_001_ghfb.rle] a
diff --git a/tests/sewing/tol_0_01/C1 b/tests/sewing/tol_0_01/C1
index f2f0918602..50e3bc0a56 100644
--- a/tests/sewing/tol_0_01/C1
+++ b/tests/sewing/tol_0_01/C1
@@ -1 +1 @@
-restore CCH_001_hhdi.rle a
+restore [locate_data_file CCH_001_hhdi.rle] a
diff --git a/tests/sewing/tol_0_01/C2 b/tests/sewing/tol_0_01/C2
index 15488ced48..5950587e81 100644
--- a/tests/sewing/tol_0_01/C2
+++ b/tests/sewing/tol_0_01/C2
@@ -1 +1 @@
-restore CCH_001_ihdj.rle a
+restore [locate_data_file CCH_001_ihdj.rle] a
diff --git a/tests/sewing/tol_0_01/C3 b/tests/sewing/tol_0_01/C3
index cac53714ac..427b2a9421 100644
--- a/tests/sewing/tol_0_01/C3
+++ b/tests/sewing/tol_0_01/C3
@@ -1 +1 @@
-restore CCH_001_jhdk.rle a
+restore [locate_data_file CCH_001_jhdk.rle] a
diff --git a/tests/sewing/tol_0_01/C4 b/tests/sewing/tol_0_01/C4
index 92c8bc4477..a5fa75d71b 100644
--- a/tests/sewing/tol_0_01/C4
+++ b/tests/sewing/tol_0_01/C4
@@ -1 +1 @@
-restore CCH_001_khdl.rle a
+restore [locate_data_file CCH_001_khdl.rle] a
diff --git a/tests/sewing/tol_0_01/C5 b/tests/sewing/tol_0_01/C5
index 6fc2419b51..759349c86a 100644
--- a/tests/sewing/tol_0_01/C5
+++ b/tests/sewing/tol_0_01/C5
@@ -1 +1 @@
-restore CCH_001_lhdm.rle a
+restore [locate_data_file CCH_001_lhdm.rle] a
diff --git a/tests/sewing/tol_0_01/C6 b/tests/sewing/tol_0_01/C6
index fdb3e27ba9..6cf217940e 100644
--- a/tests/sewing/tol_0_01/C6
+++ b/tests/sewing/tol_0_01/C6
@@ -1 +1 @@
-restore CCH_001_qhff.rle a
+restore [locate_data_file CCH_001_qhff.rle] a
diff --git a/tests/sewing/tol_0_01/C7 b/tests/sewing/tol_0_01/C7
index c1f799541b..f07f2902da 100644
--- a/tests/sewing/tol_0_01/C7
+++ b/tests/sewing/tol_0_01/C7
@@ -1 +1 @@
-restore CCH_a.rle a
+restore [locate_data_file CCH_a.rle] a
diff --git a/tests/sewing/tol_0_01/C8 b/tests/sewing/tol_0_01/C8
index b00646f032..05bbcc2772 100644
--- a/tests/sewing/tol_0_01/C8
+++ b/tests/sewing/tol_0_01/C8
@@ -1 +1 @@
-restore CCH_adapthfd.rle a
+restore [locate_data_file CCH_adapthfd.rle] a
diff --git a/tests/sewing/tol_0_01/C9 b/tests/sewing/tol_0_01/C9
index b5cc1235d4..ff72db901d 100644
--- a/tests/sewing/tol_0_01/C9
+++ b/tests/sewing/tol_0_01/C9
@@ -1 +1 @@
-restore CCH_blendhdn.rle a
+restore [locate_data_file CCH_blendhdn.rle] a
diff --git a/tests/sewing/tol_0_01/D1 b/tests/sewing/tol_0_01/D1
index 3cec848052..0a57e977d3 100644
--- a/tests/sewing/tol_0_01/D1
+++ b/tests/sewing/tol_0_01/D1
@@ -1 +1 @@
-restore CCH_blendhdp.rle a
+restore [locate_data_file CCH_blendhdp.rle] a
diff --git a/tests/sewing/tol_0_01/D2 b/tests/sewing/tol_0_01/D2
index 87e2be18ef..3492322319 100644
--- a/tests/sewing/tol_0_01/D2
+++ b/tests/sewing/tol_0_01/D2
@@ -1 +1 @@
-restore CCH_blendhdq.rle a
+restore [locate_data_file CCH_blendhdq.rle] a
diff --git a/tests/sewing/tol_0_01/D3 b/tests/sewing/tol_0_01/D3
index 62a8126ed9..a0dd3f01c5 100644
--- a/tests/sewing/tol_0_01/D3
+++ b/tests/sewing/tol_0_01/D3
@@ -1 +1 @@
-restore CCH_blendhdr.rle a
+restore [locate_data_file CCH_blendhdr.rle] a
diff --git a/tests/sewing/tol_0_01/D4 b/tests/sewing/tol_0_01/D4
index 8729ec75da..c53c2f0014 100644
--- a/tests/sewing/tol_0_01/D4
+++ b/tests/sewing/tol_0_01/D4
@@ -1 +1 @@
-restore CCH_blendhdu.rle a
+restore [locate_data_file CCH_blendhdu.rle] a
diff --git a/tests/sewing/tol_0_01/D5 b/tests/sewing/tol_0_01/D5
index 922e78ec4e..7a7f2b458a 100644
--- a/tests/sewing/tol_0_01/D5
+++ b/tests/sewing/tol_0_01/D5
@@ -1 +1 @@
-restore CCH_blendhdv.rle a
+restore [locate_data_file CCH_blendhdv.rle] a
diff --git a/tests/sewing/tol_0_01/D6 b/tests/sewing/tol_0_01/D6
index 0a4578b6df..2218984374 100644
--- a/tests/sewing/tol_0_01/D6
+++ b/tests/sewing/tol_0_01/D6
@@ -1 +1 @@
-restore CCH_blendhdw.rle a
+restore [locate_data_file CCH_blendhdw.rle] a
diff --git a/tests/sewing/tol_0_01/D7 b/tests/sewing/tol_0_01/D7
index dfd9758c5b..d5f8a969fc 100644
--- a/tests/sewing/tol_0_01/D7
+++ b/tests/sewing/tol_0_01/D7
@@ -1 +1 @@
-restore CCH_coco1.rle a
+restore [locate_data_file CCH_coco1.rle] a
diff --git a/tests/sewing/tol_0_01/D8 b/tests/sewing/tol_0_01/D8
index bd8c387677..a1ab4b1093 100644
--- a/tests/sewing/tol_0_01/D8
+++ b/tests/sewing/tol_0_01/D8
@@ -1 +1 @@
-restore CCH_coco2.rle a
+restore [locate_data_file CCH_coco2.rle] a
diff --git a/tests/sewing/tol_0_01/D9 b/tests/sewing/tol_0_01/D9
index 562fe48638..ede703429b 100644
--- a/tests/sewing/tol_0_01/D9
+++ b/tests/sewing/tol_0_01/D9
@@ -1 +1 @@
-restore CCH_coco3.rle a
+restore [locate_data_file CCH_coco3.rle] a
diff --git a/tests/sewing/tol_0_01/E1 b/tests/sewing/tol_0_01/E1
index d376241dd5..a1a614c9e7 100644
--- a/tests/sewing/tol_0_01/E1
+++ b/tests/sewing/tol_0_01/E1
@@ -1 +1 @@
-restore CCH_conge1.rle a
+restore [locate_data_file CCH_conge1.rle] a
diff --git a/tests/sewing/tol_0_01/E2 b/tests/sewing/tol_0_01/E2
index 43cf8d33f4..e3a7cc557c 100644
--- a/tests/sewing/tol_0_01/E2
+++ b/tests/sewing/tol_0_01/E2
@@ -1 +1 @@
-restore CCH_couture.rle a
+restore [locate_data_file CCH_couture.rle] a
diff --git a/tests/sewing/tol_0_01/E3 b/tests/sewing/tol_0_01/E3
index ba55860a0e..73121f003c 100644
--- a/tests/sewing/tol_0_01/E3
+++ b/tests/sewing/tol_0_01/E3
@@ -1 +1 @@
-restore CCH_flanphdy.rle a
+restore [locate_data_file CCH_flanphdy.rle] a
diff --git a/tests/sewing/tol_0_01/E4 b/tests/sewing/tol_0_01/E4
index 1bd2aff9a9..7c57119f14 100644
--- a/tests/sewing/tol_0_01/E4
+++ b/tests/sewing/tol_0_01/E4
@@ -1 +1 @@
-restore CTO900_pro12913a.rle a
+restore [locate_data_file CTO900_pro12913a.rle] a
diff --git a/tests/sewing/tol_0_01/E5 b/tests/sewing/tol_0_01/E5
index 3c8c67f3d0..37a7f1cc86 100644
--- a/tests/sewing/tol_0_01/E5
+++ b/tests/sewing/tol_0_01/E5
@@ -1 +1 @@
-restore CCH_hlacghea.rle a
+restore [locate_data_file CCH_hlacghea.rle] a
diff --git a/tests/sewing/tol_0_01/E6 b/tests/sewing/tol_0_01/E6
index 1de93b2921..c96f3e25da 100644
--- a/tests/sewing/tol_0_01/E6
+++ b/tests/sewing/tol_0_01/E6
@@ -1 +1 @@
-restore CCH_hlacghef.rle a
+restore [locate_data_file CCH_hlacghef.rle] a
diff --git a/tests/sewing/tol_0_01/E7 b/tests/sewing/tol_0_01/E7
index 856b63b53b..29e728a31c 100644
--- a/tests/sewing/tol_0_01/E7
+++ b/tests/sewing/tol_0_01/E7
@@ -1 +1 @@
-restore CCH_hlacgheg.rle a
+restore [locate_data_file CCH_hlacgheg.rle] a
diff --git a/tests/sewing/tol_0_01/E8 b/tests/sewing/tol_0_01/E8
index c9fd48c821..2f83241f36 100644
--- a/tests/sewing/tol_0_01/E8
+++ b/tests/sewing/tol_0_01/E8
@@ -1 +1 @@
-restore CCH_hlacgheh.rle a
+restore [locate_data_file CCH_hlacgheh.rle] a
diff --git a/tests/sewing/tol_0_01/E9 b/tests/sewing/tol_0_01/E9
index 33ceafa276..c19ef854ff 100644
--- a/tests/sewing/tol_0_01/E9
+++ b/tests/sewing/tol_0_01/E9
@@ -1 +1 @@
-restore CCH_indushei.rle a
+restore [locate_data_file CCH_indushei.rle] a
diff --git a/tests/sewing/tol_0_01/F1 b/tests/sewing/tol_0_01/F1
index 7ea6d48321..f60f6b094d 100644
--- a/tests/sewing/tol_0_01/F1
+++ b/tests/sewing/tol_0_01/F1
@@ -1 +1 @@
-restore CCH_indushej.rle a
+restore [locate_data_file CCH_indushej.rle] a
diff --git a/tests/sewing/tol_0_01/F2 b/tests/sewing/tol_0_01/F2
index 5de135d84e..9f83417cd5 100644
--- a/tests/sewing/tol_0_01/F2
+++ b/tests/sewing/tol_0_01/F2
@@ -1 +1 @@
-restore CCH_indushek.rle a
+restore [locate_data_file CCH_indushek.rle] a
diff --git a/tests/sewing/tol_0_01/F3 b/tests/sewing/tol_0_01/F3
index a3e934c669..e11697edc1 100644
--- a/tests/sewing/tol_0_01/F3
+++ b/tests/sewing/tol_0_01/F3
@@ -1 +1 @@
-restore CCH_indushel.rle a
+restore [locate_data_file CCH_indushel.rle] a
diff --git a/tests/sewing/tol_0_01/F4 b/tests/sewing/tol_0_01/F4
index c6b68db433..7e53c6e72c 100644
--- a/tests/sewing/tol_0_01/F4
+++ b/tests/sewing/tol_0_01/F4
@@ -1 +1 @@
-restore CCH_indushem.rle a
+restore [locate_data_file CCH_indushem.rle] a
diff --git a/tests/sewing/tol_0_01/F5 b/tests/sewing/tol_0_01/F5
index 531d88527c..4eb4fa06fb 100644
--- a/tests/sewing/tol_0_01/F5
+++ b/tests/sewing/tol_0_01/F5
@@ -1 +1 @@
-restore CCH_indushen.rle a
+restore [locate_data_file CCH_indushen.rle] a
diff --git a/tests/sewing/tol_0_01/F6 b/tests/sewing/tol_0_01/F6
index c45940754e..baab621a48 100644
--- a/tests/sewing/tol_0_01/F6
+++ b/tests/sewing/tol_0_01/F6
@@ -1 +1 @@
-restore CCH_indusheo.rle a
+restore [locate_data_file CCH_indusheo.rle] a
diff --git a/tests/sewing/tol_0_01/F7 b/tests/sewing/tol_0_01/F7
index e2172449fc..cd6c6ae241 100644
--- a/tests/sewing/tol_0_01/F7
+++ b/tests/sewing/tol_0_01/F7
@@ -1 +1 @@
-restore CCH_indushep.rle a
+restore [locate_data_file CCH_indushep.rle] a
diff --git a/tests/sewing/tol_0_01/F8 b/tests/sewing/tol_0_01/F8
index 81ad8f5f51..716aa6fce3 100644
--- a/tests/sewing/tol_0_01/F8
+++ b/tests/sewing/tol_0_01/F8
@@ -1,2 +1,2 @@
-restore CCH_indusheq.rle a
+restore [locate_data_file CCH_indusheq.rle] a
 set nb_f ""
diff --git a/tests/sewing/tol_0_01/F9 b/tests/sewing/tol_0_01/F9
index d061d260b4..387f71efc9 100644
--- a/tests/sewing/tol_0_01/F9
+++ b/tests/sewing/tol_0_01/F9
@@ -1 +1 @@
-restore CCH_jyl1.rle a
+restore [locate_data_file CCH_jyl1.rle] a
diff --git a/tests/sewing/tol_0_01/G1 b/tests/sewing/tol_0_01/G1
index 5a07cb2abc..cc7f0b41db 100644
--- a/tests/sewing/tol_0_01/G1
+++ b/tests/sewing/tol_0_01/G1
@@ -1 +1 @@
-restore CCH_jyl2.rle a
+restore [locate_data_file CCH_jyl2.rle] a
diff --git a/tests/sewing/tol_0_01/G2 b/tests/sewing/tol_0_01/G2
index 4a41c66bfa..44a1dac786 100644
--- a/tests/sewing/tol_0_01/G2
+++ b/tests/sewing/tol_0_01/G2
@@ -1 +1 @@
-restore CCH_osa__hfe.rle a
+restore [locate_data_file CCH_osa__hfe.rle] a
diff --git a/tests/sewing/tol_0_01/G3 b/tests/sewing/tol_0_01/G3
index 6a73968eb7..61e280f899 100644
--- a/tests/sewing/tol_0_01/G3
+++ b/tests/sewing/tol_0_01/G3
@@ -1 +1 @@
-restore CCH_propag.rle a
+restore [locate_data_file CCH_propag.rle] a
diff --git a/tests/sewing/tol_0_01/G4 b/tests/sewing/tol_0_01/G4
index 0677f0c126..22a7f0a317 100644
--- a/tests/sewing/tol_0_01/G4
+++ b/tests/sewing/tol_0_01/G4
@@ -1 +1 @@
-restore CCH_r2.rle a
+restore [locate_data_file CCH_r2.rle] a
diff --git a/tests/sewing/tol_0_01/G5 b/tests/sewing/tol_0_01/G5
index 42aadfc545..81191851c7 100644
--- a/tests/sewing/tol_0_01/G5
+++ b/tests/sewing/tol_0_01/G5
@@ -1 +1 @@
-restore CCH_shell.rle a
+restore [locate_data_file CCH_shell.rle] a
diff --git a/tests/sewing/tol_0_01/G6 b/tests/sewing/tol_0_01/G6
index 8a3817cf0c..f121c7f58d 100644
--- a/tests/sewing/tol_0_01/G6
+++ b/tests/sewing/tol_0_01/G6
@@ -1 +1 @@
-restore CTO900_pro12896b.rle a
+restore [locate_data_file CTO900_pro12896b.rle] a
diff --git a/tests/sewing/tol_0_01/G7 b/tests/sewing/tol_0_01/G7
index 0a7b61e53e..fbcbff35d2 100644
--- a/tests/sewing/tol_0_01/G7
+++ b/tests/sewing/tol_0_01/G7
@@ -1 +1 @@
-restore CCH_testchet.rle a
+restore [locate_data_file CCH_testchet.rle] a
diff --git a/tests/sewing/tol_0_01/G8 b/tests/sewing/tol_0_01/G8
index 45411941cc..b02cab8436 100644
--- a/tests/sewing/tol_0_01/G8
+++ b/tests/sewing/tol_0_01/G8
@@ -1 +1 @@
-restore CCH_testchex.rle a
+restore [locate_data_file CCH_testchex.rle] a
diff --git a/tests/sewing/tol_0_01/G9 b/tests/sewing/tol_0_01/G9
index 60f068422f..94cec06d34 100644
--- a/tests/sewing/tol_0_01/G9
+++ b/tests/sewing/tol_0_01/G9
@@ -1 +1 @@
-restore CCH_testchey.rle a
+restore [locate_data_file CCH_testchey.rle] a
diff --git a/tests/sewing/tol_0_01/H1 b/tests/sewing/tol_0_01/H1
index 9c63679348..67ade43176 100644
--- a/tests/sewing/tol_0_01/H1
+++ b/tests/sewing/tol_0_01/H1
@@ -1 +1 @@
-restore CCH_testchfc.rle a
+restore [locate_data_file CCH_testchfc.rle] a
diff --git a/tests/sewing/tol_0_01/H2 b/tests/sewing/tol_0_01/H2
index 1deece72b3..811a0ce57c 100644
--- a/tests/sewing/tol_0_01/H2
+++ b/tests/sewing/tol_0_01/H2
@@ -1 +1 @@
-restore CCH_testkhes.rle a
+restore [locate_data_file CCH_testkhes.rle] a
diff --git a/tests/sewing/tol_0_01/H3 b/tests/sewing/tol_0_01/H3
index a27b5aa0be..38df785eac 100644
--- a/tests/sewing/tol_0_01/H3
+++ b/tests/sewing/tol_0_01/H3
@@ -1 +1 @@
-restore CCH_testsheu.rle a
+restore [locate_data_file CCH_testsheu.rle] a
diff --git a/tests/sewing/tol_0_01/H4 b/tests/sewing/tol_0_01/H4
index f5ed420aba..1589450dd6 100644
--- a/tests/sewing/tol_0_01/H4
+++ b/tests/sewing/tol_0_01/H4
@@ -1 +1 @@
-restore CCI60005.rle a
+restore [locate_data_file CCI60005.rle] a
diff --git a/tests/sewing/tol_0_01/H5 b/tests/sewing/tol_0_01/H5
index 4890d73250..d41a615244 100644
--- a/tests/sewing/tol_0_01/H5
+++ b/tests/sewing/tol_0_01/H5
@@ -1 +1 @@
-restore CCV_1_a12gsd.rle a
+restore [locate_data_file CCV_1_a12gsd.rle] a
diff --git a/tests/sewing/tol_0_01/H6 b/tests/sewing/tol_0_01/H6
index a86cb5f691..21e3bd86c0 100644
--- a/tests/sewing/tol_0_01/H6
+++ b/tests/sewing/tol_0_01/H6
@@ -1 +1 @@
-restore CCV_1_c12gsf.rle a
+restore [locate_data_file CCV_1_c12gsf.rle] a
diff --git a/tests/sewing/tol_0_01/H7 b/tests/sewing/tol_0_01/H7
index 5bd04a34e9..455dfc26eb 100644
--- a/tests/sewing/tol_0_01/H7
+++ b/tests/sewing/tol_0_01/H7
@@ -1 +1 @@
-restore CCV_1_d12gsg.rle a
+restore [locate_data_file CCV_1_d12gsg.rle] a
diff --git a/tests/sewing/tol_0_01/H8 b/tests/sewing/tol_0_01/H8
index bd05969bdb..e789370e82 100644
--- a/tests/sewing/tol_0_01/H8
+++ b/tests/sewing/tol_0_01/H8
@@ -1 +1 @@
-restore CCV_1_e12gsh.rle a
+restore [locate_data_file CCV_1_e12gsh.rle] a
diff --git a/tests/sewing/tol_0_01/H9 b/tests/sewing/tol_0_01/H9
index 3f350f1fc8..396cd520b3 100644
--- a/tests/sewing/tol_0_01/H9
+++ b/tests/sewing/tol_0_01/H9
@@ -1 +1 @@
-restore CCV_1_f1_gsi.rle a
+restore [locate_data_file CCV_1_f1_gsi.rle] a
diff --git a/tests/sewing/tol_0_01/I1 b/tests/sewing/tol_0_01/I1
index 62e34b55c8..b1119adf74 100644
--- a/tests/sewing/tol_0_01/I1
+++ b/tests/sewing/tol_0_01/I1
@@ -1 +1 @@
-restore CCV_1_g1_gsj.rle a
+restore [locate_data_file CCV_1_g1_gsj.rle] a
diff --git a/tests/sewing/tol_0_01/I2 b/tests/sewing/tol_0_01/I2
index b3e703be7c..89b682bd60 100644
--- a/tests/sewing/tol_0_01/I2
+++ b/tests/sewing/tol_0_01/I2
@@ -1 +1 @@
-restore CCV_1_h1_gsk.rle a
+restore [locate_data_file CCV_1_h1_gsk.rle] a
diff --git a/tests/sewing/tol_0_01/I3 b/tests/sewing/tol_0_01/I3
index 38cf09f6c2..5ee6caf187 100644
--- a/tests/sewing/tol_0_01/I3
+++ b/tests/sewing/tol_0_01/I3
@@ -1 +1 @@
-restore CCV_1_i12gsl.rle a
+restore [locate_data_file CCV_1_i12gsl.rle] a
diff --git a/tests/sewing/tol_0_01/I4 b/tests/sewing/tol_0_01/I4
index ae6f8f3ed2..e6b29497e2 100644
--- a/tests/sewing/tol_0_01/I4
+++ b/tests/sewing/tol_0_01/I4
@@ -1 +1 @@
-restore CCV_1_j1_gsm.rle a
+restore [locate_data_file CCV_1_j1_gsm.rle] a
diff --git a/tests/sewing/tol_0_01/I5 b/tests/sewing/tol_0_01/I5
index 44fe2adf99..c299143dae 100644
--- a/tests/sewing/tol_0_01/I5
+++ b/tests/sewing/tol_0_01/I5
@@ -1 +1 @@
-restore CCV_1_k1_gsn.rle a
+restore [locate_data_file CCV_1_k1_gsn.rle] a
diff --git a/tests/sewing/tol_0_01/I6 b/tests/sewing/tol_0_01/I6
index 520c5f391d..9c85131be4 100644
--- a/tests/sewing/tol_0_01/I6
+++ b/tests/sewing/tol_0_01/I6
@@ -1 +1 @@
-restore CCV_1_l1_gso.rle a
+restore [locate_data_file CCV_1_l1_gso.rle] a
diff --git a/tests/sewing/tol_0_01/I7 b/tests/sewing/tol_0_01/I7
index c1c4f44f00..336e48a6dc 100644
--- a/tests/sewing/tol_0_01/I7
+++ b/tests/sewing/tol_0_01/I7
@@ -1 +1 @@
-restore CCV_1_m12gsp.rle a
+restore [locate_data_file CCV_1_m12gsp.rle] a
diff --git a/tests/sewing/tol_0_01/I8 b/tests/sewing/tol_0_01/I8
index 20c29c6841..d3743d0a76 100644
--- a/tests/sewing/tol_0_01/I8
+++ b/tests/sewing/tol_0_01/I8
@@ -1 +1 @@
-restore CCV_1_n12gsq.rle a
+restore [locate_data_file CCV_1_n12gsq.rle] a
diff --git a/tests/sewing/tol_0_01/I9 b/tests/sewing/tol_0_01/I9
index 2cdf2507c3..2bc6c5eaa2 100644
--- a/tests/sewing/tol_0_01/I9
+++ b/tests/sewing/tol_0_01/I9
@@ -1 +1 @@
-restore CCV_1_o12gsr.rle a
+restore [locate_data_file CCV_1_o12gsr.rle] a
diff --git a/tests/sewing/tol_0_01/J1 b/tests/sewing/tol_0_01/J1
index 9d9916f789..dfbc878d86 100644
--- a/tests/sewing/tol_0_01/J1
+++ b/tests/sewing/tol_0_01/J1
@@ -1 +1 @@
-restore CCV_1_r1_gss.rle a
+restore [locate_data_file CCV_1_r1_gss.rle] a
diff --git a/tests/sewing/tol_0_01/J2 b/tests/sewing/tol_0_01/J2
index c19e944320..86ec2e80f7 100644
--- a/tests/sewing/tol_0_01/J2
+++ b/tests/sewing/tol_0_01/J2
@@ -1 +1 @@
-restore CCV_2_a1_gst.rle a
+restore [locate_data_file CCV_2_a1_gst.rle] a
diff --git a/tests/sewing/tol_0_01/J3 b/tests/sewing/tol_0_01/J3
index 29c5fe19c6..340bd7af46 100644
--- a/tests/sewing/tol_0_01/J3
+++ b/tests/sewing/tol_0_01/J3
@@ -1 +1 @@
-restore CCV_2_b1_gsu.rle a
+restore [locate_data_file CCV_2_b1_gsu.rle] a
diff --git a/tests/sewing/tol_0_01/J4 b/tests/sewing/tol_0_01/J4
index 1babdf82d5..c9880483f1 100644
--- a/tests/sewing/tol_0_01/J4
+++ b/tests/sewing/tol_0_01/J4
@@ -1 +1 @@
-restore CCV_2_c1_gsv.rle a
+restore [locate_data_file CCV_2_c1_gsv.rle] a
diff --git a/tests/sewing/tol_0_01/J5 b/tests/sewing/tol_0_01/J5
index 222363a1ce..6e0cde8bec 100644
--- a/tests/sewing/tol_0_01/J5
+++ b/tests/sewing/tol_0_01/J5
@@ -1 +1 @@
-restore CCV_2_d1_gsw.rle a
+restore [locate_data_file CCV_2_d1_gsw.rle] a
diff --git a/tests/sewing/tol_0_01/J6 b/tests/sewing/tol_0_01/J6
index 4406e63848..4ed515b1cd 100644
--- a/tests/sewing/tol_0_01/J6
+++ b/tests/sewing/tol_0_01/J6
@@ -1 +1 @@
-restore CCV_2_e1_gsx.rle a
+restore [locate_data_file CCV_2_e1_gsx.rle] a
diff --git a/tests/sewing/tol_0_01/J7 b/tests/sewing/tol_0_01/J7
index 33b54bf97f..bac509a52b 100644
--- a/tests/sewing/tol_0_01/J7
+++ b/tests/sewing/tol_0_01/J7
@@ -1 +1 @@
-restore CCV_2_f1_gsy.rle a
+restore [locate_data_file CCV_2_f1_gsy.rle] a
diff --git a/tests/sewing/tol_0_01/J8 b/tests/sewing/tol_0_01/J8
index 50fff5be54..378e72629e 100644
--- a/tests/sewing/tol_0_01/J8
+++ b/tests/sewing/tol_0_01/J8
@@ -1 +1 @@
-restore CCV_2_g1_gsz.rle a
+restore [locate_data_file CCV_2_g1_gsz.rle] a
diff --git a/tests/sewing/tol_0_01/J9 b/tests/sewing/tol_0_01/J9
index 5d7faf57df..839eba5a09 100644
--- a/tests/sewing/tol_0_01/J9
+++ b/tests/sewing/tol_0_01/J9
@@ -1 +1 @@
-restore CCV_2_h1_gta.rle a
+restore [locate_data_file CCV_2_h1_gta.rle] a
diff --git a/tests/sewing/tol_0_01/K1 b/tests/sewing/tol_0_01/K1
index d9edcaa23e..61864fb4d8 100644
--- a/tests/sewing/tol_0_01/K1
+++ b/tests/sewing/tol_0_01/K1
@@ -1 +1 @@
-restore CCV_2_i1_gtb.rle a
+restore [locate_data_file CCV_2_i1_gtb.rle] a
diff --git a/tests/sewing/tol_0_01/K2 b/tests/sewing/tol_0_01/K2
index 7a60d39dd5..921e11a320 100644
--- a/tests/sewing/tol_0_01/K2
+++ b/tests/sewing/tol_0_01/K2
@@ -1 +1 @@
-restore CCV_2_i2_gtc.rle a
+restore [locate_data_file CCV_2_i2_gtc.rle] a
diff --git a/tests/sewing/tol_0_01/K3 b/tests/sewing/tol_0_01/K3
index 4cafb0b1bf..1bdbf94542 100644
--- a/tests/sewing/tol_0_01/K3
+++ b/tests/sewing/tol_0_01/K3
@@ -1 +1 @@
-restore CTO900_pro12896a.rle a
+restore [locate_data_file CTO900_pro12896a.rle] a
diff --git a/tests/sewing/tol_0_01/K4 b/tests/sewing/tol_0_01/K4
index 260a16b124..eee8cec038 100644
--- a/tests/sewing/tol_0_01/K4
+++ b/tests/sewing/tol_0_01/K4
@@ -1 +1 @@
-restore CTO900_pro12880c.rle a
+restore [locate_data_file CTO900_pro12880c.rle] a
diff --git a/tests/sewing/tol_0_01/K5 b/tests/sewing/tol_0_01/K5
index fb2f4d746b..7d81998bd0 100644
--- a/tests/sewing/tol_0_01/K5
+++ b/tests/sewing/tol_0_01/K5
@@ -1 +1 @@
-restore CTO900_pro12696b.rle a
+restore [locate_data_file CTO900_pro12696b.rle] a
diff --git a/tests/sewing/tol_0_01/K6 b/tests/sewing/tol_0_01/K6
index df309f98b2..e9f2c2ecb4 100644
--- a/tests/sewing/tol_0_01/K6
+++ b/tests/sewing/tol_0_01/K6
@@ -1 +1 @@
-restore CTO900_pro12696a.rle a
+restore [locate_data_file CTO900_pro12696a.rle] a
diff --git a/tests/sewing/tol_0_01/K7 b/tests/sewing/tol_0_01/K7
index 06e05765e8..cc70385a62 100644
--- a/tests/sewing/tol_0_01/K7
+++ b/tests/sewing/tol_0_01/K7
@@ -1 +1 @@
-restore CTO900_pro12695b.rle a
+restore [locate_data_file CTO900_pro12695b.rle] a
diff --git a/tests/sewing/tol_0_01/K8 b/tests/sewing/tol_0_01/K8
index 9a19d8f7ce..e485d55842 100644
--- a/tests/sewing/tol_0_01/K8
+++ b/tests/sewing/tol_0_01/K8
@@ -1 +1 @@
-restore CDA900_pro10142.rle a
+restore [locate_data_file CDA900_pro10142.rle] a
diff --git a/tests/sewing/tol_0_01/K9 b/tests/sewing/tol_0_01/K9
index 0f6e075404..2ca1426682 100644
--- a/tests/sewing/tol_0_01/K9
+++ b/tests/sewing/tol_0_01/K9
@@ -1 +1 @@
-restore CTO900_pro12695a.rle a
+restore [locate_data_file CTO900_pro12695a.rle] a
diff --git a/tests/sewing/tol_0_01/L1 b/tests/sewing/tol_0_01/L1
index 27821af48c..41bceda462 100644
--- a/tests/sewing/tol_0_01/L1
+++ b/tests/sewing/tol_0_01/L1
@@ -1 +1 @@
-restore CFE900_cts20gaj.rle a
+restore [locate_data_file CFE900_cts20gaj.rle] a
diff --git a/tests/sewing/tol_0_01/L2 b/tests/sewing/tol_0_01/L2
index 838ed585ef..8db729903e 100644
--- a/tests/sewing/tol_0_01/L2
+++ b/tests/sewing/tol_0_01/L2
@@ -1 +1 @@
-restore CTO900_pro12660a.rle a
+restore [locate_data_file CTO900_pro12660a.rle] a
diff --git a/tests/sewing/tol_0_01/L3 b/tests/sewing/tol_0_01/L3
index f7056663e2..084d184f60 100644
--- a/tests/sewing/tol_0_01/L3
+++ b/tests/sewing/tol_0_01/L3
@@ -1 +1 @@
-restore CFE900_cts20gal.rle a
+restore [locate_data_file CFE900_cts20gal.rle] a
diff --git a/tests/sewing/tol_0_01/L4 b/tests/sewing/tol_0_01/L4
index f17fc28258..b780833ac2 100644
--- a/tests/sewing/tol_0_01/L4
+++ b/tests/sewing/tol_0_01/L4
@@ -1 +1 @@
-restore CTO900_pro12559b.rle a
+restore [locate_data_file CTO900_pro12559b.rle] a
diff --git a/tests/sewing/tol_0_01/L5 b/tests/sewing/tol_0_01/L5
index 489c28bab4..8763232cde 100644
--- a/tests/sewing/tol_0_01/L5
+++ b/tests/sewing/tol_0_01/L5
@@ -1 +1 @@
-restore CFE900_cts20gan.rle a
+restore [locate_data_file CFE900_cts20gan.rle] a
diff --git a/tests/sewing/tol_0_01/L6 b/tests/sewing/tol_0_01/L6
index 54cc0490b5..1ef71f9ef5 100644
--- a/tests/sewing/tol_0_01/L6
+++ b/tests/sewing/tol_0_01/L6
@@ -1 +1 @@
-restore CFE900_cts20gap.rle a
+restore [locate_data_file CFE900_cts20gap.rle] a
diff --git a/tests/sewing/tol_0_01/L7 b/tests/sewing/tol_0_01/L7
index e2fdb2187a..a270a12905 100644
--- a/tests/sewing/tol_0_01/L7
+++ b/tests/sewing/tol_0_01/L7
@@ -1 +1 @@
-restore CTO900_pro12559a.rle a
+restore [locate_data_file CTO900_pro12559a.rle] a
diff --git a/tests/sewing/tol_0_01/L8 b/tests/sewing/tol_0_01/L8
index 5232087c96..245f9f17bc 100644
--- a/tests/sewing/tol_0_01/L8
+++ b/tests/sewing/tol_0_01/L8
@@ -1 +1 @@
-restore CTO900_pro11828-tool.rle a
+restore [locate_data_file CTO900_pro11828-tool.rle] a
diff --git a/tests/sewing/tol_0_01/L9 b/tests/sewing/tol_0_01/L9
index d4f4e9c70e..ceb85b2eb4 100644
--- a/tests/sewing/tol_0_01/L9
+++ b/tests/sewing/tol_0_01/L9
@@ -1 +1 @@
-restore CFE900_cts20gat.rle a
+restore [locate_data_file CFE900_cts20gat.rle] a
diff --git a/tests/sewing/tol_0_01/M1 b/tests/sewing/tol_0_01/M1
index 14ae16531e..ee3eecb70a 100644
--- a/tests/sewing/tol_0_01/M1
+++ b/tests/sewing/tol_0_01/M1
@@ -1 +1 @@
-restore CTO900_pro11828-part.rle a
+restore [locate_data_file CTO900_pro11828-part.rle] a
diff --git a/tests/sewing/tol_0_01/M2 b/tests/sewing/tol_0_01/M2
index 45a7f498b5..e9411c5127 100644
--- a/tests/sewing/tol_0_01/M2
+++ b/tests/sewing/tol_0_01/M2
@@ -1 +1 @@
-restore CFE900_cts20gbj.rle a
+restore [locate_data_file CFE900_cts20gbj.rle] a
diff --git a/tests/sewing/tol_0_01/M3 b/tests/sewing/tol_0_01/M3
index dd5f1ff597..5c1874991d 100644
--- a/tests/sewing/tol_0_01/M3
+++ b/tests/sewing/tol_0_01/M3
@@ -1 +1 @@
-restore CFE900_cts20gbk.rle a
+restore [locate_data_file CFE900_cts20gbk.rle] a
diff --git a/tests/sewing/tol_0_01/M4 b/tests/sewing/tol_0_01/M4
index 63717b2893..2e42f5cd16 100644
--- a/tests/sewing/tol_0_01/M4
+++ b/tests/sewing/tol_0_01/M4
@@ -1 +1 @@
-restore CTO900_pro11172b.rle a
+restore [locate_data_file CTO900_pro11172b.rle] a
diff --git a/tests/sewing/tol_0_01/M5 b/tests/sewing/tol_0_01/M5
index eebf8420cc..b9d4e7cd02 100644
--- a/tests/sewing/tol_0_01/M5
+++ b/tests/sewing/tol_0_01/M5
@@ -1 +1 @@
-restore CTO900_pro11172a.rle a
+restore [locate_data_file CTO900_pro11172a.rle] a
diff --git a/tests/sewing/tol_0_01/M6 b/tests/sewing/tol_0_01/M6
index b40e448138..1f9cd85857 100644
--- a/tests/sewing/tol_0_01/M6
+++ b/tests/sewing/tol_0_01/M6
@@ -1 +1 @@
-restore CTO900_pro10658a.rle a
+restore [locate_data_file CTO900_pro10658a.rle] a
diff --git a/tests/sewing/tol_0_01/M7 b/tests/sewing/tol_0_01/M7
index ec8a5989a1..178eb852c7 100644
--- a/tests/sewing/tol_0_01/M7
+++ b/tests/sewing/tol_0_01/M7
@@ -1 +1 @@
-restore CTO900_pro10494c.rle a
+restore [locate_data_file CTO900_pro10494c.rle] a
diff --git a/tests/sewing/tol_0_01/M8 b/tests/sewing/tol_0_01/M8
index b7f78bd949..3f94e6f329 100644
--- a/tests/sewing/tol_0_01/M8
+++ b/tests/sewing/tol_0_01/M8
@@ -1 +1 @@
-restore CTO900_pro10494b.rle a
+restore [locate_data_file CTO900_pro10494b.rle] a
diff --git a/tests/sewing/tol_0_01/M9 b/tests/sewing/tol_0_01/M9
index 5dd02c5c2b..9132ecaba7 100644
--- a/tests/sewing/tol_0_01/M9
+++ b/tests/sewing/tol_0_01/M9
@@ -1 +1 @@
-restore CFE900_cts20gcu.rle a
+restore [locate_data_file CFE900_cts20gcu.rle] a
diff --git a/tests/sewing/tol_0_01/N1 b/tests/sewing/tol_0_01/N1
index 8fe6d820e6..6eedc59350 100644
--- a/tests/sewing/tol_0_01/N1
+++ b/tests/sewing/tol_0_01/N1
@@ -1 +1 @@
-restore CHE_bb14.rle a
+restore [locate_data_file CHE_bb14.rle] a
diff --git a/tests/sewing/tol_0_01/N2 b/tests/sewing/tol_0_01/N2
index ac845e97e8..90b63ebcb0 100644
--- a/tests/sewing/tol_0_01/N2
+++ b/tests/sewing/tol_0_01/N2
@@ -1 +1 @@
-restore CHE_bb15.rle a
+restore [locate_data_file CHE_bb15.rle] a
diff --git a/tests/sewing/tol_0_01/N3 b/tests/sewing/tol_0_01/N3
index 9cfc02e90e..792c08bf40 100644
--- a/tests/sewing/tol_0_01/N3
+++ b/tests/sewing/tol_0_01/N3
@@ -1 +1 @@
-restore CFE900_cts20gdi.rle a
+restore [locate_data_file CFE900_cts20gdi.rle] a
diff --git a/tests/sewing/tol_0_01/N4 b/tests/sewing/tol_0_01/N4
index 46a7510f70..3981056cfa 100644
--- a/tests/sewing/tol_0_01/N4
+++ b/tests/sewing/tol_0_01/N4
@@ -1 +1 @@
-restore CHE_bb17.rle a
+restore [locate_data_file CHE_bb17.rle] a
diff --git a/tests/sewing/tol_0_01/N5 b/tests/sewing/tol_0_01/N5
index 4b15c980ff..d9848493d2 100644
--- a/tests/sewing/tol_0_01/N5
+++ b/tests/sewing/tol_0_01/N5
@@ -1 +1 @@
-restore CFE900_cts20gdx.rle a
+restore [locate_data_file CFE900_cts20gdx.rle] a
diff --git a/tests/sewing/tol_0_01/N6 b/tests/sewing/tol_0_01/N6
index 454f82af8a..51326e67aa 100644
--- a/tests/sewing/tol_0_01/N6
+++ b/tests/sewing/tol_0_01/N6
@@ -1 +1 @@
-restore CHE_bb2.rle a
+restore [locate_data_file CHE_bb2.rle] a
diff --git a/tests/sewing/tol_0_01/N7 b/tests/sewing/tol_0_01/N7
index a276410935..7628b1db28 100644
--- a/tests/sewing/tol_0_01/N7
+++ b/tests/sewing/tol_0_01/N7
@@ -1 +1 @@
-restore CFE900_cts20geb.rle a
+restore [locate_data_file CFE900_cts20geb.rle] a
diff --git a/tests/sewing/tol_0_01/N8 b/tests/sewing/tol_0_01/N8
index b5608784f8..4777317a03 100644
--- a/tests/sewing/tol_0_01/N8
+++ b/tests/sewing/tol_0_01/N8
@@ -1 +1 @@
-restore CHE_bb20.rle a
+restore [locate_data_file CHE_bb20.rle] a
diff --git a/tests/sewing/tol_0_01/N9 b/tests/sewing/tol_0_01/N9
index 86afca98ca..04739bb67e 100644
--- a/tests/sewing/tol_0_01/N9
+++ b/tests/sewing/tol_0_01/N9
@@ -1 +1 @@
-restore CFE900_cts20gef.rle a
+restore [locate_data_file CFE900_cts20gef.rle] a
diff --git a/tests/sewing/tol_0_01/O1 b/tests/sewing/tol_0_01/O1
index 4ba91f5190..dacca552ca 100644
--- a/tests/sewing/tol_0_01/O1
+++ b/tests/sewing/tol_0_01/O1
@@ -1 +1 @@
-restore CHE_bb26.rle a
+restore [locate_data_file CHE_bb26.rle] a
diff --git a/tests/sewing/tol_0_01/O2 b/tests/sewing/tol_0_01/O2
index b79f62c959..dfc98cf5b5 100644
--- a/tests/sewing/tol_0_01/O2
+++ b/tests/sewing/tol_0_01/O2
@@ -1 +1 @@
-restore CFE900_cts20geh.rle a
+restore [locate_data_file CFE900_cts20geh.rle] a
diff --git a/tests/sewing/tol_0_01/O3 b/tests/sewing/tol_0_01/O3
index 4860fd1467..6aa9874867 100644
--- a/tests/sewing/tol_0_01/O3
+++ b/tests/sewing/tol_0_01/O3
@@ -1 +1 @@
-restore CHE_bb60.rle a
+restore [locate_data_file CHE_bb60.rle] a
diff --git a/tests/sewing/tol_0_01/O4 b/tests/sewing/tol_0_01/O4
index f49d9e6710..2c75ff58c1 100644
--- a/tests/sewing/tol_0_01/O4
+++ b/tests/sewing/tol_0_01/O4
@@ -1 +1 @@
-restore CFE900_cts20gej.rle a
+restore [locate_data_file CFE900_cts20gej.rle] a
diff --git a/tests/sewing/tol_0_01/O5 b/tests/sewing/tol_0_01/O5
index c346472484..7bd1ba6fb2 100644
--- a/tests/sewing/tol_0_01/O5
+++ b/tests/sewing/tol_0_01/O5
@@ -1 +1 @@
-restore CHE_bb9.rle a
+restore [locate_data_file CHE_bb9.rle] a
diff --git a/tests/sewing/tol_0_01/O6 b/tests/sewing/tol_0_01/O6
index 09973dbe29..a33c6411b3 100644
--- a/tests/sewing/tol_0_01/O6
+++ b/tests/sewing/tol_0_01/O6
@@ -1 +1 @@
-restore CHE_borne.rle a
+restore [locate_data_file CHE_borne.rle] a
diff --git a/tests/sewing/tol_0_01/O7 b/tests/sewing/tol_0_01/O7
index 35c6340b1f..794677695e 100644
--- a/tests/sewing/tol_0_01/O7
+++ b/tests/sewing/tol_0_01/O7
@@ -1 +1 @@
-restore CFE900_cts20gem.rle a
+restore [locate_data_file CFE900_cts20gem.rle] a
diff --git a/tests/sewing/tol_0_01/O8 b/tests/sewing/tol_0_01/O8
index f31859bd2a..61b7682206 100644
--- a/tests/sewing/tol_0_01/O8
+++ b/tests/sewing/tol_0_01/O8
@@ -1 +1 @@
-restore CIN001_a17.rle a
+restore [locate_data_file CIN001_a17.rle] a
diff --git a/tests/sewing/tol_0_01/O9 b/tests/sewing/tol_0_01/O9
index 50a57cf8f8..1201cc8ff0 100644
--- a/tests/sewing/tol_0_01/O9
+++ b/tests/sewing/tol_0_01/O9
@@ -1 +1 @@
-restore CFE900_cts20geo.rle a
+restore [locate_data_file CFE900_cts20geo.rle] a
diff --git a/tests/sewing/tol_0_01/P1 b/tests/sewing/tol_0_01/P1
index 326855e250..eb38d39635 100644
--- a/tests/sewing/tol_0_01/P1
+++ b/tests/sewing/tol_0_01/P1
@@ -1 +1 @@
-restore CIN001_a5.rle a
+restore [locate_data_file CIN001_a5.rle] a
diff --git a/tests/sewing/tol_0_01/P2 b/tests/sewing/tol_0_01/P2
index ce8beb6dfc..ba59400f6c 100644
--- a/tests/sewing/tol_0_01/P2
+++ b/tests/sewing/tol_0_01/P2
@@ -1 +1 @@
-restore CFE900_cts20geq.rle a
+restore [locate_data_file CFE900_cts20geq.rle] a
diff --git a/tests/sewing/tol_0_01/P3 b/tests/sewing/tol_0_01/P3
index 2020530951..bd8933fd2c 100644
--- a/tests/sewing/tol_0_01/P3
+++ b/tests/sewing/tol_0_01/P3
@@ -1 +1 @@
-restore CIN001_b35.rle a
+restore [locate_data_file CIN001_b35.rle] a
diff --git a/tests/sewing/tol_0_01/P4 b/tests/sewing/tol_0_01/P4
index 0b90991846..7237ab6fa1 100644
--- a/tests/sewing/tol_0_01/P4
+++ b/tests/sewing/tol_0_01/P4
@@ -1 +1 @@
-restore CFE900_cts21gbs.rle a
+restore [locate_data_file CFE900_cts21gbs.rle] a
diff --git a/tests/sewing/tol_0_01/P5 b/tests/sewing/tol_0_01/P5
index e98ee15d21..11cd4bd4be 100644
--- a/tests/sewing/tol_0_01/P5
+++ b/tests/sewing/tol_0_01/P5
@@ -1 +1 @@
-restore CIN001_b45.rle a
+restore [locate_data_file CIN001_b45.rle] a
diff --git a/tests/sewing/tol_0_01/P6 b/tests/sewing/tol_0_01/P6
index 774701f8c2..f0c6ac872a 100644
--- a/tests/sewing/tol_0_01/P6
+++ b/tests/sewing/tol_0_01/P6
@@ -1 +1 @@
-restore CIN001_b5.rle a
+restore [locate_data_file CIN001_b5.rle] a
diff --git a/tests/sewing/tol_0_01/P7 b/tests/sewing/tol_0_01/P7
index e0796b4588..b57e490d1c 100644
--- a/tests/sewing/tol_0_01/P7
+++ b/tests/sewing/tol_0_01/P7
@@ -1 +1 @@
-restore CFE900_cts21gdm.rle a
+restore [locate_data_file CFE900_cts21gdm.rle] a
diff --git a/tests/sewing/tol_0_01/P8 b/tests/sewing/tol_0_01/P8
index 51d64ca98f..f4241a435a 100644
--- a/tests/sewing/tol_0_01/P8
+++ b/tests/sewing/tol_0_01/P8
@@ -1 +1 @@
-restore CIN001_b63.rle a
+restore [locate_data_file CIN001_b63.rle] a
diff --git a/tests/sewing/tol_0_01/P9 b/tests/sewing/tol_0_01/P9
index d0b55eeb84..f2d6aedf27 100644
--- a/tests/sewing/tol_0_01/P9
+++ b/tests/sewing/tol_0_01/P9
@@ -1 +1 @@
-restore CFE900_cts21gds.rle a
+restore [locate_data_file CFE900_cts21gds.rle] a
diff --git a/tests/sewing/tol_0_01/Q1 b/tests/sewing/tol_0_01/Q1
index 983e6ce7c6..ab870c7287 100644
--- a/tests/sewing/tol_0_01/Q1
+++ b/tests/sewing/tol_0_01/Q1
@@ -1 +1 @@
-restore CIN001_b70.rle a
+restore [locate_data_file CIN001_b70.rle] a
diff --git a/tests/sewing/tol_0_01/Q2 b/tests/sewing/tol_0_01/Q2
index fb12cdcfa4..9995b92115 100644
--- a/tests/sewing/tol_0_01/Q2
+++ b/tests/sewing/tol_0_01/Q2
@@ -1 +1 @@
-restore CFE900_cts21ges.rle a
+restore [locate_data_file CFE900_cts21ges.rle] a
diff --git a/tests/sewing/tol_0_01/Q3 b/tests/sewing/tol_0_01/Q3
index 54d8a4d09b..246462e868 100644
--- a/tests/sewing/tol_0_01/Q3
+++ b/tests/sewing/tol_0_01/Q3
@@ -1 +1 @@
-restore CFE900_cts21gev.rle a
+restore [locate_data_file CFE900_cts21gev.rle] a
diff --git a/tests/sewing/tol_0_01/Q4 b/tests/sewing/tol_0_01/Q4
index 799f3e3b6b..910333983c 100644
--- a/tests/sewing/tol_0_01/Q4
+++ b/tests/sewing/tol_0_01/Q4
@@ -1 +1 @@
-restore CIN900_buc60204.rle a
+restore [locate_data_file CIN900_buc60204.rle] a
diff --git a/tests/sewing/tol_0_01/Q5 b/tests/sewing/tol_0_01/Q5
index 94420491db..a11bd7782f 100644
--- a/tests/sewing/tol_0_01/Q5
+++ b/tests/sewing/tol_0_01/Q5
@@ -1 +1 @@
-restore CNP001_projoiei.rle a
+restore [locate_data_file CNP001_projoiei.rle] a
diff --git a/tests/sewing/tol_0_01/Q6 b/tests/sewing/tol_0_01/Q6
index 185f67f77b..d97534b6ab 100644
--- a/tests/sewing/tol_0_01/Q6
+++ b/tests/sewing/tol_0_01/Q6
@@ -1 +1 @@
-restore CFE900_ger60gbb.rle a
+restore [locate_data_file CFE900_ger60gbb.rle] a
diff --git a/tests/sewing/tol_0_01/Q7 b/tests/sewing/tol_0_01/Q7
index e64e408f31..9c3205747c 100644
--- a/tests/sewing/tol_0_01/Q7
+++ b/tests/sewing/tol_0_01/Q7
@@ -1 +1 @@
-restore CTO900__box100mm_dsg3.rle a
+restore [locate_data_file CTO900__box100mm_dsg3.rle] a
diff --git a/tests/sewing/tol_0_01/Q8 b/tests/sewing/tol_0_01/Q8
index 78b7c78cd5..116844c0d6 100644
--- a/tests/sewing/tol_0_01/Q8
+++ b/tests/sewing/tol_0_01/Q8
@@ -1 +1 @@
-restore CTO900_buc60127-part.rle a
+restore [locate_data_file CTO900_buc60127-part.rle] a
diff --git a/tests/sewing/tol_0_01/Q9 b/tests/sewing/tol_0_01/Q9
index bbf0b542fa..68bb2ca133 100644
--- a/tests/sewing/tol_0_01/Q9
+++ b/tests/sewing/tol_0_01/Q9
@@ -1 +1 @@
-restore CFE900_ger60gdc.rle a
+restore [locate_data_file CFE900_ger60gdc.rle] a
diff --git a/tests/sewing/tol_0_01/R1 b/tests/sewing/tol_0_01/R1
index c35608351f..84801f94ed 100644
--- a/tests/sewing/tol_0_01/R1
+++ b/tests/sewing/tol_0_01/R1
@@ -1 +1 @@
-restore CTO900_buc60219b.rle a
+restore [locate_data_file CTO900_buc60219b.rle] a
diff --git a/tests/sewing/tol_0_01/R2 b/tests/sewing/tol_0_01/R2
index b3fb070c4c..98ed34b8ab 100644
--- a/tests/sewing/tol_0_01/R2
+++ b/tests/sewing/tol_0_01/R2
@@ -1 +1 @@
-restore CFE900_ger60gfo.rle a
+restore [locate_data_file CFE900_ger60gfo.rle] a
diff --git a/tests/sewing/tol_0_01/R3 b/tests/sewing/tol_0_01/R3
index 179fe06ff1..cf06abb26b 100644
--- a/tests/sewing/tol_0_01/R3
+++ b/tests/sewing/tol_0_01/R3
@@ -1 +1 @@
-restore CTO900_cts16184a.rle a
+restore [locate_data_file CTO900_cts16184a.rle] a
diff --git a/tests/sewing/tol_0_01/R4 b/tests/sewing/tol_0_01/R4
index 699ad87bfd..6a1ce2e019 100644
--- a/tests/sewing/tol_0_01/R4
+++ b/tests/sewing/tol_0_01/R4
@@ -1 +1 @@
-restore CFE900_hkg60gcr.rle a
+restore [locate_data_file CFE900_hkg60gcr.rle] a
diff --git a/tests/sewing/tol_0_01/R5 b/tests/sewing/tol_0_01/R5
index 895653b221..de92e13d87 100644
--- a/tests/sewing/tol_0_01/R5
+++ b/tests/sewing/tol_0_01/R5
@@ -1 +1 @@
-restore CTO900_cts17861a.rle a
+restore [locate_data_file CTO900_cts17861a.rle] a
diff --git a/tests/sewing/tol_0_01/R6 b/tests/sewing/tol_0_01/R6
index df51753d99..88349c863d 100644
--- a/tests/sewing/tol_0_01/R6
+++ b/tests/sewing/tol_0_01/R6
@@ -1 +1 @@
-restore CFE900_id160gdu.rle a
+restore [locate_data_file CFE900_id160gdu.rle] a
diff --git a/tests/sewing/tol_0_01/R7 b/tests/sewing/tol_0_01/R7
index b0bb653bf2..242c1c6695 100644
--- a/tests/sewing/tol_0_01/R7
+++ b/tests/sewing/tol_0_01/R7
@@ -1 +1 @@
-restore CTO900_cts18140-part.rle a
+restore [locate_data_file CTO900_cts18140-part.rle] a
diff --git a/tests/sewing/tol_0_01/R8 b/tests/sewing/tol_0_01/R8
index 1198ea5006..7c2983a443 100644
--- a/tests/sewing/tol_0_01/R8
+++ b/tests/sewing/tol_0_01/R8
@@ -1 +1 @@
-restore CTO900_cts18140-tool.rle a
+restore [locate_data_file CTO900_cts18140-tool.rle] a
diff --git a/tests/sewing/tol_0_01/R9 b/tests/sewing/tol_0_01/R9
index e0fda9eabf..1850da7659 100644
--- a/tests/sewing/tol_0_01/R9
+++ b/tests/sewing/tol_0_01/R9
@@ -1 +1 @@
-restore CFE900_id260gao.rle a
+restore [locate_data_file CFE900_id260gao.rle] a
diff --git a/tests/sewing/tol_0_01/S1 b/tests/sewing/tol_0_01/S1
index 4dbfaf1fad..f8fca2ecd3 100644
--- a/tests/sewing/tol_0_01/S1
+++ b/tests/sewing/tol_0_01/S1
@@ -1 +1 @@
-restore CTO900_cts18754-part.rle a
+restore [locate_data_file CTO900_cts18754-part.rle] a
diff --git a/tests/sewing/tol_0_01/S2 b/tests/sewing/tol_0_01/S2
index 1cebdb87c5..b5c6168409 100644
--- a/tests/sewing/tol_0_01/S2
+++ b/tests/sewing/tol_0_01/S2
@@ -1 +1 @@
-restore CTO900_cts19305-part.rle a
+restore [locate_data_file CTO900_cts19305-part.rle] a
diff --git a/tests/sewing/tol_0_01/S3 b/tests/sewing/tol_0_01/S3
index dc2e208603..5ec46cfe1c 100644
--- a/tests/sewing/tol_0_01/S3
+++ b/tests/sewing/tol_0_01/S3
@@ -1 +1 @@
-restore CTO900_cts19305-tool.rle a
+restore [locate_data_file CTO900_cts19305-tool.rle] a
diff --git a/tests/sewing/tol_0_01/S4 b/tests/sewing/tol_0_01/S4
index cc40bfdfe6..53cbacb0da 100644
--- a/tests/sewing/tol_0_01/S4
+++ b/tests/sewing/tol_0_01/S4
@@ -1 +1 @@
-restore CFE900_pro13gcc.rle a
+restore [locate_data_file CFE900_pro13gcc.rle] a
diff --git a/tests/sewing/tol_0_01/S5 b/tests/sewing/tol_0_01/S5
index 526799e29b..d43c20bcc1 100644
--- a/tests/sewing/tol_0_01/S5
+++ b/tests/sewing/tol_0_01/S5
@@ -1 +1 @@
-restore CFE900_pro13gey.rle a
+restore [locate_data_file CFE900_pro13gey.rle] a
diff --git a/tests/sewing/tol_0_01/S6 b/tests/sewing/tol_0_01/S6
index b0b2eda69c..b44e5dc8e4 100644
--- a/tests/sewing/tol_0_01/S6
+++ b/tests/sewing/tol_0_01/S6
@@ -1 +1 @@
-restore CTO900_cts19485-tool.rle a
+restore [locate_data_file CTO900_cts19485-tool.rle] a
diff --git a/tests/sewing/tol_0_01/S7 b/tests/sewing/tol_0_01/S7
index 5431577236..ed3217d69a 100644
--- a/tests/sewing/tol_0_01/S7
+++ b/tests/sewing/tol_0_01/S7
@@ -1 +1 @@
-restore CFE900_pro13gfe.rle a
+restore [locate_data_file CFE900_pro13gfe.rle] a
diff --git a/tests/sewing/tol_0_01/S8 b/tests/sewing/tol_0_01/S8
index 90fdbd0471..614483e7f4 100644
--- a/tests/sewing/tol_0_01/S8
+++ b/tests/sewing/tol_0_01/S8
@@ -1 +1 @@
-restore CFE900_pro14gcf.rle a
+restore [locate_data_file CFE900_pro14gcf.rle] a
diff --git a/tests/sewing/tol_0_01/S9 b/tests/sewing/tol_0_01/S9
index 50223edf6d..3ed9ae8f14 100644
--- a/tests/sewing/tol_0_01/S9
+++ b/tests/sewing/tol_0_01/S9
@@ -1 +1 @@
-restore CFE900_pro15gcj.rle a
+restore [locate_data_file CFE900_pro15gcj.rle] a
diff --git a/tests/sewing/tol_0_01/T1 b/tests/sewing/tol_0_01/T1
index 1c02f1d78d..6d41e1f208 100644
--- a/tests/sewing/tol_0_01/T1
+++ b/tests/sewing/tol_0_01/T1
@@ -1 +1 @@
-restore CFE900_pro16gdo.rle a
+restore [locate_data_file CFE900_pro16gdo.rle] a
diff --git a/tests/sewing/tol_0_01/T2 b/tests/sewing/tol_0_01/T2
index 7d9284f11e..e5e22fdd09 100644
--- a/tests/sewing/tol_0_01/T2
+++ b/tests/sewing/tol_0_01/T2
@@ -1 +1 @@
-restore CFE900_pro16gff.rle a
+restore [locate_data_file CFE900_pro16gff.rle] a
diff --git a/tests/sewing/tol_0_01/T3 b/tests/sewing/tol_0_01/T3
index aa1ff7473e..ed9692b3c8 100644
--- a/tests/sewing/tol_0_01/T3
+++ b/tests/sewing/tol_0_01/T3
@@ -1 +1 @@
-restore CTO900_cts20072a.rle a
+restore [locate_data_file CTO900_cts20072a.rle] a
diff --git a/tests/sewing/tol_0_01/T4 b/tests/sewing/tol_0_01/T4
index eb232bfc6f..b636cd4066 100644
--- a/tests/sewing/tol_0_01/T4
+++ b/tests/sewing/tol_0_01/T4
@@ -1 +1 @@
-restore CFE900_pro16gfj.rle a
+restore [locate_data_file CFE900_pro16gfj.rle] a
diff --git a/tests/sewing/tol_0_01/T5 b/tests/sewing/tol_0_01/T5
index 90072e0943..5f49ad4768 100644
--- a/tests/sewing/tol_0_01/T5
+++ b/tests/sewing/tol_0_01/T5
@@ -1 +1 @@
-restore CFE900_uki60gfk.rle a
+restore [locate_data_file CFE900_uki60gfk.rle] a
diff --git a/tests/sewing/tol_0_01/T6 b/tests/sewing/tol_0_01/T6
index 788880e6d7..987e6a1797 100644
--- a/tests/sewing/tol_0_01/T6
+++ b/tests/sewing/tol_0_01/T6
@@ -1 +1 @@
-restore CFE901_cts20gfp.rle a
+restore [locate_data_file CFE901_cts20gfp.rle] a
diff --git a/tests/sewing/tol_0_01/T7 b/tests/sewing/tol_0_01/T7
index c422641515..9c62b154c2 100644
--- a/tests/sewing/tol_0_01/T7
+++ b/tests/sewing/tol_0_01/T7
@@ -1 +1 @@
-restore CFE901_cts20gfr.rle a
+restore [locate_data_file CFE901_cts20gfr.rle] a
diff --git a/tests/sewing/tol_0_01/T8 b/tests/sewing/tol_0_01/T8
index 96fac79252..a50ef5d8c7 100644
--- a/tests/sewing/tol_0_01/T8
+++ b/tests/sewing/tol_0_01/T8
@@ -1 +1 @@
-restore CTO900_ger60065-tool.rle a
+restore [locate_data_file CTO900_ger60065-tool.rle] a
diff --git a/tests/sewing/tol_0_01/T9 b/tests/sewing/tol_0_01/T9
index 6b12ae0f3b..eec5e0c3c3 100644
--- a/tests/sewing/tol_0_01/T9
+++ b/tests/sewing/tol_0_01/T9
@@ -1 +1 @@
-restore CFE901_cts21gft.rle a
+restore [locate_data_file CFE901_cts21gft.rle] a
diff --git a/tests/sewing/tol_0_01/U1 b/tests/sewing/tol_0_01/U1
index 51f7458d78..803dd976c7 100644
--- a/tests/sewing/tol_0_01/U1
+++ b/tests/sewing/tol_0_01/U1
@@ -1 +1 @@
-restore CTO900_ger60224d.rle a
+restore [locate_data_file CTO900_ger60224d.rle] a
diff --git a/tests/sewing/tol_0_01/U2 b/tests/sewing/tol_0_01/U2
index b42d86d3d9..d59cdce90b 100644
--- a/tests/sewing/tol_0_01/U2
+++ b/tests/sewing/tol_0_01/U2
@@ -1 +1 @@
-restore CFE901_cts21ggb.rle a
+restore [locate_data_file CFE901_cts21ggb.rle] a
diff --git a/tests/sewing/tol_0_01/U3 b/tests/sewing/tol_0_01/U3
index 592383d5c5..02cef81449 100644
--- a/tests/sewing/tol_0_01/U3
+++ b/tests/sewing/tol_0_01/U3
@@ -1 +1 @@
-restore CTO900_hkg60163d.rle a
+restore [locate_data_file CTO900_hkg60163d.rle] a
diff --git a/tests/sewing/tol_0_01/U4 b/tests/sewing/tol_0_01/U4
index 0e2a24adf3..47d372a6d1 100644
--- a/tests/sewing/tol_0_01/U4
+++ b/tests/sewing/tol_0_01/U4
@@ -1 +1 @@
-restore CFE902_cts20ggk.rle a
+restore [locate_data_file CFE902_cts20ggk.rle] a
diff --git a/tests/sewing/tol_0_01/U5 b/tests/sewing/tol_0_01/U5
index 0a0d2657b9..b66afebba0 100644
--- a/tests/sewing/tol_0_01/U5
+++ b/tests/sewing/tol_0_01/U5
@@ -1 +1 @@
-restore CTO900_jap60038-part.rle a
+restore [locate_data_file CTO900_jap60038-part.rle] a
diff --git a/tests/sewing/tol_0_01/U6 b/tests/sewing/tol_0_01/U6
index dbe30a819a..b8eda38e26 100644
--- a/tests/sewing/tol_0_01/U6
+++ b/tests/sewing/tol_0_01/U6
@@ -1 +1 @@
-restore CFE902_cts21ggm.rle a
+restore [locate_data_file CFE902_cts21ggm.rle] a
diff --git a/tests/sewing/tol_0_01/U7 b/tests/sewing/tol_0_01/U7
index f75eb2dc41..93e67f0049 100644
--- a/tests/sewing/tol_0_01/U7
+++ b/tests/sewing/tol_0_01/U7
@@ -1 +1 @@
-restore CFE902_ger60ggo.rle a
+restore [locate_data_file CFE902_ger60ggo.rle] a
diff --git a/tests/sewing/tol_0_01/U8 b/tests/sewing/tol_0_01/U8
index c073ad2233..877acd65f6 100644
--- a/tests/sewing/tol_0_01/U8
+++ b/tests/sewing/tol_0_01/U8
@@ -1 +1 @@
-restore CTO900_ksi0014a.rle a
+restore [locate_data_file CTO900_ksi0014a.rle] a
diff --git a/tests/sewing/tol_0_01/U9 b/tests/sewing/tol_0_01/U9
index 37971bf111..ce1d1c17aa 100644
--- a/tests/sewing/tol_0_01/U9
+++ b/tests/sewing/tol_0_01/U9
@@ -1 +1 @@
-restore CFE903_cts20ggq.rle a
+restore [locate_data_file CFE903_cts20ggq.rle] a
diff --git a/tests/sewing/tol_0_01/V1 b/tests/sewing/tol_0_01/V1
index 185ba0dbed..d6d8d84112 100644
--- a/tests/sewing/tol_0_01/V1
+++ b/tests/sewing/tol_0_01/V1
@@ -1 +1 @@
-restore CFE903_cts20ghb.rle a
+restore [locate_data_file CFE903_cts20ghb.rle] a
diff --git a/tests/sewing/tol_0_01/V2 b/tests/sewing/tol_0_01/V2
index 8431a1e621..f0aa4156ea 100644
--- a/tests/sewing/tol_0_01/V2
+++ b/tests/sewing/tol_0_01/V2
@@ -1 +1 @@
-restore CFE903_cts21ggr.rle a
+restore [locate_data_file CFE903_cts21ggr.rle] a
diff --git a/tests/sewing/tol_0_01/V3 b/tests/sewing/tol_0_01/V3
index 93ee725fe8..366ec85a7d 100644
--- a/tests/sewing/tol_0_01/V3
+++ b/tests/sewing/tol_0_01/V3
@@ -1 +1 @@
-restore CFE903_cts21ggs.rle a
+restore [locate_data_file CFE903_cts21ggs.rle] a
diff --git a/tests/sewing/tol_0_01/V4 b/tests/sewing/tol_0_01/V4
index 7115451dd7..4adbdaa0c2 100644
--- a/tests/sewing/tol_0_01/V4
+++ b/tests/sewing/tol_0_01/V4
@@ -1 +1 @@
-restore CFE903_cts21ggu.rle a
+restore [locate_data_file CFE903_cts21ggu.rle] a
diff --git a/tests/sewing/tol_0_01/V5 b/tests/sewing/tol_0_01/V5
index fa00f2512d..e28d6adc49 100644
--- a/tests/sewing/tol_0_01/V5
+++ b/tests/sewing/tol_0_01/V5
@@ -1 +1 @@
-restore CFE903_cts21ggv.rle a
+restore [locate_data_file CFE903_cts21ggv.rle] a
diff --git a/tests/sewing/tol_0_01/V6 b/tests/sewing/tol_0_01/V6
index 09938d06b1..c54aa6e648 100644
--- a/tests/sewing/tol_0_01/V6
+++ b/tests/sewing/tol_0_01/V6
@@ -1 +1 @@
-restore CFE903_ger60ggw.rle a
+restore [locate_data_file CFE903_ger60ggw.rle] a
diff --git a/tests/sewing/tol_0_01/V7 b/tests/sewing/tol_0_01/V7
index f83b899008..6dd1e3ef02 100644
--- a/tests/sewing/tol_0_01/V7
+++ b/tests/sewing/tol_0_01/V7
@@ -1 +1 @@
-restore CFE903_pro12ggx.rle a
+restore [locate_data_file CFE903_pro12ggx.rle] a
diff --git a/tests/sewing/tol_0_01/V8 b/tests/sewing/tol_0_01/V8
index b0f5a6c53f..b60cc48123 100644
--- a/tests/sewing/tol_0_01/V8
+++ b/tests/sewing/tol_0_01/V8
@@ -1 +1 @@
-restore CFE903_pro13ggy.rle a
+restore [locate_data_file CFE903_pro13ggy.rle] a
diff --git a/tests/sewing/tol_0_01/V9 b/tests/sewing/tol_0_01/V9
index e7edad68e8..aa23dd0169 100644
--- a/tests/sewing/tol_0_01/V9
+++ b/tests/sewing/tol_0_01/V9
@@ -1 +1 @@
-restore CFE903_pro16ggt.rle a
+restore [locate_data_file CFE903_pro16ggt.rle] a
diff --git a/tests/sewing/tol_0_01/W1 b/tests/sewing/tol_0_01/W1
index 72be211a3b..c5f3f0ec72 100644
--- a/tests/sewing/tol_0_01/W1
+++ b/tests/sewing/tol_0_01/W1
@@ -1 +1 @@
-restore CFE903_pro16ggz.rle a
+restore [locate_data_file CFE903_pro16ggz.rle] a
diff --git a/tests/sewing/tol_0_01/W2 b/tests/sewing/tol_0_01/W2
index 3cf756a64a..7ff8b79661 100644
--- a/tests/sewing/tol_0_01/W2
+++ b/tests/sewing/tol_0_01/W2
@@ -1 +1 @@
-restore CFE903_pro16gha.rle a
+restore [locate_data_file CFE903_pro16gha.rle] a
diff --git a/tests/sewing/tol_0_01/W3 b/tests/sewing/tol_0_01/W3
index 703843fc98..45a12deb38 100644
--- a/tests/sewing/tol_0_01/W3
+++ b/tests/sewing/tol_0_01/W3
@@ -1 +1 @@
-restore CFE_diamagaa.rle a
+restore [locate_data_file CFE_diamagaa.rle] a
diff --git a/tests/sewing/tol_0_01/W4 b/tests/sewing/tol_0_01/W4
index d2c08c77fc..94d314f345 100644
--- a/tests/sewing/tol_0_01/W4
+++ b/tests/sewing/tol_0_01/W4
@@ -1 +1 @@
-restore CFE_diamant.rle a
+restore [locate_data_file CFE_diamant.rle] a
diff --git a/tests/sewing/tol_0_01/W5 b/tests/sewing/tol_0_01/W5
index 4fa73d2bf8..87d324b790 100644
--- a/tests/sewing/tol_0_01/W5
+++ b/tests/sewing/tol_0_01/W5
@@ -1 +1 @@
-restore CFE_e_coufzw.rle a
+restore [locate_data_file CFE_e_coufzw.rle] a
diff --git a/tests/sewing/tol_0_01/W6 b/tests/sewing/tol_0_01/W6
index 83a379fdf9..41b879e030 100644
--- a/tests/sewing/tol_0_01/W6
+++ b/tests/sewing/tol_0_01/W6
@@ -1 +1 @@
-restore CFE_e_lonfzx.rle a
+restore [locate_data_file CFE_e_lonfzx.rle] a
diff --git a/tests/sewing/tol_0_01/W7 b/tests/sewing/tol_0_01/W7
index 2ac4a7a66e..f0ec0aaf52 100644
--- a/tests/sewing/tol_0_01/W7
+++ b/tests/sewing/tol_0_01/W7
@@ -1 +1 @@
-restore CFE_shapegae.rle a
+restore [locate_data_file CFE_shapegae.rle] a
diff --git a/tests/sewing/tol_0_01/W8 b/tests/sewing/tol_0_01/W8
index f7d5b7dec6..50cdd0274a 100644
--- a/tests/sewing/tol_0_01/W8
+++ b/tests/sewing/tol_0_01/W8
@@ -1 +1 @@
-restore CFI901_congefjw.rle a
+restore [locate_data_file CFI901_congefjw.rle] a
diff --git a/tests/sewing/tol_0_01/W9 b/tests/sewing/tol_0_01/W9
index 1ebb8c7ed0..32d984be3c 100644
--- a/tests/sewing/tol_0_01/W9
+++ b/tests/sewing/tol_0_01/W9
@@ -1 +1 @@
-restore CFI901_congefjx.rle a
+restore [locate_data_file CFI901_congefjx.rle] a
diff --git a/tests/sewing/tol_0_01/X1 b/tests/sewing/tol_0_01/X1
index 2e49838fbc..19e7668ccd 100644
--- a/tests/sewing/tol_0_01/X1
+++ b/tests/sewing/tol_0_01/X1
@@ -1 +1 @@
-restore CFI901_congefjy.rle a
+restore [locate_data_file CFI901_congefjy.rle] a
diff --git a/tests/sewing/tol_0_01/X2 b/tests/sewing/tol_0_01/X2
index 24d89f34a0..e287ba3b78 100644
--- a/tests/sewing/tol_0_01/X2
+++ b/tests/sewing/tol_0_01/X2
@@ -1 +1 @@
-restore CFI901_congefka.rle a
+restore [locate_data_file CFI901_congefka.rle] a
diff --git a/tests/sewing/tol_0_01/X3 b/tests/sewing/tol_0_01/X3
index 7a4b078cb9..e0b262a442 100644
--- a/tests/sewing/tol_0_01/X3
+++ b/tests/sewing/tol_0_01/X3
@@ -1 +1 @@
-restore CFI901_congefkb.rle a
+restore [locate_data_file CFI901_congefkb.rle] a
diff --git a/tests/sewing/tol_0_01/X4 b/tests/sewing/tol_0_01/X4
index 77f75c7c34..94719e9481 100644
--- a/tests/sewing/tol_0_01/X4
+++ b/tests/sewing/tol_0_01/X4
@@ -1 +1 @@
-restore CFI901_congefkc.rle a
+restore [locate_data_file CFI901_congefkc.rle] a
diff --git a/tests/sewing/tol_0_01/X5 b/tests/sewing/tol_0_01/X5
index 02302c858a..9f9a1c2fda 100644
--- a/tests/sewing/tol_0_01/X5
+++ b/tests/sewing/tol_0_01/X5
@@ -1 +1 @@
-restore CFI901_congefke.rle a
+restore [locate_data_file CFI901_congefke.rle] a
diff --git a/tests/sewing/tol_0_01/X6 b/tests/sewing/tol_0_01/X6
index 41460a22ee..5fd9ba5afc 100644
--- a/tests/sewing/tol_0_01/X6
+++ b/tests/sewing/tol_0_01/X6
@@ -1 +1 @@
-restore CFI_11_b1fey.rle a
+restore [locate_data_file CFI_11_b1fey.rle] a
diff --git a/tests/sewing/tol_0_01/X7 b/tests/sewing/tol_0_01/X7
index 76f4d66515..1a95f73c68 100644
--- a/tests/sewing/tol_0_01/X7
+++ b/tests/sewing/tol_0_01/X7
@@ -1 +1 @@
-restore CFI_11_b2fez.rle a
+restore [locate_data_file CFI_11_b2fez.rle] a
diff --git a/tests/sewing/tol_0_01/X8 b/tests/sewing/tol_0_01/X8
index 7543980986..bb46dc0719 100644
--- a/tests/sewing/tol_0_01/X8
+++ b/tests/sewing/tol_0_01/X8
@@ -1 +1 @@
-restore CFI_11_c1ffa.rle a
+restore [locate_data_file CFI_11_c1ffa.rle] a
diff --git a/tests/sewing/tol_0_01/X9 b/tests/sewing/tol_0_01/X9
index 9254ad5072..5f3b655767 100644
--- a/tests/sewing/tol_0_01/X9
+++ b/tests/sewing/tol_0_01/X9
@@ -1 +1 @@
-restore CFI_11_d1ffc.rle a
+restore [locate_data_file CFI_11_d1ffc.rle] a
diff --git a/tests/sewing/tol_0_01/Y1 b/tests/sewing/tol_0_01/Y1
index 759c19f305..de535da1f2 100644
--- a/tests/sewing/tol_0_01/Y1
+++ b/tests/sewing/tol_0_01/Y1
@@ -1 +1 @@
-restore CFI_11_d2ffd.rle a
+restore [locate_data_file CFI_11_d2ffd.rle] a
diff --git a/tests/sewing/tol_0_01/Y2 b/tests/sewing/tol_0_01/Y2
index a072c0c219..db34f7b91b 100644
--- a/tests/sewing/tol_0_01/Y2
+++ b/tests/sewing/tol_0_01/Y2
@@ -1 +1 @@
-restore CFI_11_f1ffg.rle a
+restore [locate_data_file CFI_11_f1ffg.rle] a
diff --git a/tests/sewing/tol_0_01/Y3 b/tests/sewing/tol_0_01/Y3
index dbcdbb62f3..8a30786bcc 100644
--- a/tests/sewing/tol_0_01/Y3
+++ b/tests/sewing/tol_0_01/Y3
@@ -1 +1 @@
-restore CFI_11_f2ffh.rle a
+restore [locate_data_file CFI_11_f2ffh.rle] a
diff --git a/tests/sewing/tol_0_01/Y4 b/tests/sewing/tol_0_01/Y4
index 14c47034d4..4f65c732fa 100644
--- a/tests/sewing/tol_0_01/Y4
+++ b/tests/sewing/tol_0_01/Y4
@@ -1 +1 @@
-restore CFI_13_d1ffl.rle a
+restore [locate_data_file CFI_13_d1ffl.rle] a
diff --git a/tests/sewing/tol_0_01/Y5 b/tests/sewing/tol_0_01/Y5
index 8fabbcf839..fc53cfcef3 100644
--- a/tests/sewing/tol_0_01/Y5
+++ b/tests/sewing/tol_0_01/Y5
@@ -1 +1 @@
-restore CFI_13_h1ffp.rle a
+restore [locate_data_file CFI_13_h1ffp.rle] a
diff --git a/tests/sewing/tol_0_01/Y6 b/tests/sewing/tol_0_01/Y6
index 99d3be9e88..565ba2557e 100644
--- a/tests/sewing/tol_0_01/Y6
+++ b/tests/sewing/tol_0_01/Y6
@@ -1 +1 @@
-restore CFI_2_o12ffq.rle a
+restore [locate_data_file CFI_2_o12ffq.rle] a
diff --git a/tests/sewing/tol_0_01/Y7 b/tests/sewing/tol_0_01/Y7
index 53cf7ae9d4..3dcf3cd8d2 100644
--- a/tests/sewing/tol_0_01/Y7
+++ b/tests/sewing/tol_0_01/Y7
@@ -1 +1 @@
-restore CFI_4_f1_ffs.rle a
+restore [locate_data_file CFI_4_f1_ffs.rle] a
diff --git a/tests/sewing/tol_0_01/Y8 b/tests/sewing/tol_0_01/Y8
index b33825a7da..e4d33a853d 100644
--- a/tests/sewing/tol_0_01/Y8
+++ b/tests/sewing/tol_0_01/Y8
@@ -1 +1 @@
-restore CFI_4_g1_fft.rle a
+restore [locate_data_file CFI_4_g1_fft.rle] a
diff --git a/tests/sewing/tol_0_01/Y9 b/tests/sewing/tol_0_01/Y9
index 0b61738ed1..42743cf971 100644
--- a/tests/sewing/tol_0_01/Y9
+++ b/tests/sewing/tol_0_01/Y9
@@ -1 +1 @@
-restore CFI_4_h1_ffu.rle a
+restore [locate_data_file CFI_4_h1_ffu.rle] a
diff --git a/tests/sewing/tol_0_01/Z1 b/tests/sewing/tol_0_01/Z1
index c2591ecc1b..766de592ff 100644
--- a/tests/sewing/tol_0_01/Z1
+++ b/tests/sewing/tol_0_01/Z1
@@ -1 +1 @@
-restore CFI_4_j1_ffv.rle a
+restore [locate_data_file CFI_4_j1_ffv.rle] a
diff --git a/tests/sewing/tol_0_01/Z2 b/tests/sewing/tol_0_01/Z2
index ad76cbd793..6a93e14f62 100644
--- a/tests/sewing/tol_0_01/Z2
+++ b/tests/sewing/tol_0_01/Z2
@@ -1 +1 @@
-restore CFI_5_b12fgg.rle a
+restore [locate_data_file CFI_5_b12fgg.rle] a
diff --git a/tests/sewing/tol_0_01/Z3 b/tests/sewing/tol_0_01/Z3
index 5a599a3d04..4a37d62159 100644
--- a/tests/sewing/tol_0_01/Z3
+++ b/tests/sewing/tol_0_01/Z3
@@ -1 +1 @@
-restore CFI_5_c12fgh.rle a
+restore [locate_data_file CFI_5_c12fgh.rle] a
diff --git a/tests/sewing/tol_0_01/Z4 b/tests/sewing/tol_0_01/Z4
index 05ce641d74..b81974b186 100644
--- a/tests/sewing/tol_0_01/Z4
+++ b/tests/sewing/tol_0_01/Z4
@@ -1 +1 @@
-restore CFI_5_d12fgi.rle a
+restore [locate_data_file CFI_5_d12fgi.rle] a
diff --git a/tests/sewing/tol_0_01/Z5 b/tests/sewing/tol_0_01/Z5
index 5484701f55..5438a5514e 100644
--- a/tests/sewing/tol_0_01/Z5
+++ b/tests/sewing/tol_0_01/Z5
@@ -1 +1 @@
-restore CFI_5_e12fgj.rle a
+restore [locate_data_file CFI_5_e12fgj.rle] a
diff --git a/tests/sewing/tol_0_01/Z6 b/tests/sewing/tol_0_01/Z6
index fa3f4b0ad3..ef3275e040 100644
--- a/tests/sewing/tol_0_01/Z6
+++ b/tests/sewing/tol_0_01/Z6
@@ -1 +1 @@
-restore CFI_5_f12fgk.rle a
+restore [locate_data_file CFI_5_f12fgk.rle] a
diff --git a/tests/sewing/tol_0_01/Z7 b/tests/sewing/tol_0_01/Z7
index 847811c445..8b8ee17084 100644
--- a/tests/sewing/tol_0_01/Z7
+++ b/tests/sewing/tol_0_01/Z7
@@ -1 +1 @@
-restore CFI_5_g12fgl.rle a
+restore [locate_data_file CFI_5_g12fgl.rle] a
diff --git a/tests/sewing/tol_0_01/Z8 b/tests/sewing/tol_0_01/Z8
index 281849c3c7..7f5a0b8568 100644
--- a/tests/sewing/tol_0_01/Z8
+++ b/tests/sewing/tol_0_01/Z8
@@ -1 +1 @@
-restore PRO17826.rle a
+restore [locate_data_file PRO17826.rle] a
diff --git a/tests/sewing/tol_0_01/Z9 b/tests/sewing/tol_0_01/Z9
index c26f605f3b..3f3d9b86d1 100644
--- a/tests/sewing/tol_0_01/Z9
+++ b/tests/sewing/tol_0_01/Z9
@@ -1 +1 @@
-restore PRO8434.rle a
+restore [locate_data_file PRO8434.rle] a
diff --git a/tests/sewing/tol_1/A1 b/tests/sewing/tol_1/A1
index b608c18986..ca66bb5b6f 100644
--- a/tests/sewing/tol_1/A1
+++ b/tests/sewing/tol_1/A1
@@ -1 +1 @@
-restore CTO900_pro12913b.rle a
+restore [locate_data_file CTO900_pro12913b.rle] a
diff --git a/tests/sewing/tol_1/A2 b/tests/sewing/tol_1/A2
index 163a3f1eec..6a81af7c91 100644
--- a/tests/sewing/tol_1/A2
+++ b/tests/sewing/tol_1/A2
@@ -1 +1 @@
-restore CTO900_pro12953-part.rle a
+restore [locate_data_file CTO900_pro12953-part.rle] a
diff --git a/tests/sewing/tol_1/A3 b/tests/sewing/tol_1/A3
index 9d6badec82..dea94e9bec 100644
--- a/tests/sewing/tol_1/A3
+++ b/tests/sewing/tol_1/A3
@@ -1 +1 @@
-restore CTO900_pro12953-tool.rle a
+restore [locate_data_file CTO900_pro12953-tool.rle] a
diff --git a/tests/sewing/tol_1/A4 b/tests/sewing/tol_1/A4
index 20a70a0e1c..237da992fb 100644
--- a/tests/sewing/tol_1/A4
+++ b/tests/sewing/tol_1/A4
@@ -1 +1 @@
-restore CTO900_pro14240c.rle a
+restore [locate_data_file CTO900_pro14240c.rle] a
diff --git a/tests/sewing/tol_1/A5 b/tests/sewing/tol_1/A5
index 9fa127a1e4..8a15bb059d 100644
--- a/tests/sewing/tol_1/A5
+++ b/tests/sewing/tol_1/A5
@@ -1 +1 @@
-restore CTO900_pro14260c.rle a
+restore [locate_data_file CTO900_pro14260c.rle] a
diff --git a/tests/sewing/tol_1/A6 b/tests/sewing/tol_1/A6
index 5bf63ab71a..60d3d7600c 100644
--- a/tests/sewing/tol_1/A6
+++ b/tests/sewing/tol_1/A6
@@ -1 +1 @@
-restore CTO900_pro14621d.rle a
+restore [locate_data_file CTO900_pro14621d.rle] a
diff --git a/tests/sewing/tol_1/A7 b/tests/sewing/tol_1/A7
index e7925b259b..5c2bf1c53d 100644
--- a/tests/sewing/tol_1/A7
+++ b/tests/sewing/tol_1/A7
@@ -1 +1 @@
-restore CTO900_pro15323c.rle a
+restore [locate_data_file CTO900_pro15323c.rle] a
diff --git a/tests/sewing/tol_1/A8 b/tests/sewing/tol_1/A8
index 5f2d3cae62..d7e8e5d105 100644
--- a/tests/sewing/tol_1/A8
+++ b/tests/sewing/tol_1/A8
@@ -1 +1 @@
-restore CFE900_cts60gdk.rle a
+restore [locate_data_file CFE900_cts60gdk.rle] a
diff --git a/tests/sewing/tol_1/A9 b/tests/sewing/tol_1/A9
index c1a951cafc..2b1c20ca46 100644
--- a/tests/sewing/tol_1/A9
+++ b/tests/sewing/tol_1/A9
@@ -1 +1 @@
-restore CTO900_pro5363_resultok_dsg3.rle a
+restore [locate_data_file CTO900_pro5363_resultok_dsg3.rle] a
diff --git a/tests/sewing/tol_1/B1 b/tests/sewing/tol_1/B1
index 6998f72224..695b116076 100644
--- a/tests/sewing/tol_1/B1
+++ b/tests/sewing/tol_1/B1
@@ -1 +1 @@
-restore CFE900_fra61gcz.rle a
+restore [locate_data_file CFE900_fra61gcz.rle] a
diff --git a/tests/sewing/tol_1/B2 b/tests/sewing/tol_1/B2
index 53cf3988de..bfbc7393bb 100644
--- a/tests/sewing/tol_1/B2
+++ b/tests/sewing/tol_1/B2
@@ -1 +1 @@
-restore CTO900_pro5363a.rle a
+restore [locate_data_file CTO900_pro5363a.rle] a
diff --git a/tests/sewing/tol_1/B3 b/tests/sewing/tol_1/B3
index 2407d8872a..658fb1525f 100644
--- a/tests/sewing/tol_1/B3
+++ b/tests/sewing/tol_1/B3
@@ -1 +1 @@
-restore CFE900_fra61gdz.rle a
+restore [locate_data_file CFE900_fra61gdz.rle] a
diff --git a/tests/sewing/tol_1/B4 b/tests/sewing/tol_1/B4
index 03d0c0688a..f5c9aede6e 100644
--- a/tests/sewing/tol_1/B4
+++ b/tests/sewing/tol_1/B4
@@ -1 +1 @@
-restore CTO900_pro5363c.rle a
+restore [locate_data_file CTO900_pro5363c.rle] a
diff --git a/tests/sewing/tol_1/B5 b/tests/sewing/tol_1/B5
index af944ca9f8..5990035b99 100644
--- a/tests/sewing/tol_1/B5
+++ b/tests/sewing/tol_1/B5
@@ -1 +1 @@
-restore CFE900_pro16gdq.rle a
+restore [locate_data_file CFE900_pro16gdq.rle] a
diff --git a/tests/sewing/tol_1/B6 b/tests/sewing/tol_1/B6
index 6c5f8f4dff..07a8f9d1d4 100644
--- a/tests/sewing/tol_1/B6
+++ b/tests/sewing/tol_1/B6
@@ -1 +1 @@
-restore CTO900_pro5363c_created_dsg3.rle a
+restore [locate_data_file CTO900_pro5363c_created_dsg3.rle] a
diff --git a/tests/sewing/tol_1/B7 b/tests/sewing/tol_1/B7
index 04d697662e..106daf25c0 100644
--- a/tests/sewing/tol_1/B7
+++ b/tests/sewing/tol_1/B7
@@ -1 +1 @@
-restore CTO901_cts20216_outil.rle a
+restore [locate_data_file CTO901_cts20216_outil.rle] a
diff --git a/tests/sewing/tol_1/B8 b/tests/sewing/tol_1/B8
index 3e86e919ac..c7a480e5a5 100644
--- a/tests/sewing/tol_1/B8
+++ b/tests/sewing/tol_1/B8
@@ -1 +1 @@
-restore CTO901_cts20222_base.rle a
+restore [locate_data_file CTO901_cts20222_base.rle] a
diff --git a/tests/sewing/tol_1/B9 b/tests/sewing/tol_1/B9
index 6f6e904474..d9260b148c 100644
--- a/tests/sewing/tol_1/B9
+++ b/tests/sewing/tol_1/B9
@@ -1 +1 @@
-restore CFE901_cts19gge.rle a
+restore [locate_data_file CFE901_cts19gge.rle] a
diff --git a/tests/sewing/tol_1/C1 b/tests/sewing/tol_1/C1
index 673ccafe09..c0ad13b19f 100644
--- a/tests/sewing/tol_1/C1
+++ b/tests/sewing/tol_1/C1
@@ -1 +1 @@
-restore CTO901_cts20222_outil.rle a
+restore [locate_data_file CTO901_cts20222_outil.rle] a
diff --git a/tests/sewing/tol_1/C2 b/tests/sewing/tol_1/C2
index 3e2b094534..537486e60f 100644
--- a/tests/sewing/tol_1/C2
+++ b/tests/sewing/tol_1/C2
@@ -1 +1 @@
-restore CTO902_cts20339a.rle a
+restore [locate_data_file CTO902_cts20339a.rle] a
diff --git a/tests/sewing/tol_1/C3 b/tests/sewing/tol_1/C3
index a287a7bd20..2a414c8961 100644
--- a/tests/sewing/tol_1/C3
+++ b/tests/sewing/tol_1/C3
@@ -1 +1 @@
-restore CFE901_cts21gfv.rle a
+restore [locate_data_file CFE901_cts21gfv.rle] a
diff --git a/tests/sewing/tol_1/C4 b/tests/sewing/tol_1/C4
index 0e9bcfbd6c..0c3a13a7ff 100644
--- a/tests/sewing/tol_1/C4
+++ b/tests/sewing/tol_1/C4
@@ -1 +1 @@
-restore CTO902_cts20339b.rle a
+restore [locate_data_file CTO902_cts20339b.rle] a
diff --git a/tests/sewing/tol_1/C5 b/tests/sewing/tol_1/C5
index 2e34b14566..cad6a5eb2d 100644
--- a/tests/sewing/tol_1/C5
+++ b/tests/sewing/tol_1/C5
@@ -1 +1 @@
-restore CFE901_cts21gfy.rle a
+restore [locate_data_file CFE901_cts21gfy.rle] a
diff --git a/tests/sewing/tol_1/C6 b/tests/sewing/tol_1/C6
index c83ab82592..0ae17c298d 100644
--- a/tests/sewing/tol_1/C6
+++ b/tests/sewing/tol_1/C6
@@ -1 +1 @@
-restore CTO902_cts20362-part.rle a
+restore [locate_data_file CTO902_cts20362-part.rle] a
diff --git a/tests/sewing/tol_1/C7 b/tests/sewing/tol_1/C7
index 607e08403d..80ca67432e 100644
--- a/tests/sewing/tol_1/C7
+++ b/tests/sewing/tol_1/C7
@@ -1 +1 @@
-restore CTO902_cts20397-part.rle a
+restore [locate_data_file CTO902_cts20397-part.rle] a
diff --git a/tests/sewing/tol_1/C8 b/tests/sewing/tol_1/C8
index df6c32c214..572dc0064c 100644
--- a/tests/sewing/tol_1/C8
+++ b/tests/sewing/tol_1/C8
@@ -1 +1 @@
-restore CTO902_cts20397-tool.rle a
+restore [locate_data_file CTO902_cts20397-tool.rle] a
diff --git a/tests/sewing/tol_1/C9 b/tests/sewing/tol_1/C9
index f300ccd911..5fff46dfe4 100644
--- a/tests/sewing/tol_1/C9
+++ b/tests/sewing/tol_1/C9
@@ -1 +1 @@
-restore CTO902_cts20452a.rle a
+restore [locate_data_file CTO902_cts20452a.rle] a
diff --git a/tests/sewing/tol_1/D1 b/tests/sewing/tol_1/D1
index 4b6a2c194e..04ae245b24 100644
--- a/tests/sewing/tol_1/D1
+++ b/tests/sewing/tol_1/D1
@@ -1 +1 @@
-restore CTO902_cts20452b.rle a
+restore [locate_data_file CTO902_cts20452b.rle] a
diff --git a/tests/sewing/tol_1/D2 b/tests/sewing/tol_1/D2
index a24db3e08e..14a1b1fb7b 100644
--- a/tests/sewing/tol_1/D2
+++ b/tests/sewing/tol_1/D2
@@ -1 +1 @@
-restore CTO904_pro14893a.rle a
+restore [locate_data_file CTO904_pro14893a.rle] a
diff --git a/tests/sewing/tol_1/D3 b/tests/sewing/tol_1/D3
index 608f954e82..2a05bef66b 100644
--- a/tests/sewing/tol_1/D3
+++ b/tests/sewing/tol_1/D3
@@ -1 +1 @@
-restore CTO902_cts20453b.rle a
+restore [locate_data_file CTO902_cts20453b.rle] a
diff --git a/tests/sewing/tol_1/D4 b/tests/sewing/tol_1/D4
index c349f8ebdf..d6cb01f9dc 100644
--- a/tests/sewing/tol_1/D4
+++ b/tests/sewing/tol_1/D4
@@ -1 +1 @@
-restore CTO902_cts20454a.rle a
+restore [locate_data_file CTO902_cts20454a.rle] a
diff --git a/tests/sewing/tol_1/D5 b/tests/sewing/tol_1/D5
index 9dae922715..ad150e0f3b 100644
--- a/tests/sewing/tol_1/D5
+++ b/tests/sewing/tol_1/D5
@@ -1 +1 @@
-restore CTO902_cts20455-part.rle a
+restore [locate_data_file CTO902_cts20455-part.rle] a
diff --git a/tests/sewing/tol_1/D6 b/tests/sewing/tol_1/D6
index 28027a454b..547d235c28 100644
--- a/tests/sewing/tol_1/D6
+++ b/tests/sewing/tol_1/D6
@@ -1 +1 @@
-restore CTO902_cts20455-tool.rle a
+restore [locate_data_file CTO902_cts20455-tool.rle] a
diff --git a/tests/sewing/tol_1/D7 b/tests/sewing/tol_1/D7
index 3c7b3c8ace..a9d5c98368 100644
--- a/tests/sewing/tol_1/D7
+++ b/tests/sewing/tol_1/D7
@@ -1 +1 @@
-restore CTO902_cts20456a.rle a
+restore [locate_data_file CTO902_cts20456a.rle] a
diff --git a/tests/sewing/tol_1/D8 b/tests/sewing/tol_1/D8
index 05a70822be..3b87c36172 100644
--- a/tests/sewing/tol_1/D8
+++ b/tests/sewing/tol_1/D8
@@ -1 +1 @@
-restore CTO902_cts20456d.rle a
+restore [locate_data_file CTO902_cts20456d.rle] a
diff --git a/tests/sewing/tol_1/D9 b/tests/sewing/tol_1/D9
index 3beee02ee5..d254b359b6 100644
--- a/tests/sewing/tol_1/D9
+++ b/tests/sewing/tol_1/D9
@@ -1 +1 @@
-restore CFE_extrugab.rle a
+restore [locate_data_file CFE_extrugab.rle] a
diff --git a/tests/sewing/tol_1/E1 b/tests/sewing/tol_1/E1
index eebf8420cc..b9d4e7cd02 100644
--- a/tests/sewing/tol_1/E1
+++ b/tests/sewing/tol_1/E1
@@ -1 +1 @@
-restore CTO900_pro11172a.rle a
+restore [locate_data_file CTO900_pro11172a.rle] a
diff --git a/tests/sewing/tol_1/E2 b/tests/sewing/tol_1/E2
index 6871239cae..7740634220 100644
--- a/tests/sewing/tol_1/E2
+++ b/tests/sewing/tol_1/E2
@@ -1 +1 @@
-restore CFE_osa_sgad.rle a
+restore [locate_data_file CFE_osa_sgad.rle] a
diff --git a/tests/sewing/tol_1/E3 b/tests/sewing/tol_1/E3
index ea007905a5..d55da9995b 100644
--- a/tests/sewing/tol_1/E3
+++ b/tests/sewing/tol_1/E3
@@ -1 +1 @@
-restore CTO902_cts20457a.rle a
+restore [locate_data_file CTO902_cts20457a.rle] a
diff --git a/tests/sewing/tol_1/E4 b/tests/sewing/tol_1/E4
index 756dd390d8..09c1eeca7d 100644
--- a/tests/sewing/tol_1/E4
+++ b/tests/sewing/tol_1/E4
@@ -1 +1 @@
-restore CFE_revshape.rle a
+restore [locate_data_file CFE_revshape.rle] a
diff --git a/tests/sewing/tol_1/E5 b/tests/sewing/tol_1/E5
index 260cd63858..fe794627cd 100644
--- a/tests/sewing/tol_1/E5
+++ b/tests/sewing/tol_1/E5
@@ -1 +1 @@
-restore CFI901_congefkd.rle a
+restore [locate_data_file CFI901_congefkd.rle] a
diff --git a/tests/sewing/tol_1/E6 b/tests/sewing/tol_1/E6
index d019284a3b..0eb691df6b 100644
--- a/tests/sewing/tol_1/E6
+++ b/tests/sewing/tol_1/E6
@@ -1 +1 @@
-restore CFI_11_a1few.rle a
+restore [locate_data_file CFI_11_a1few.rle] a
diff --git a/tests/sewing/tol_1/E7 b/tests/sewing/tol_1/E7
index f335e2fd11..35982c2ad2 100644
--- a/tests/sewing/tol_1/E7
+++ b/tests/sewing/tol_1/E7
@@ -1 +1 @@
-restore CFI_11_a2fex.rle a
+restore [locate_data_file CFI_11_a2fex.rle] a
diff --git a/tests/sewing/tol_1/E8 b/tests/sewing/tol_1/E8
index 74ce8a052f..95fdb430c0 100644
--- a/tests/sewing/tol_1/E8
+++ b/tests/sewing/tol_1/E8
@@ -1 +1 @@
-restore CFI_11_c2ffb.rle a
+restore [locate_data_file CFI_11_c2ffb.rle] a
diff --git a/tests/sewing/tol_1/E9 b/tests/sewing/tol_1/E9
index c5587a77d9..107cad5f20 100644
--- a/tests/sewing/tol_1/E9
+++ b/tests/sewing/tol_1/E9
@@ -1 +1 @@
-restore CFI_11_e1ffe.rle a
+restore [locate_data_file CFI_11_e1ffe.rle] a
diff --git a/tests/sewing/tol_1/F1 b/tests/sewing/tol_1/F1
index 2d2ed34589..7f5f107043 100644
--- a/tests/sewing/tol_1/F1
+++ b/tests/sewing/tol_1/F1
@@ -1 +1 @@
-restore CFI_11_e2fff.rle a
+restore [locate_data_file CFI_11_e2fff.rle] a
diff --git a/tests/sewing/tol_1/F2 b/tests/sewing/tol_1/F2
index d521de4010..20f15e3753 100644
--- a/tests/sewing/tol_1/F2
+++ b/tests/sewing/tol_1/F2
@@ -1 +1 @@
-restore CFI_13_a1ffi.rle a
+restore [locate_data_file CFI_13_a1ffi.rle] a
diff --git a/tests/sewing/tol_1/F3 b/tests/sewing/tol_1/F3
index c4e9b904a5..5c839e12af 100644
--- a/tests/sewing/tol_1/F3
+++ b/tests/sewing/tol_1/F3
@@ -1 +1 @@
-restore CFI_13_b1ffj.rle a
+restore [locate_data_file CFI_13_b1ffj.rle] a
diff --git a/tests/sewing/tol_1/F4 b/tests/sewing/tol_1/F4
index aed36316d5..187e022f09 100644
--- a/tests/sewing/tol_1/F4
+++ b/tests/sewing/tol_1/F4
@@ -1 +1 @@
-restore CFI_13_c1ffk.rle a
+restore [locate_data_file CFI_13_c1ffk.rle] a
diff --git a/tests/sewing/tol_1/F5 b/tests/sewing/tol_1/F5
index eb8f297972..55273994ef 100644
--- a/tests/sewing/tol_1/F5
+++ b/tests/sewing/tol_1/F5
@@ -1 +1 @@
-restore CFI_13_e1ffm.rle a
+restore [locate_data_file CFI_13_e1ffm.rle] a
diff --git a/tests/sewing/tol_1/F6 b/tests/sewing/tol_1/F6
index 82a916159b..7c075e4823 100644
--- a/tests/sewing/tol_1/F6
+++ b/tests/sewing/tol_1/F6
@@ -1 +1 @@
-restore CFI_13_f1ffn.rle a
+restore [locate_data_file CFI_13_f1ffn.rle] a
diff --git a/tests/sewing/tol_1/F7 b/tests/sewing/tol_1/F7
index 59dfda7ce4..b04afa3663 100644
--- a/tests/sewing/tol_1/F7
+++ b/tests/sewing/tol_1/F7
@@ -1 +1 @@
-restore CFI_13_g1ffo.rle a
+restore [locate_data_file CFI_13_g1ffo.rle] a
diff --git a/tests/sewing/tol_1/F8 b/tests/sewing/tol_1/F8
index 5874d34744..d119919bf3 100644
--- a/tests/sewing/tol_1/F8
+++ b/tests/sewing/tol_1/F8
@@ -1 +1 @@
-restore CFI_4_e1_ffr.rle a
+restore [locate_data_file CFI_4_e1_ffr.rle] a
diff --git a/tests/sewing/tol_1/F9 b/tests/sewing/tol_1/F9
index dee0849c2d..580d9626da 100644
--- a/tests/sewing/tol_1/F9
+++ b/tests/sewing/tol_1/F9
@@ -1 +1 @@
-restore CFI_5_h12fgm.rle a
+restore [locate_data_file CFI_5_h12fgm.rle] a
diff --git a/tests/sewing/tol_1/G1 b/tests/sewing/tol_1/G1
index 3b47efc69f..012abde36b 100644
--- a/tests/sewing/tol_1/G1
+++ b/tests/sewing/tol_1/G1
@@ -1 +1 @@
-restore CFI_5_i12fgn.rle a
+restore [locate_data_file CFI_5_i12fgn.rle] a
diff --git a/tests/sewing/tol_1/G2 b/tests/sewing/tol_1/G2
index 2111aa83e5..a3c6b11f2a 100644
--- a/tests/sewing/tol_1/G2
+++ b/tests/sewing/tol_1/G2
@@ -1 +1 @@
-restore CFI_5_j12fgo.rle a
+restore [locate_data_file CFI_5_j12fgo.rle] a
diff --git a/tests/sewing/tol_1/G3 b/tests/sewing/tol_1/G3
index a66283e240..113247a377 100644
--- a/tests/sewing/tol_1/G3
+++ b/tests/sewing/tol_1/G3
@@ -1 +1 @@
-restore CFI_5_k12fgp.rle a
+restore [locate_data_file CFI_5_k12fgp.rle] a
diff --git a/tests/sewing/tol_1/G4 b/tests/sewing/tol_1/G4
index 46b9927031..44b244ac2b 100644
--- a/tests/sewing/tol_1/G4
+++ b/tests/sewing/tol_1/G4
@@ -1 +1 @@
-restore CFI_5_l12fgq.rle a
+restore [locate_data_file CFI_5_l12fgq.rle] a
diff --git a/tests/sewing/tol_1/G5 b/tests/sewing/tol_1/G5
index 4bb1249320..c17f38150c 100644
--- a/tests/sewing/tol_1/G5
+++ b/tests/sewing/tol_1/G5
@@ -1 +1 @@
-restore CFI_6_a12fgr.rle a
+restore [locate_data_file CFI_6_a12fgr.rle] a
diff --git a/tests/sewing/tol_1/G6 b/tests/sewing/tol_1/G6
index 2f639914db..735d78b1df 100644
--- a/tests/sewing/tol_1/G6
+++ b/tests/sewing/tol_1/G6
@@ -1 +1 @@
-restore CFI_6_a56fgs.rle a
+restore [locate_data_file CFI_6_a56fgs.rle] a
diff --git a/tests/sewing/tol_1/G7 b/tests/sewing/tol_1/G7
index 0d5e6bcee5..dfcb026dd1 100644
--- a/tests/sewing/tol_1/G7
+++ b/tests/sewing/tol_1/G7
@@ -1 +1 @@
-restore CFI_6_b12fgt.rle a
+restore [locate_data_file CFI_6_b12fgt.rle] a
diff --git a/tests/sewing/tol_1/G8 b/tests/sewing/tol_1/G8
index 2cf6ff9bdd..c62c5929d5 100644
--- a/tests/sewing/tol_1/G8
+++ b/tests/sewing/tol_1/G8
@@ -1 +1 @@
-restore CFI_6_b56fgu.rle a
+restore [locate_data_file CFI_6_b56fgu.rle] a
diff --git a/tests/sewing/tol_1/G9 b/tests/sewing/tol_1/G9
index 555305c71e..29d45ee4e2 100644
--- a/tests/sewing/tol_1/G9
+++ b/tests/sewing/tol_1/G9
@@ -1 +1 @@
-restore CFI_6_c12fgv.rle a
+restore [locate_data_file CFI_6_c12fgv.rle] a
diff --git a/tests/sewing/tol_1/H1 b/tests/sewing/tol_1/H1
index d630ba5b47..9e8889e0aa 100644
--- a/tests/sewing/tol_1/H1
+++ b/tests/sewing/tol_1/H1
@@ -1 +1 @@
-restore CFI_6_c56fgw.rle a
+restore [locate_data_file CFI_6_c56fgw.rle] a
diff --git a/tests/sewing/tol_1/H2 b/tests/sewing/tol_1/H2
index bcb5ed3c8c..33acf9bfab 100644
--- a/tests/sewing/tol_1/H2
+++ b/tests/sewing/tol_1/H2
@@ -1 +1 @@
-restore CFI_6_d12fgx.rle a
+restore [locate_data_file CFI_6_d12fgx.rle] a
diff --git a/tests/sewing/tol_1/H3 b/tests/sewing/tol_1/H3
index 9c60df4f19..b0a4183b81 100644
--- a/tests/sewing/tol_1/H3
+++ b/tests/sewing/tol_1/H3
@@ -1 +1 @@
-restore CFI_6_d56fgy.rle a
+restore [locate_data_file CFI_6_d56fgy.rle] a
diff --git a/tests/sewing/tol_1/H4 b/tests/sewing/tol_1/H4
index e0dfcc9628..8ecd66ab75 100644
--- a/tests/sewing/tol_1/H4
+++ b/tests/sewing/tol_1/H4
@@ -1 +1 @@
-restore CFI_6_e12fgz.rle a
+restore [locate_data_file CFI_6_e12fgz.rle] a
diff --git a/tests/sewing/tol_1/H5 b/tests/sewing/tol_1/H5
index 5e8cfab74f..b47b00b1c1 100644
--- a/tests/sewing/tol_1/H5
+++ b/tests/sewing/tol_1/H5
@@ -1 +1 @@
-restore CFI_6_e56fha.rle a
+restore [locate_data_file CFI_6_e56fha.rle] a
diff --git a/tests/sewing/tol_1/H6 b/tests/sewing/tol_1/H6
index b625c4f044..3f31eef07d 100644
--- a/tests/sewing/tol_1/H6
+++ b/tests/sewing/tol_1/H6
@@ -1 +1 @@
-restore CFI_6_f12fhb.rle a
+restore [locate_data_file CFI_6_f12fhb.rle] a
diff --git a/tests/sewing/tol_1/H7 b/tests/sewing/tol_1/H7
index 6e8ae52d32..38ca4e458a 100644
--- a/tests/sewing/tol_1/H7
+++ b/tests/sewing/tol_1/H7
@@ -1 +1 @@
-restore CFI_6_f56fhc.rle a
+restore [locate_data_file CFI_6_f56fhc.rle] a
diff --git a/tests/sewing/tol_1/H8 b/tests/sewing/tol_1/H8
index 5aa722efe4..0a6eff69ae 100644
--- a/tests/sewing/tol_1/H8
+++ b/tests/sewing/tol_1/H8
@@ -1 +1 @@
-restore CFI_6_g12fhd.rle a
+restore [locate_data_file CFI_6_g12fhd.rle] a
diff --git a/tests/sewing/tol_1/H9 b/tests/sewing/tol_1/H9
index 0b814a6b25..86c1ac62b1 100644
--- a/tests/sewing/tol_1/H9
+++ b/tests/sewing/tol_1/H9
@@ -1 +1 @@
-restore CFI_6_g56fhe.rle a
+restore [locate_data_file CFI_6_g56fhe.rle] a
diff --git a/tests/sewing/tol_1/I1 b/tests/sewing/tol_1/I1
index 9ffa2dbc54..c5f7829721 100644
--- a/tests/sewing/tol_1/I1
+++ b/tests/sewing/tol_1/I1
@@ -1 +1 @@
-restore CFI_6_h12fhf.rle a
+restore [locate_data_file CFI_6_h12fhf.rle] a
diff --git a/tests/sewing/tol_1/I2 b/tests/sewing/tol_1/I2
index 5ed73db363..dc7080fdd1 100644
--- a/tests/sewing/tol_1/I2
+++ b/tests/sewing/tol_1/I2
@@ -1 +1 @@
-restore CFI_6_h56fhg.rle a
+restore [locate_data_file CFI_6_h56fhg.rle] a
diff --git a/tests/sewing/tol_1/I3 b/tests/sewing/tol_1/I3
index b8cc906741..87dc4daf2a 100644
--- a/tests/sewing/tol_1/I3
+++ b/tests/sewing/tol_1/I3
@@ -1 +1 @@
-restore CFI_6_i12fhh.rle a
+restore [locate_data_file CFI_6_i12fhh.rle] a
diff --git a/tests/sewing/tol_1/I4 b/tests/sewing/tol_1/I4
index 6a9077991d..3bc0d0567d 100644
--- a/tests/sewing/tol_1/I4
+++ b/tests/sewing/tol_1/I4
@@ -1 +1 @@
-restore CFI_6_i56fhi.rle a
+restore [locate_data_file CFI_6_i56fhi.rle] a
diff --git a/tests/sewing/tol_1/I5 b/tests/sewing/tol_1/I5
index 8bdf8edc82..1dfd564717 100644
--- a/tests/sewing/tol_1/I5
+++ b/tests/sewing/tol_1/I5
@@ -1 +1 @@
-restore CFI_7_a1_fhj.rle a
+restore [locate_data_file CFI_7_a1_fhj.rle] a
diff --git a/tests/sewing/tol_1/I6 b/tests/sewing/tol_1/I6
index 5d2978b930..eba6d2f2ef 100644
--- a/tests/sewing/tol_1/I6
+++ b/tests/sewing/tol_1/I6
@@ -1 +1 @@
-restore CFI_7_a4_fhl.rle a
+restore [locate_data_file CFI_7_a4_fhl.rle] a
diff --git a/tests/sewing/tol_1/I7 b/tests/sewing/tol_1/I7
index 005e3c035d..e56938ca20 100644
--- a/tests/sewing/tol_1/I7
+++ b/tests/sewing/tol_1/I7
@@ -1 +1 @@
-restore CFI_7_c1_fho.rle a
+restore [locate_data_file CFI_7_c1_fho.rle] a
diff --git a/tests/sewing/tol_1/I8 b/tests/sewing/tol_1/I8
index d0d5619390..81ac800a57 100644
--- a/tests/sewing/tol_1/I8
+++ b/tests/sewing/tol_1/I8
@@ -1 +1 @@
-restore CFI_7_c3_fhq.rle a
+restore [locate_data_file CFI_7_c3_fhq.rle] a
diff --git a/tests/sewing/tol_1/I9 b/tests/sewing/tol_1/I9
index 0c331cae88..9ba6c69f43 100644
--- a/tests/sewing/tol_1/I9
+++ b/tests/sewing/tol_1/I9
@@ -1 +1 @@
-restore CFI_7_f1_fhs.rle a
+restore [locate_data_file CFI_7_f1_fhs.rle] a
diff --git a/tests/sewing/tol_1/J1 b/tests/sewing/tol_1/J1
index c1cf5f539c..ca33917f8c 100644
--- a/tests/sewing/tol_1/J1
+++ b/tests/sewing/tol_1/J1
@@ -1 +1 @@
-restore CFI_8_e1_fhw.rle a
+restore [locate_data_file CFI_8_e1_fhw.rle] a
diff --git a/tests/sewing/tol_1/J2 b/tests/sewing/tol_1/J2
index 3b8339947d..1b1b64cb5d 100644
--- a/tests/sewing/tol_1/J2
+++ b/tests/sewing/tol_1/J2
@@ -1 +1 @@
-restore CFI_8_i1_fia.rle a
+restore [locate_data_file CFI_8_i1_fia.rle] a
diff --git a/tests/sewing/tol_1/J3 b/tests/sewing/tol_1/J3
index c5ba3e2112..011a3ac5f7 100644
--- a/tests/sewing/tol_1/J3
+++ b/tests/sewing/tol_1/J3
@@ -1 +1 @@
-restore CFI_a1234fic.rle a
+restore [locate_data_file CFI_a1234fic.rle] a
diff --git a/tests/sewing/tol_1/J4 b/tests/sewing/tol_1/J4
index a4c114ebcc..b8d900240d 100644
--- a/tests/sewing/tol_1/J4
+++ b/tests/sewing/tol_1/J4
@@ -1 +1 @@
-restore CFI_a5678fid.rle a
+restore [locate_data_file CFI_a5678fid.rle] a
diff --git a/tests/sewing/tol_1/J5 b/tests/sewing/tol_1/J5
index 99f7a5ecde..002fcf4e9f 100644
--- a/tests/sewing/tol_1/J5
+++ b/tests/sewing/tol_1/J5
@@ -1 +1 @@
-restore CTO902_cts20458a.rle a
+restore [locate_data_file CTO902_cts20458a.rle] a
diff --git a/tests/sewing/tol_1/J6 b/tests/sewing/tol_1/J6
index 7b40d4b2e9..f8738a1791 100644
--- a/tests/sewing/tol_1/J6
+++ b/tests/sewing/tol_1/J6
@@ -1 +1 @@
-restore CFI_buc60330.rle a
+restore [locate_data_file CFI_buc60330.rle] a
diff --git a/tests/sewing/tol_1/J7 b/tests/sewing/tol_1/J7
index 61229e6755..0f00209653 100644
--- a/tests/sewing/tol_1/J7
+++ b/tests/sewing/tol_1/J7
@@ -1 +1 @@
-restore CFI_buc60360.rle a
+restore [locate_data_file CFI_buc60360.rle] a
diff --git a/tests/sewing/tol_1/J8 b/tests/sewing/tol_1/J8
index a64f89f81e..2fb60082b4 100644
--- a/tests/sewing/tol_1/J8
+++ b/tests/sewing/tol_1/J8
@@ -1 +1 @@
-restore CFI_buc60fjt.rle a
+restore [locate_data_file CFI_buc60fjt.rle] a
diff --git a/tests/sewing/tol_1/J9 b/tests/sewing/tol_1/J9
index a13c97e2dd..8141ff8ae0 100644
--- a/tests/sewing/tol_1/J9
+++ b/tests/sewing/tol_1/J9
@@ -1 +1 @@
-restore CFI_cfi90fjb.rle a
+restore [locate_data_file CFI_cfi90fjb.rle] a
diff --git a/tests/sewing/tol_1/K1 b/tests/sewing/tol_1/K1
index d811a5bf7a..f1c634b7ee 100644
--- a/tests/sewing/tol_1/K1
+++ b/tests/sewing/tol_1/K1
@@ -1 +1 @@
-restore CFI_cfi90fjc.rle a
+restore [locate_data_file CFI_cfi90fjc.rle] a
diff --git a/tests/sewing/tol_1/K2 b/tests/sewing/tol_1/K2
index 9c974d0f1f..6a085b500b 100644
--- a/tests/sewing/tol_1/K2
+++ b/tests/sewing/tol_1/K2
@@ -1 +1 @@
-restore CFI_cts16288.rle a
+restore [locate_data_file CFI_cts16288.rle] a
diff --git a/tests/sewing/tol_1/K3 b/tests/sewing/tol_1/K3
index 482a71d88e..cf485e8d89 100644
--- a/tests/sewing/tol_1/K3
+++ b/tests/sewing/tol_1/K3
@@ -1 +1 @@
-restore CFI_cts19335.rle a
+restore [locate_data_file CFI_cts19335.rle] a
diff --git a/tests/sewing/tol_1/K4 b/tests/sewing/tol_1/K4
index 33a6a68a0b..e568cc2c54 100644
--- a/tests/sewing/tol_1/K4
+++ b/tests/sewing/tol_1/K4
@@ -1 +1 @@
-restore CFI_cts19347.rle a
+restore [locate_data_file CFI_cts19347.rle] a
diff --git a/tests/sewing/tol_1/K5 b/tests/sewing/tol_1/K5
index 4902489891..93a49df4c6 100644
--- a/tests/sewing/tol_1/K5
+++ b/tests/sewing/tol_1/K5
@@ -1 +1 @@
-restore CFI_cts19997.rle a
+restore [locate_data_file CFI_cts19997.rle] a
diff --git a/tests/sewing/tol_1/K6 b/tests/sewing/tol_1/K6
index d8a5fb196f..93a77cb166 100644
--- a/tests/sewing/tol_1/K6
+++ b/tests/sewing/tol_1/K6
@@ -1 +1 @@
-restore CFI_cts20006.rle a
+restore [locate_data_file CFI_cts20006.rle] a
diff --git a/tests/sewing/tol_1/K7 b/tests/sewing/tol_1/K7
index a1c63da4f5..385f08caf1 100644
--- a/tests/sewing/tol_1/K7
+++ b/tests/sewing/tol_1/K7
@@ -1 +1 @@
-restore CFI_cts20401.rle a
+restore [locate_data_file CFI_cts20401.rle] a
diff --git a/tests/sewing/tol_1/K8 b/tests/sewing/tol_1/K8
index cb0526b9fa..aa2daa0e72 100644
--- a/tests/sewing/tol_1/K8
+++ b/tests/sewing/tol_1/K8
@@ -1 +1 @@
-restore CFI_cts20686.rle a
+restore [locate_data_file CFI_cts20686.rle] a
diff --git a/tests/sewing/tol_1/K9 b/tests/sewing/tol_1/K9
index fa385d5f1a..1767508b46 100644
--- a/tests/sewing/tol_1/K9
+++ b/tests/sewing/tol_1/K9
@@ -1 +1 @@
-restore CFI_cts20970.rle a
+restore [locate_data_file CFI_cts20970.rle] a
diff --git a/tests/sewing/tol_1/L1 b/tests/sewing/tol_1/L1
index 81e27db47a..43f90d5f88 100644
--- a/tests/sewing/tol_1/L1
+++ b/tests/sewing/tol_1/L1
@@ -1 +1 @@
-restore CFI_cts21020.rle a
+restore [locate_data_file CFI_cts21020.rle] a
diff --git a/tests/sewing/tol_1/L2 b/tests/sewing/tol_1/L2
index d984548069..bb6cc62b57 100644
--- a/tests/sewing/tol_1/L2
+++ b/tests/sewing/tol_1/L2
@@ -1 +1 @@
-restore CFI_cts21183.rle a
+restore [locate_data_file CFI_cts21183.rle] a
diff --git a/tests/sewing/tol_1/L3 b/tests/sewing/tol_1/L3
index cb870d0853..b07514fd9b 100644
--- a/tests/sewing/tol_1/L3
+++ b/tests/sewing/tol_1/L3
@@ -1 +1 @@
-restore CFI_cts21256.rle a
+restore [locate_data_file CFI_cts21256.rle] a
diff --git a/tests/sewing/tol_1/L4 b/tests/sewing/tol_1/L4
index 428c09e7cc..02d3c6c904 100644
--- a/tests/sewing/tol_1/L4
+++ b/tests/sewing/tol_1/L4
@@ -1 +1 @@
-restore CFI_cts21348.rle a
+restore [locate_data_file CFI_cts21348.rle] a
diff --git a/tests/sewing/tol_1/L5 b/tests/sewing/tol_1/L5
index 375e854e12..71bebcb60a 100644
--- a/tests/sewing/tol_1/L5
+++ b/tests/sewing/tol_1/L5
@@ -1 +1 @@
-restore CFI_cts21363.rle a
+restore [locate_data_file CFI_cts21363.rle] a
diff --git a/tests/sewing/tol_1/L6 b/tests/sewing/tol_1/L6
index 255b2eb329..b6672714e9 100644
--- a/tests/sewing/tol_1/L6
+++ b/tests/sewing/tol_1/L6
@@ -1 +1 @@
-restore CFI_cts21630.rle a
+restore [locate_data_file CFI_cts21630.rle] a
diff --git a/tests/sewing/tol_1/L7 b/tests/sewing/tol_1/L7
index 3efb5077fa..60cce21aaa 100644
--- a/tests/sewing/tol_1/L7
+++ b/tests/sewing/tol_1/L7
@@ -1 +1 @@
-restore CFI_cts40124.rle a
+restore [locate_data_file CFI_cts40124.rle] a
diff --git a/tests/sewing/tol_1/L8 b/tests/sewing/tol_1/L8
index c20a59a2c3..6e849fa048 100644
--- a/tests/sewing/tol_1/L8
+++ b/tests/sewing/tol_1/L8
@@ -1 +1 @@
-restore CFI_d1234fii.rle a
+restore [locate_data_file CFI_d1234fii.rle] a
diff --git a/tests/sewing/tol_1/L9 b/tests/sewing/tol_1/L9
index a0aaa7cbaa..79d72e0479 100644
--- a/tests/sewing/tol_1/L9
+++ b/tests/sewing/tol_1/L9
@@ -1 +1 @@
-restore CFI_d5678fij.rle a
+restore [locate_data_file CFI_d5678fij.rle] a
diff --git a/tests/sewing/tol_1/M1 b/tests/sewing/tol_1/M1
index 64d79938ac..7bb2dc4cfd 100644
--- a/tests/sewing/tol_1/M1
+++ b/tests/sewing/tol_1/M1
@@ -1 +1 @@
-restore CFI_e1234fik.rle a
+restore [locate_data_file CFI_e1234fik.rle] a
diff --git a/tests/sewing/tol_1/M2 b/tests/sewing/tol_1/M2
index ec77ee9a34..fbef8f5b1b 100644
--- a/tests/sewing/tol_1/M2
+++ b/tests/sewing/tol_1/M2
@@ -1 +1 @@
-restore CFI_e5678fil.rle a
+restore [locate_data_file CFI_e5678fil.rle] a
diff --git a/tests/sewing/tol_1/M3 b/tests/sewing/tol_1/M3
index 9b575a1a1e..3b89cc5524 100644
--- a/tests/sewing/tol_1/M3
+++ b/tests/sewing/tol_1/M3
@@ -1 +1 @@
-restore CFI_f1234fim.rle a
+restore [locate_data_file CFI_f1234fim.rle] a
diff --git a/tests/sewing/tol_1/M4 b/tests/sewing/tol_1/M4
index a01cf5a087..95c5c6b451 100644
--- a/tests/sewing/tol_1/M4
+++ b/tests/sewing/tol_1/M4
@@ -1 +1 @@
-restore CFI_f5678fin.rle a
+restore [locate_data_file CFI_f5678fin.rle] a
diff --git a/tests/sewing/tol_1/M5 b/tests/sewing/tol_1/M5
index 3db2ce41a2..a69db4358f 100644
--- a/tests/sewing/tol_1/M5
+++ b/tests/sewing/tol_1/M5
@@ -1 +1 @@
-restore CFI_fra60610.rle a
+restore [locate_data_file CFI_fra60610.rle] a
diff --git a/tests/sewing/tol_1/M6 b/tests/sewing/tol_1/M6
index 7d353da072..9947f0009d 100644
--- a/tests/sewing/tol_1/M6
+++ b/tests/sewing/tol_1/M6
@@ -1 +1 @@
-restore CFI_ger60206.rle a
+restore [locate_data_file CFI_ger60206.rle] a
diff --git a/tests/sewing/tol_1/M7 b/tests/sewing/tol_1/M7
index 71bd72900e..00aac4f85f 100644
--- a/tests/sewing/tol_1/M7
+++ b/tests/sewing/tol_1/M7
@@ -1 +1 @@
-restore CFI_ger60656.rle a
+restore [locate_data_file CFI_ger60656.rle] a
diff --git a/tests/sewing/tol_1/M8 b/tests/sewing/tol_1/M8
index 495a85c659..b8595cf7df 100644
--- a/tests/sewing/tol_1/M8
+++ b/tests/sewing/tol_1/M8
@@ -1 +1 @@
-restore CFI_id150009.rle a
+restore [locate_data_file CFI_id150009.rle] a
diff --git a/tests/sewing/tol_1/M9 b/tests/sewing/tol_1/M9
index be84dd0081..72b0861ed7 100644
--- a/tests/sewing/tol_1/M9
+++ b/tests/sewing/tol_1/M9
@@ -1 +1 @@
-restore CFI_id150018.rle a
+restore [locate_data_file CFI_id150018.rle] a
diff --git a/tests/sewing/tol_1/N1 b/tests/sewing/tol_1/N1
index b3de0b833b..f8d57900ba 100644
--- a/tests/sewing/tol_1/N1
+++ b/tests/sewing/tol_1/N1
@@ -1 +1 @@
-restore CFI_id260039.rle a
+restore [locate_data_file CFI_id260039.rle] a
diff --git a/tests/sewing/tol_1/N2 b/tests/sewing/tol_1/N2
index 16477b8dea..9d1306cbd0 100644
--- a/tests/sewing/tol_1/N2
+++ b/tests/sewing/tol_1/N2
@@ -1 +1 @@
-restore CFI_indusfjm.rle a
+restore [locate_data_file CFI_indusfjm.rle] a
diff --git a/tests/sewing/tol_1/N3 b/tests/sewing/tol_1/N3
index 30d97c6b49..39d83e527f 100644
--- a/tests/sewing/tol_1/N3
+++ b/tests/sewing/tol_1/N3
@@ -1 +1 @@
-restore CFI_jap50078.rle a
+restore [locate_data_file CFI_jap50078.rle] a
diff --git a/tests/sewing/tol_1/N4 b/tests/sewing/tol_1/N4
index 89a3ca271b..a75cb6b4e9 100644
--- a/tests/sewing/tol_1/N4
+++ b/tests/sewing/tol_1/N4
@@ -1 +1 @@
-restore CFI_l12__fiu.rle a
+restore [locate_data_file CFI_l12__fiu.rle] a
diff --git a/tests/sewing/tol_1/N5 b/tests/sewing/tol_1/N5
index 4136e331c8..e9026d114b 100644
--- a/tests/sewing/tol_1/N5
+++ b/tests/sewing/tol_1/N5
@@ -1 +1 @@
-restore CFI_m12__fiv.rle a
+restore [locate_data_file CFI_m12__fiv.rle] a
diff --git a/tests/sewing/tol_1/N6 b/tests/sewing/tol_1/N6
index 0a7b6da66b..b388ff189c 100644
--- a/tests/sewing/tol_1/N6
+++ b/tests/sewing/tol_1/N6
@@ -1 +1 @@
-restore CFI_o12__fix.rle a
+restore [locate_data_file CFI_o12__fix.rle] a
diff --git a/tests/sewing/tol_1/N7 b/tests/sewing/tol_1/N7
index 4283471e20..9897b4f9f7 100644
--- a/tests/sewing/tol_1/N7
+++ b/tests/sewing/tol_1/N7
@@ -1 +1 @@
-restore CFI_pro10117.rle a
+restore [locate_data_file CFI_pro10117.rle] a
diff --git a/tests/sewing/tol_1/N8 b/tests/sewing/tol_1/N8
index e71d5c8902..720d5561ac 100644
--- a/tests/sewing/tol_1/N8
+++ b/tests/sewing/tol_1/N8
@@ -1 +1 @@
-restore CFI_pro10129.rle a
+restore [locate_data_file CFI_pro10129.rle] a
diff --git a/tests/sewing/tol_1/N9 b/tests/sewing/tol_1/N9
index 72adb8def8..9208077421 100644
--- a/tests/sewing/tol_1/N9
+++ b/tests/sewing/tol_1/N9
@@ -1 +1 @@
-restore CFI_pro10320.rle a
+restore [locate_data_file CFI_pro10320.rle] a
diff --git a/tests/sewing/tol_1/O1 b/tests/sewing/tol_1/O1
index 7b4fe854c3..04ac88459f 100644
--- a/tests/sewing/tol_1/O1
+++ b/tests/sewing/tol_1/O1
@@ -1 +1 @@
-restore CFI_pro10321.rle a
+restore [locate_data_file CFI_pro10321.rle] a
diff --git a/tests/sewing/tol_1/O2 b/tests/sewing/tol_1/O2
index a466c46143..56faff2081 100644
--- a/tests/sewing/tol_1/O2
+++ b/tests/sewing/tol_1/O2
@@ -1 +1 @@
-restore CFI_pro10356.rle a
+restore [locate_data_file CFI_pro10356.rle] a
diff --git a/tests/sewing/tol_1/O3 b/tests/sewing/tol_1/O3
index 5535d5a6cd..389e01c762 100644
--- a/tests/sewing/tol_1/O3
+++ b/tests/sewing/tol_1/O3
@@ -1 +1 @@
-restore CFI_pro10391.rle a
+restore [locate_data_file CFI_pro10391.rle] a
diff --git a/tests/sewing/tol_1/O4 b/tests/sewing/tol_1/O4
index d96f9259da..3e0b035c44 100644
--- a/tests/sewing/tol_1/O4
+++ b/tests/sewing/tol_1/O4
@@ -1 +1 @@
-restore CFI_pro10522.rle a
+restore [locate_data_file CFI_pro10522.rle] a
diff --git a/tests/sewing/tol_1/O5 b/tests/sewing/tol_1/O5
index 3e35fb68c6..ca4d09ee75 100644
--- a/tests/sewing/tol_1/O5
+++ b/tests/sewing/tol_1/O5
@@ -1 +1 @@
-restore CFI_pro10631.rle a
+restore [locate_data_file CFI_pro10631.rle] a
diff --git a/tests/sewing/tol_1/O6 b/tests/sewing/tol_1/O6
index dd1e374283..403194583b 100644
--- a/tests/sewing/tol_1/O6
+++ b/tests/sewing/tol_1/O6
@@ -1 +1 @@
-restore CFI_pro11850.rle a
+restore [locate_data_file CFI_pro11850.rle] a
diff --git a/tests/sewing/tol_1/O7 b/tests/sewing/tol_1/O7
index fa2cf3a2d2..7799fbc318 100644
--- a/tests/sewing/tol_1/O7
+++ b/tests/sewing/tol_1/O7
@@ -1 +1 @@
-restore CFI_pro12305.rle a
+restore [locate_data_file CFI_pro12305.rle] a
diff --git a/tests/sewing/tol_1/O8 b/tests/sewing/tol_1/O8
index 97b2a8ab8f..31b82e05a1 100644
--- a/tests/sewing/tol_1/O8
+++ b/tests/sewing/tol_1/O8
@@ -1 +1 @@
-restore CFI_pro12404.rle a
+restore [locate_data_file CFI_pro12404.rle] a
diff --git a/tests/sewing/tol_1/O9 b/tests/sewing/tol_1/O9
index 1b0997d968..452f507d09 100644
--- a/tests/sewing/tol_1/O9
+++ b/tests/sewing/tol_1/O9
@@ -1 +1 @@
-restore CFI_pro12794.rle a
+restore [locate_data_file CFI_pro12794.rle] a
diff --git a/tests/sewing/tol_1/P1 b/tests/sewing/tol_1/P1
index 8b48cf1d4b..94132b5a1a 100644
--- a/tests/sewing/tol_1/P1
+++ b/tests/sewing/tol_1/P1
@@ -1 +1 @@
-restore CTO902_cts20458b.rle a
+restore [locate_data_file CTO902_cts20458b.rle] a
diff --git a/tests/sewing/tol_1/P2 b/tests/sewing/tol_1/P2
index 3c1706a436..0445e743bd 100644
--- a/tests/sewing/tol_1/P2
+++ b/tests/sewing/tol_1/P2
@@ -1 +1 @@
-restore CFI_pro12894.rle a
+restore [locate_data_file CFI_pro12894.rle] a
diff --git a/tests/sewing/tol_1/P3 b/tests/sewing/tol_1/P3
index 01d71fe3c2..b04219ae62 100644
--- a/tests/sewing/tol_1/P3
+++ b/tests/sewing/tol_1/P3
@@ -1 +1 @@
-restore CFI_pro13127.rle a
+restore [locate_data_file CFI_pro13127.rle] a
diff --git a/tests/sewing/tol_1/P4 b/tests/sewing/tol_1/P4
index 5d25bd51ec..3ab61b85fc 100644
--- a/tests/sewing/tol_1/P4
+++ b/tests/sewing/tol_1/P4
@@ -1 +1 @@
-restore CFI_pro13892.rle a
+restore [locate_data_file CFI_pro13892.rle] a
diff --git a/tests/sewing/tol_1/P5 b/tests/sewing/tol_1/P5
index 5c8dd0317e..a86d4d0575 100644
--- a/tests/sewing/tol_1/P5
+++ b/tests/sewing/tol_1/P5
@@ -1 +1 @@
-restore CFI_pro13893.rle a
+restore [locate_data_file CFI_pro13893.rle] a
diff --git a/tests/sewing/tol_1/P6 b/tests/sewing/tol_1/P6
index 5a62af0124..b54e48673c 100644
--- a/tests/sewing/tol_1/P6
+++ b/tests/sewing/tol_1/P6
@@ -1 +1 @@
-restore CFI_pro5203.rle a
+restore [locate_data_file CFI_pro5203.rle] a
diff --git a/tests/sewing/tol_1/P7 b/tests/sewing/tol_1/P7
index 7a90f79b56..b38a95b32a 100644
--- a/tests/sewing/tol_1/P7
+++ b/tests/sewing/tol_1/P7
@@ -1 +1 @@
-restore CFI_pro5477.rle a
+restore [locate_data_file CFI_pro5477.rle] a
diff --git a/tests/sewing/tol_1/P8 b/tests/sewing/tol_1/P8
index 804c4979ee..b39d73e313 100644
--- a/tests/sewing/tol_1/P8
+++ b/tests/sewing/tol_1/P8
@@ -1 +1 @@
-restore CFI_pro5545.rle a
+restore [locate_data_file CFI_pro5545.rle] a
diff --git a/tests/sewing/tol_1/P9 b/tests/sewing/tol_1/P9
index e6c3c0c20c..4b4421c99e 100644
--- a/tests/sewing/tol_1/P9
+++ b/tests/sewing/tol_1/P9
@@ -1 +1 @@
-restore CFI_pro5807.rle a
+restore [locate_data_file CFI_pro5807.rle] a
diff --git a/tests/sewing/tol_1/Q1 b/tests/sewing/tol_1/Q1
index df99705fce..038c866bbe 100644
--- a/tests/sewing/tol_1/Q1
+++ b/tests/sewing/tol_1/Q1
@@ -1 +1 @@
-restore CFI_pro6309a.rle a
+restore [locate_data_file CFI_pro6309a.rle] a
diff --git a/tests/sewing/tol_1/Q2 b/tests/sewing/tol_1/Q2
index 8b8b860c0f..8cd762e27a 100644
--- a/tests/sewing/tol_1/Q2
+++ b/tests/sewing/tol_1/Q2
@@ -1 +1 @@
-restore CFI_pro6309c.rle a
+restore [locate_data_file CFI_pro6309c.rle] a
diff --git a/tests/sewing/tol_1/Q3 b/tests/sewing/tol_1/Q3
index b4e7f63c1b..2b8271107b 100644
--- a/tests/sewing/tol_1/Q3
+++ b/tests/sewing/tol_1/Q3
@@ -1 +1 @@
-restore CFI_pro6309d.rle a
+restore [locate_data_file CFI_pro6309d.rle] a
diff --git a/tests/sewing/tol_1/Q4 b/tests/sewing/tol_1/Q4
index 6d875d1940..8f797d6115 100644
--- a/tests/sewing/tol_1/Q4
+++ b/tests/sewing/tol_1/Q4
@@ -1 +1 @@
-restore CTO902_cts20459-part.rle a
+restore [locate_data_file CTO902_cts20459-part.rle] a
diff --git a/tests/sewing/tol_1/Q5 b/tests/sewing/tol_1/Q5
index c200b8a45e..5fba89429d 100644
--- a/tests/sewing/tol_1/Q5
+++ b/tests/sewing/tol_1/Q5
@@ -1 +1 @@
-restore CFI_pro6944.rle a
+restore [locate_data_file CFI_pro6944.rle] a
diff --git a/tests/sewing/tol_1/Q6 b/tests/sewing/tol_1/Q6
index 9a267ded9d..a5cf807bed 100644
--- a/tests/sewing/tol_1/Q6
+++ b/tests/sewing/tol_1/Q6
@@ -1 +1 @@
-restore CFI_pro8783.rle a
+restore [locate_data_file CFI_pro8783.rle] a
diff --git a/tests/sewing/tol_1/Q7 b/tests/sewing/tol_1/Q7
index 41b31bcd59..97773f234e 100644
--- a/tests/sewing/tol_1/Q7
+++ b/tests/sewing/tol_1/Q7
@@ -1 +1 @@
-restore CFI_pro8792.rle a
+restore [locate_data_file CFI_pro8792.rle] a
diff --git a/tests/sewing/tol_1/Q8 b/tests/sewing/tol_1/Q8
index ec89c79efd..403fe27f54 100644
--- a/tests/sewing/tol_1/Q8
+++ b/tests/sewing/tol_1/Q8
@@ -1 +1 @@
-restore CFI_pro8828.rle a
+restore [locate_data_file CFI_pro8828.rle] a
diff --git a/tests/sewing/tol_1/Q9 b/tests/sewing/tol_1/Q9
index ab5d0ef736..551db60961 100644
--- a/tests/sewing/tol_1/Q9
+++ b/tests/sewing/tol_1/Q9
@@ -1 +1 @@
-restore CTO902_cts20459-tool.rle a
+restore [locate_data_file CTO902_cts20459-tool.rle] a
diff --git a/tests/sewing/tol_1/R1 b/tests/sewing/tol_1/R1
index 5d7eeec992..581d93bcc7 100644
--- a/tests/sewing/tol_1/R1
+++ b/tests/sewing/tol_1/R1
@@ -1 +1 @@
-restore CFI_pro9067.rle a
+restore [locate_data_file CFI_pro9067.rle] a
diff --git a/tests/sewing/tol_1/R2 b/tests/sewing/tol_1/R2
index ff61e35d0e..29dfaaa874 100644
--- a/tests/sewing/tol_1/R2
+++ b/tests/sewing/tol_1/R2
@@ -1 +1 @@
-restore CFI_pro90fjr.rle a
+restore [locate_data_file CFI_pro90fjr.rle] a
diff --git a/tests/sewing/tol_1/R3 b/tests/sewing/tol_1/R3
index ac1a718f34..ad10c1d753 100644
--- a/tests/sewing/tol_1/R3
+++ b/tests/sewing/tol_1/R3
@@ -1 +1 @@
-restore CFI_pro9169.rle a
+restore [locate_data_file CFI_pro9169.rle] a
diff --git a/tests/sewing/tol_1/R4 b/tests/sewing/tol_1/R4
index e90f1dcce0..00f9fd556f 100644
--- a/tests/sewing/tol_1/R4
+++ b/tests/sewing/tol_1/R4
@@ -1 +1 @@
-restore CFI_pro9480.rle a
+restore [locate_data_file CFI_pro9480.rle] a
diff --git a/tests/sewing/tol_1/R5 b/tests/sewing/tol_1/R5
index a4b626919c..2df8e2a482 100644
--- a/tests/sewing/tol_1/R5
+++ b/tests/sewing/tol_1/R5
@@ -1 +1 @@
-restore CFI_pro9523.rle a
+restore [locate_data_file CFI_pro9523.rle] a
diff --git a/tests/sewing/tol_1/R6 b/tests/sewing/tol_1/R6
index dc5d2b45fd..6bceb8f429 100644
--- a/tests/sewing/tol_1/R6
+++ b/tests/sewing/tol_1/R6
@@ -1 +1 @@
-restore CHE900_cts21271.rle a
+restore [locate_data_file CHE900_cts21271.rle] a
diff --git a/tests/sewing/tol_1/R7 b/tests/sewing/tol_1/R7
index f276f1282c..ede5b28139 100644
--- a/tests/sewing/tol_1/R7
+++ b/tests/sewing/tol_1/R7
@@ -1 +1 @@
-restore CHE900_hkg60iob.rle a
+restore [locate_data_file CHE900_hkg60iob.rle] a
diff --git a/tests/sewing/tol_1/R8 b/tests/sewing/tol_1/R8
index e8615c2e06..c45b649127 100644
--- a/tests/sewing/tol_1/R8
+++ b/tests/sewing/tol_1/R8
@@ -1 +1 @@
-restore CHE900_hkg60ioc.rle a
+restore [locate_data_file CHE900_hkg60ioc.rle] a
diff --git a/tests/sewing/tol_1/R9 b/tests/sewing/tol_1/R9
index 5d0ff90fff..0cb9e609ed 100644
--- a/tests/sewing/tol_1/R9
+++ b/tests/sewing/tol_1/R9
@@ -1 +1 @@
-restore CHE_cc3.rle a
+restore [locate_data_file CHE_cc3.rle] a
diff --git a/tests/sewing/tol_1/S1 b/tests/sewing/tol_1/S1
index 99c16f8ff0..85817a2321 100644
--- a/tests/sewing/tol_1/S1
+++ b/tests/sewing/tol_1/S1
@@ -1 +1 @@
-restore CHE_cc4.rle a
+restore [locate_data_file CHE_cc4.rle] a
diff --git a/tests/sewing/tol_1/S2 b/tests/sewing/tol_1/S2
index 38a528f2de..4b6666b2f4 100644
--- a/tests/sewing/tol_1/S2
+++ b/tests/sewing/tol_1/S2
@@ -1 +1 @@
-restore CTO902_cts20460a.rle a
+restore [locate_data_file CTO902_cts20460a.rle] a
diff --git a/tests/sewing/tol_1/S3 b/tests/sewing/tol_1/S3
index 3ca4d98502..672ee3660a 100644
--- a/tests/sewing/tol_1/S3
+++ b/tests/sewing/tol_1/S3
@@ -1 +1 @@
-restore CHE_friteioa.rle a
+restore [locate_data_file CHE_friteioa.rle] a
diff --git a/tests/sewing/tol_1/S4 b/tests/sewing/tol_1/S4
index 48c26fa6bb..3d393aae3e 100644
--- a/tests/sewing/tol_1/S4
+++ b/tests/sewing/tol_1/S4
@@ -1 +1 @@
-restore CIN001_a1.rle a
+restore [locate_data_file CIN001_a1.rle] a
diff --git a/tests/sewing/tol_1/S5 b/tests/sewing/tol_1/S5
index d812e172cc..20c753e5d6 100644
--- a/tests/sewing/tol_1/S5
+++ b/tests/sewing/tol_1/S5
@@ -1 +1 @@
-restore CIN001_a20.rle a
+restore [locate_data_file CIN001_a20.rle] a
diff --git a/tests/sewing/tol_1/S6 b/tests/sewing/tol_1/S6
index 0fc6d19e6b..220744ed47 100644
--- a/tests/sewing/tol_1/S6
+++ b/tests/sewing/tol_1/S6
@@ -1 +1 @@
-restore CTO902_cts20460b.rle a
+restore [locate_data_file CTO902_cts20460b.rle] a
diff --git a/tests/sewing/tol_1/S7 b/tests/sewing/tol_1/S7
index 3ba441552d..71464fc2e5 100644
--- a/tests/sewing/tol_1/S7
+++ b/tests/sewing/tol_1/S7
@@ -1 +1 @@
-restore CTO902_cts20462-part.rle a
+restore [locate_data_file CTO902_cts20462-part.rle] a
diff --git a/tests/sewing/tol_1/S8 b/tests/sewing/tol_1/S8
index 73540da330..1fc2f2c26e 100644
--- a/tests/sewing/tol_1/S8
+++ b/tests/sewing/tol_1/S8
@@ -1 +1 @@
-restore CTO902_cts20462-tool.rle a
+restore [locate_data_file CTO902_cts20462-tool.rle] a
diff --git a/tests/sewing/tol_1/S9 b/tests/sewing/tol_1/S9
index ff5bf411de..83310f4c11 100644
--- a/tests/sewing/tol_1/S9
+++ b/tests/sewing/tol_1/S9
@@ -1 +1 @@
-restore CIN001_a24.rle a
+restore [locate_data_file CIN001_a24.rle] a
diff --git a/tests/sewing/tol_1/T1 b/tests/sewing/tol_1/T1
index 410120e70e..82265d8bfe 100644
--- a/tests/sewing/tol_1/T1
+++ b/tests/sewing/tol_1/T1
@@ -1 +1 @@
-restore CTO902_cts20482a.rle a
+restore [locate_data_file CTO902_cts20482a.rle] a
diff --git a/tests/sewing/tol_1/T2 b/tests/sewing/tol_1/T2
index 4e90ec9bd6..3216766d5a 100644
--- a/tests/sewing/tol_1/T2
+++ b/tests/sewing/tol_1/T2
@@ -1 +1 @@
-restore CTO902_cts20482b.rle a
+restore [locate_data_file CTO902_cts20482b.rle] a
diff --git a/tests/sewing/tol_1/T3 b/tests/sewing/tol_1/T3
index c1c0c23ac5..8a1ec11374 100644
--- a/tests/sewing/tol_1/T3
+++ b/tests/sewing/tol_1/T3
@@ -1 +1 @@
-restore CTO902_cts20482c.rle a
+restore [locate_data_file CTO902_cts20482c.rle] a
diff --git a/tests/sewing/tol_1/T4 b/tests/sewing/tol_1/T4
index 7d8582c9ab..b05de1da28 100644
--- a/tests/sewing/tol_1/T4
+++ b/tests/sewing/tol_1/T4
@@ -1 +1 @@
-restore CTO902_cts20483-tool.rle a
+restore [locate_data_file CTO902_cts20483-tool.rle] a
diff --git a/tests/sewing/tol_1/T5 b/tests/sewing/tol_1/T5
index dbe5f7fc9f..8599192306 100644
--- a/tests/sewing/tol_1/T5
+++ b/tests/sewing/tol_1/T5
@@ -1 +1 @@
-restore CIN001_a61.rle a
+restore [locate_data_file CIN001_a61.rle] a
diff --git a/tests/sewing/tol_1/T6 b/tests/sewing/tol_1/T6
index 8c1a16e214..11b3f9a8f2 100644
--- a/tests/sewing/tol_1/T6
+++ b/tests/sewing/tol_1/T6
@@ -1 +1 @@
-restore CTO902_cts20484a.rle a
+restore [locate_data_file CTO902_cts20484a.rle] a
diff --git a/tests/sewing/tol_1/T7 b/tests/sewing/tol_1/T7
index 1f244afe12..62777883e4 100644
--- a/tests/sewing/tol_1/T7
+++ b/tests/sewing/tol_1/T7
@@ -1 +1 @@
-restore CIN001_a63.rle a
+restore [locate_data_file CIN001_a63.rle] a
diff --git a/tests/sewing/tol_1/T8 b/tests/sewing/tol_1/T8
index cec7a77e42..a76d1dd15b 100644
--- a/tests/sewing/tol_1/T8
+++ b/tests/sewing/tol_1/T8
@@ -1 +1 @@
-restore CTO902_cts20486a.rle a
+restore [locate_data_file CTO902_cts20486a.rle] a
diff --git a/tests/sewing/tol_1/T9 b/tests/sewing/tol_1/T9
index 9042d9f6a4..6c71873ed5 100644
--- a/tests/sewing/tol_1/T9
+++ b/tests/sewing/tol_1/T9
@@ -1 +1 @@
-restore CTO902_cts20487a.rle a
+restore [locate_data_file CTO902_cts20487a.rle] a
diff --git a/tests/sewing/tol_1/U1 b/tests/sewing/tol_1/U1
index f84e377da7..dd0766a332 100644
--- a/tests/sewing/tol_1/U1
+++ b/tests/sewing/tol_1/U1
@@ -1 +1 @@
-restore CTO902_cts20489-part.rle a
+restore [locate_data_file CTO902_cts20489-part.rle] a
diff --git a/tests/sewing/tol_1/U2 b/tests/sewing/tol_1/U2
index 73320acde4..7a93af3e24 100644
--- a/tests/sewing/tol_1/U2
+++ b/tests/sewing/tol_1/U2
@@ -1 +1 @@
-restore CTO902_cts20489-tool.rle a
+restore [locate_data_file CTO902_cts20489-tool.rle] a
diff --git a/tests/sewing/tol_1/U3 b/tests/sewing/tol_1/U3
index 3a2f75d627..280a0b7274 100644
--- a/tests/sewing/tol_1/U3
+++ b/tests/sewing/tol_1/U3
@@ -1 +1 @@
-restore CTO902_cts20492a.rle a
+restore [locate_data_file CTO902_cts20492a.rle] a
diff --git a/tests/sewing/tol_1/U4 b/tests/sewing/tol_1/U4
index 7003aa2ca2..4493b4e656 100644
--- a/tests/sewing/tol_1/U4
+++ b/tests/sewing/tol_1/U4
@@ -1 +1 @@
-restore CTO902_cts20492b.rle a
+restore [locate_data_file CTO902_cts20492b.rle] a
diff --git a/tests/sewing/tol_1/U5 b/tests/sewing/tol_1/U5
index 78cd60c6d3..dd9c41a407 100644
--- a/tests/sewing/tol_1/U5
+++ b/tests/sewing/tol_1/U5
@@ -1 +1 @@
-restore CTO902_cts20493a.rle a
+restore [locate_data_file CTO902_cts20493a.rle] a
diff --git a/tests/sewing/tol_1/U6 b/tests/sewing/tol_1/U6
index cbe40cc226..c112ccecd9 100644
--- a/tests/sewing/tol_1/U6
+++ b/tests/sewing/tol_1/U6
@@ -1 +1 @@
-restore CTO902_cts20494a.rle a
+restore [locate_data_file CTO902_cts20494a.rle] a
diff --git a/tests/sewing/tol_1/U7 b/tests/sewing/tol_1/U7
index 33f5741ea9..8e123b07ce 100644
--- a/tests/sewing/tol_1/U7
+++ b/tests/sewing/tol_1/U7
@@ -1 +1 @@
-restore CTO902_cts20495b.rle a
+restore [locate_data_file CTO902_cts20495b.rle] a
diff --git a/tests/sewing/tol_1/U8 b/tests/sewing/tol_1/U8
index f10ba7bfca..7bcd9e855f 100644
--- a/tests/sewing/tol_1/U8
+++ b/tests/sewing/tol_1/U8
@@ -1 +1 @@
-restore CIN001_a8.rle a
+restore [locate_data_file CIN001_a8.rle] a
diff --git a/tests/sewing/tol_1/U9 b/tests/sewing/tol_1/U9
index cc32efc178..28ff92b195 100644
--- a/tests/sewing/tol_1/U9
+++ b/tests/sewing/tol_1/U9
@@ -1 +1 @@
-restore CIN001_b1.rle a
+restore [locate_data_file CIN001_b1.rle] a
diff --git a/tests/sewing/tol_1/V1 b/tests/sewing/tol_1/V1
index 153ca3fc0c..1a971a8d4c 100644
--- a/tests/sewing/tol_1/V1
+++ b/tests/sewing/tol_1/V1
@@ -1 +1 @@
-restore CIN001_b10.rle a
+restore [locate_data_file CIN001_b10.rle] a
diff --git a/tests/sewing/tol_1/V2 b/tests/sewing/tol_1/V2
index d89800755c..6079ef017f 100644
--- a/tests/sewing/tol_1/V2
+++ b/tests/sewing/tol_1/V2
@@ -1 +1 @@
-restore CTO902_cts20496-part.rle a
+restore [locate_data_file CTO902_cts20496-part.rle] a
diff --git a/tests/sewing/tol_1/V3 b/tests/sewing/tol_1/V3
index 13951e47e4..99223cca23 100644
--- a/tests/sewing/tol_1/V3
+++ b/tests/sewing/tol_1/V3
@@ -1 +1 @@
-restore CTO902_cts20496c.rle a
+restore [locate_data_file CTO902_cts20496c.rle] a
diff --git a/tests/sewing/tol_1/V4 b/tests/sewing/tol_1/V4
index 99f4b2af05..02e03b7d0a 100644
--- a/tests/sewing/tol_1/V4
+++ b/tests/sewing/tol_1/V4
@@ -1 +1 @@
-restore CTO902_cts20498-part.rle a
+restore [locate_data_file CTO902_cts20498-part.rle] a
diff --git a/tests/sewing/tol_1/V5 b/tests/sewing/tol_1/V5
index 94bebb94ca..c394d5d8b6 100644
--- a/tests/sewing/tol_1/V5
+++ b/tests/sewing/tol_1/V5
@@ -1 +1 @@
-restore CTO902_cts20498-tool.rle a
+restore [locate_data_file CTO902_cts20498-tool.rle] a
diff --git a/tests/sewing/tol_1/V6 b/tests/sewing/tol_1/V6
index 37705cb8ea..cf98746514 100644
--- a/tests/sewing/tol_1/V6
+++ b/tests/sewing/tol_1/V6
@@ -1 +1 @@
-restore CIN001_b15.rle a
+restore [locate_data_file CIN001_b15.rle] a
diff --git a/tests/sewing/tol_1/V7 b/tests/sewing/tol_1/V7
index e123e915d6..43aecd596a 100644
--- a/tests/sewing/tol_1/V7
+++ b/tests/sewing/tol_1/V7
@@ -1 +1 @@
-restore CTO902_cts20503-part.rle a
+restore [locate_data_file CTO902_cts20503-part.rle] a
diff --git a/tests/sewing/tol_1/V8 b/tests/sewing/tol_1/V8
index 02c1e57e3e..d5d2fbdc86 100644
--- a/tests/sewing/tol_1/V8
+++ b/tests/sewing/tol_1/V8
@@ -1 +1 @@
-restore CIN001_b17.rle a
+restore [locate_data_file CIN001_b17.rle] a
diff --git a/tests/sewing/tol_1/V9 b/tests/sewing/tol_1/V9
index 9dcf331395..f3b9f7a155 100644
--- a/tests/sewing/tol_1/V9
+++ b/tests/sewing/tol_1/V9
@@ -1 +1 @@
-restore CTO902_cts20503-tool.rle a
+restore [locate_data_file CTO902_cts20503-tool.rle] a
diff --git a/tests/sewing/tol_1/W1 b/tests/sewing/tol_1/W1
index b436bffd8a..e919a749b5 100644
--- a/tests/sewing/tol_1/W1
+++ b/tests/sewing/tol_1/W1
@@ -1 +1 @@
-restore CTO902_cts20504-part.rle a
+restore [locate_data_file CTO902_cts20504-part.rle] a
diff --git a/tests/sewing/tol_1/W2 b/tests/sewing/tol_1/W2
index 17b09bb97f..1f78dbe32b 100644
--- a/tests/sewing/tol_1/W2
+++ b/tests/sewing/tol_1/W2
@@ -1 +1 @@
-restore CTO902_cts20504-tool.rle a
+restore [locate_data_file CTO902_cts20504-tool.rle] a
diff --git a/tests/sewing/tol_1/W3 b/tests/sewing/tol_1/W3
index f8d1a15607..67105201e0 100644
--- a/tests/sewing/tol_1/W3
+++ b/tests/sewing/tol_1/W3
@@ -1 +1 @@
-restore CTO902_cts20505-part.rle a
+restore [locate_data_file CTO902_cts20505-part.rle] a
diff --git a/tests/sewing/tol_1/W4 b/tests/sewing/tol_1/W4
index 99e1ed757f..ebaa7cafa6 100644
--- a/tests/sewing/tol_1/W4
+++ b/tests/sewing/tol_1/W4
@@ -1 +1 @@
-restore CIN001_b24.rle a
+restore [locate_data_file CIN001_b24.rle] a
diff --git a/tests/sewing/tol_1/W5 b/tests/sewing/tol_1/W5
index 4367a22225..a18feeaf2f 100644
--- a/tests/sewing/tol_1/W5
+++ b/tests/sewing/tol_1/W5
@@ -1 +1 @@
-restore CIN001_b26.rle a
+restore [locate_data_file CIN001_b26.rle] a
diff --git a/tests/sewing/tol_1/W6 b/tests/sewing/tol_1/W6
index 52b83a0363..0cff1f8e58 100644
--- a/tests/sewing/tol_1/W6
+++ b/tests/sewing/tol_1/W6
@@ -1 +1 @@
-restore CTO902_cts20505-tool.rle a
+restore [locate_data_file CTO902_cts20505-tool.rle] a
diff --git a/tests/sewing/tol_1/W7 b/tests/sewing/tol_1/W7
index 245a213816..c5584bb04b 100644
--- a/tests/sewing/tol_1/W7
+++ b/tests/sewing/tol_1/W7
@@ -1 +1 @@
-restore CTO902_cts20506a.rle a
+restore [locate_data_file CTO902_cts20506a.rle] a
diff --git a/tests/sewing/tol_1/W8 b/tests/sewing/tol_1/W8
index 7b7d0d9e53..d2e9232f05 100644
--- a/tests/sewing/tol_1/W8
+++ b/tests/sewing/tol_1/W8
@@ -1 +1 @@
-restore CTO902_cts20525-part.rle a
+restore [locate_data_file CTO902_cts20525-part.rle] a
diff --git a/tests/sewing/tol_1/W9 b/tests/sewing/tol_1/W9
index fa996aedbb..7011815326 100644
--- a/tests/sewing/tol_1/W9
+++ b/tests/sewing/tol_1/W9
@@ -1 +1 @@
-restore CTO902_cts20525-tool.rle a
+restore [locate_data_file CTO902_cts20525-tool.rle] a
diff --git a/tests/sewing/tol_1/X1 b/tests/sewing/tol_1/X1
index f20e4a7e91..0f6aa1cba0 100644
--- a/tests/sewing/tol_1/X1
+++ b/tests/sewing/tol_1/X1
@@ -1 +1 @@
-restore CTO902_cts20526-part.rle a
+restore [locate_data_file CTO902_cts20526-part.rle] a
diff --git a/tests/sewing/tol_1/X2 b/tests/sewing/tol_1/X2
index a4eb3d2d15..7337eec622 100644
--- a/tests/sewing/tol_1/X2
+++ b/tests/sewing/tol_1/X2
@@ -1 +1 @@
-restore CIN001_b6.rle a
+restore [locate_data_file CIN001_b6.rle] a
diff --git a/tests/sewing/tol_1/X3 b/tests/sewing/tol_1/X3
index 04ab45550b..3927de3feb 100644
--- a/tests/sewing/tol_1/X3
+++ b/tests/sewing/tol_1/X3
@@ -1 +1 @@
-restore CIN001_b9.rle a
+restore [locate_data_file CIN001_b9.rle] a
diff --git a/tests/sewing/tol_1/X4 b/tests/sewing/tol_1/X4
index 6722e8989f..ca6cdb7e4c 100644
--- a/tests/sewing/tol_1/X4
+++ b/tests/sewing/tol_1/X4
@@ -1 +1 @@
-restore CTO902_cts20527-tool.rle a
+restore [locate_data_file CTO902_cts20527-tool.rle] a
diff --git a/tests/sewing/tol_1/X5 b/tests/sewing/tol_1/X5
index f233cc68c0..773400fb86 100644
--- a/tests/sewing/tol_1/X5
+++ b/tests/sewing/tol_1/X5
@@ -1 +1 @@
-restore CIN900_buc60hmh.rle a
+restore [locate_data_file CIN900_buc60hmh.rle] a
diff --git a/tests/sewing/tol_1/X6 b/tests/sewing/tol_1/X6
index b38c89fd04..c67082ec99 100644
--- a/tests/sewing/tol_1/X6
+++ b/tests/sewing/tol_1/X6
@@ -1 +1 @@
-restore CIN900_cts20hlh.rle a
+restore [locate_data_file CIN900_cts20hlh.rle] a
diff --git a/tests/sewing/tol_1/X7 b/tests/sewing/tol_1/X7
index fee08fa30e..fbee33d9f3 100644
--- a/tests/sewing/tol_1/X7
+++ b/tests/sewing/tol_1/X7
@@ -1 +1 @@
-restore CIN900_cts20hlj.rle a
+restore [locate_data_file CIN900_cts20hlj.rle] a
diff --git a/tests/sewing/tol_1/X8 b/tests/sewing/tol_1/X8
index b4c9782596..679d192a91 100644
--- a/tests/sewing/tol_1/X8
+++ b/tests/sewing/tol_1/X8
@@ -1 +1 @@
-restore CIN900_cts20hlk.rle a
+restore [locate_data_file CIN900_cts20hlk.rle] a
diff --git a/tests/sewing/tol_1/X9 b/tests/sewing/tol_1/X9
index b18f105908..d6b5e3627e 100644
--- a/tests/sewing/tol_1/X9
+++ b/tests/sewing/tol_1/X9
@@ -1 +1 @@
-restore CIN900_cts20hll.rle a
+restore [locate_data_file CIN900_cts20hll.rle] a
diff --git a/tests/sewing/tol_1/Y1 b/tests/sewing/tol_1/Y1
index 78f99c4d5d..cc5fa54eac 100644
--- a/tests/sewing/tol_1/Y1
+++ b/tests/sewing/tol_1/Y1
@@ -1 +1 @@
-restore CIN900_cts21hlo.rle a
+restore [locate_data_file CIN900_cts21hlo.rle] a
diff --git a/tests/sewing/tol_1/Y2 b/tests/sewing/tol_1/Y2
index 6bd3bb7d14..7c54138461 100644
--- a/tests/sewing/tol_1/Y2
+++ b/tests/sewing/tol_1/Y2
@@ -1 +1 @@
-restore CIN900_cts21hlp.rle a
+restore [locate_data_file CIN900_cts21hlp.rle] a
diff --git a/tests/sewing/tol_1/Y3 b/tests/sewing/tol_1/Y3
index acd128a161..080526e977 100644
--- a/tests/sewing/tol_1/Y3
+++ b/tests/sewing/tol_1/Y3
@@ -1 +1 @@
-restore CIN900_cts21hlq.rle a
+restore [locate_data_file CIN900_cts21hlq.rle] a
diff --git a/tests/sewing/tol_1/Y4 b/tests/sewing/tol_1/Y4
index c6f9b01628..7c5e425520 100644
--- a/tests/sewing/tol_1/Y4
+++ b/tests/sewing/tol_1/Y4
@@ -1 +1 @@
-restore CIN900_cts21hlr.rle a
+restore [locate_data_file CIN900_cts21hlr.rle] a
diff --git a/tests/sewing/tol_1/Y5 b/tests/sewing/tol_1/Y5
index 0c3950bb0b..d67d251893 100644
--- a/tests/sewing/tol_1/Y5
+++ b/tests/sewing/tol_1/Y5
@@ -1 +1 @@
-restore CIN900_fra61hls.rle a
+restore [locate_data_file CIN900_fra61hls.rle] a
diff --git a/tests/sewing/tol_1/Y6 b/tests/sewing/tol_1/Y6
index b3f312b346..2fb402df81 100644
--- a/tests/sewing/tol_1/Y6
+++ b/tests/sewing/tol_1/Y6
@@ -1 +1 @@
-restore CIN900_fra61hlt.rle a
+restore [locate_data_file CIN900_fra61hlt.rle] a
diff --git a/tests/sewing/tol_1/Y7 b/tests/sewing/tol_1/Y7
index 6790c2486d..07f57c25f0 100644
--- a/tests/sewing/tol_1/Y7
+++ b/tests/sewing/tol_1/Y7
@@ -1 +1 @@
-restore CIN900_pro11hlu.rle a
+restore [locate_data_file CIN900_pro11hlu.rle] a
diff --git a/tests/sewing/tol_1/Y8 b/tests/sewing/tol_1/Y8
index 2c5f1bb04f..e873b53a5c 100644
--- a/tests/sewing/tol_1/Y8
+++ b/tests/sewing/tol_1/Y8
@@ -1 +1 @@
-restore CIN900_pro11hlv.rle a
+restore [locate_data_file CIN900_pro11hlv.rle] a
diff --git a/tests/sewing/tol_1/Y9 b/tests/sewing/tol_1/Y9
index 9a321385af..a735f4e771 100644
--- a/tests/sewing/tol_1/Y9
+++ b/tests/sewing/tol_1/Y9
@@ -1 +1 @@
-restore CIN900_pro14hma.rle a
+restore [locate_data_file CIN900_pro14hma.rle] a
diff --git a/tests/sewing/tol_1/Z1 b/tests/sewing/tol_1/Z1
index 236dd8272a..b3f2df66c5 100644
--- a/tests/sewing/tol_1/Z1
+++ b/tests/sewing/tol_1/Z1
@@ -1 +1 @@
-restore CTO902_cts20528-part.rle a
+restore [locate_data_file CTO902_cts20528-part.rle] a
diff --git a/tests/sewing/tol_1/Z2 b/tests/sewing/tol_1/Z2
index 17c2beafb7..e00a800747 100644
--- a/tests/sewing/tol_1/Z2
+++ b/tests/sewing/tol_1/Z2
@@ -1 +1 @@
-restore CTO902_cts20529a.rle a
+restore [locate_data_file CTO902_cts20529a.rle] a
diff --git a/tests/sewing/tol_1/Z3 b/tests/sewing/tol_1/Z3
index d2b383c853..e8c322332f 100644
--- a/tests/sewing/tol_1/Z3
+++ b/tests/sewing/tol_1/Z3
@@ -1 +1 @@
-restore CTO902_cts20529b.rle a
+restore [locate_data_file CTO902_cts20529b.rle] a
diff --git a/tests/sewing/tol_1/Z4 b/tests/sewing/tol_1/Z4
index e9f9a24063..d292952e9f 100644
--- a/tests/sewing/tol_1/Z4
+++ b/tests/sewing/tol_1/Z4
@@ -1 +1 @@
-restore CTO902_cts20535a.rle a
+restore [locate_data_file CTO902_cts20535a.rle] a
diff --git a/tests/sewing/tol_1/Z5 b/tests/sewing/tol_1/Z5
index 79559e6f10..70656e5b4c 100644
--- a/tests/sewing/tol_1/Z5
+++ b/tests/sewing/tol_1/Z5
@@ -1 +1 @@
-restore CTO902_cts20535b.rle a
+restore [locate_data_file CTO902_cts20535b.rle] a
diff --git a/tests/sewing/tol_1/Z6 b/tests/sewing/tol_1/Z6
index 90e8d58c1e..08d811ede4 100644
--- a/tests/sewing/tol_1/Z6
+++ b/tests/sewing/tol_1/Z6
@@ -1 +1 @@
-restore CTO902_cts20537-tool.rle a
+restore [locate_data_file CTO902_cts20537-tool.rle] a
diff --git a/tests/sewing/tol_1/Z7 b/tests/sewing/tol_1/Z7
index 7aa7f647ba..f9de968ca4 100644
--- a/tests/sewing/tol_1/Z7
+++ b/tests/sewing/tol_1/Z7
@@ -1 +1 @@
-restore CTO902_cts20551b.rle a
+restore [locate_data_file CTO902_cts20551b.rle] a
diff --git a/tests/sewing/tol_1/Z8 b/tests/sewing/tol_1/Z8
index cc862c9be3..8c7b8618e1 100644
--- a/tests/sewing/tol_1/Z8
+++ b/tests/sewing/tol_1/Z8
@@ -1 +1 @@
-restore CTO902_cts20552a.rle a
+restore [locate_data_file CTO902_cts20552a.rle] a
diff --git a/tests/sewing/tol_1/Z9 b/tests/sewing/tol_1/Z9
index 08d778406b..5c99804ee9 100644
--- a/tests/sewing/tol_1/Z9
+++ b/tests/sewing/tol_1/Z9
@@ -1 +1 @@
-restore CTO902_pro14235a.rle a
+restore [locate_data_file CTO902_pro14235a.rle] a
diff --git a/tests/sewing/tol_100/A1 b/tests/sewing/tol_100/A1
index b545b6b082..6361d78350 100644
--- a/tests/sewing/tol_100/A1
+++ b/tests/sewing/tol_100/A1
@@ -1 +1 @@
-restore CTO902_pro14235b.rle a
+restore [locate_data_file CTO902_pro14235b.rle] a
diff --git a/tests/sewing/tol_100/A2 b/tests/sewing/tol_100/A2
index 37f71e816e..87823d34b5 100644
--- a/tests/sewing/tol_100/A2
+++ b/tests/sewing/tol_100/A2
@@ -1 +1 @@
-restore CTO902_pro14235c.rle a
+restore [locate_data_file CTO902_pro14235c.rle] a
diff --git a/tests/sewing/tol_100/A3 b/tests/sewing/tol_100/A3
index 4f2268bb89..bcd34f388c 100644
--- a/tests/sewing/tol_100/A3
+++ b/tests/sewing/tol_100/A3
@@ -1 +1 @@
-restore CTO902_pro14235d.rle a
+restore [locate_data_file CTO902_pro14235d.rle] a
diff --git a/tests/sewing/tol_100/A4 b/tests/sewing/tol_100/A4
index e5e0ed3cb1..3d7e8a31c3 100644
--- a/tests/sewing/tol_100/A4
+++ b/tests/sewing/tol_100/A4
@@ -1 +1 @@
-restore CFE900_pro13gfc.rle a
+restore [locate_data_file CFE900_pro13gfc.rle] a
diff --git a/tests/sewing/tol_100/A5 b/tests/sewing/tol_100/A5
index 2598667915..af16426afc 100644
--- a/tests/sewing/tol_100/A5
+++ b/tests/sewing/tol_100/A5
@@ -1 +1 @@
-restore CTO904_buc60093a.rle a
+restore [locate_data_file CTO904_buc60093a.rle] a
diff --git a/tests/sewing/tol_100/A6 b/tests/sewing/tol_100/A6
index 1ff02c760b..2bc7d7c958 100644
--- a/tests/sewing/tol_100/A6
+++ b/tests/sewing/tol_100/A6
@@ -1 +1 @@
-restore CTO904_buc60116a.rle a
+restore [locate_data_file CTO904_buc60116a.rle] a
diff --git a/tests/sewing/tol_100/A7 b/tests/sewing/tol_100/A7
index 54334d5dc5..ff003e3bc4 100644
--- a/tests/sewing/tol_100/A7
+++ b/tests/sewing/tol_100/A7
@@ -1 +1 @@
-restore CTO904_buc60220b.rle a
+restore [locate_data_file CTO904_buc60220b.rle] a
diff --git a/tests/sewing/tol_100/A8 b/tests/sewing/tol_100/A8
index e6a1da64ae..e23d26f819 100644
--- a/tests/sewing/tol_100/A8
+++ b/tests/sewing/tol_100/A8
@@ -1 +1 @@
-restore CTO904_cts17786b.rle a
+restore [locate_data_file CTO904_cts17786b.rle] a
diff --git a/tests/sewing/tol_100/A9 b/tests/sewing/tol_100/A9
index af77651b68..1228c3e492 100644
--- a/tests/sewing/tol_100/A9
+++ b/tests/sewing/tol_100/A9
@@ -1 +1 @@
-restore CTO904_cts20290b.rle a
+restore [locate_data_file CTO904_cts20290b.rle] a
diff --git a/tests/sewing/tol_100/B1 b/tests/sewing/tol_100/B1
index b8d4c0461b..d165dac98d 100644
--- a/tests/sewing/tol_100/B1
+++ b/tests/sewing/tol_100/B1
@@ -1 +1 @@
-restore CTO904_cts20339-part.rle a
+restore [locate_data_file CTO904_cts20339-part.rle] a
diff --git a/tests/sewing/tol_100/B2 b/tests/sewing/tol_100/B2
index 8ba0d67abc..a74955f947 100644
--- a/tests/sewing/tol_100/B2
+++ b/tests/sewing/tol_100/B2
@@ -1 +1 @@
-restore CTO904_cts20366-part.rle a
+restore [locate_data_file CTO904_cts20366-part.rle] a
diff --git a/tests/sewing/tol_100/B3 b/tests/sewing/tol_100/B3
index 3407519791..ce720bb400 100644
--- a/tests/sewing/tol_100/B3
+++ b/tests/sewing/tol_100/B3
@@ -1 +1 @@
-restore CFI_b1234fie.rle a
+restore [locate_data_file CFI_b1234fie.rle] a
diff --git a/tests/sewing/tol_100/B4 b/tests/sewing/tol_100/B4
index ff407fa7d3..6539de9fb4 100644
--- a/tests/sewing/tol_100/B4
+++ b/tests/sewing/tol_100/B4
@@ -1 +1 @@
-restore CFI_b5678fif.rle a
+restore [locate_data_file CFI_b5678fif.rle] a
diff --git a/tests/sewing/tol_100/B5 b/tests/sewing/tol_100/B5
index 275abefcd9..b7adc676f2 100644
--- a/tests/sewing/tol_100/B5
+++ b/tests/sewing/tol_100/B5
@@ -1 +1 @@
-restore CFI_c1234fig.rle a
+restore [locate_data_file CFI_c1234fig.rle] a
diff --git a/tests/sewing/tol_100/B6 b/tests/sewing/tol_100/B6
index 5daf0d3f28..89b0a75d3f 100644
--- a/tests/sewing/tol_100/B6
+++ b/tests/sewing/tol_100/B6
@@ -1 +1 @@
-restore CFI_c5678fih.rle a
+restore [locate_data_file CFI_c5678fih.rle] a
diff --git a/tests/sewing/tol_100/B7 b/tests/sewing/tol_100/B7
index 83e1f2a45c..07f1144907 100644
--- a/tests/sewing/tol_100/B7
+++ b/tests/sewing/tol_100/B7
@@ -1 +1 @@
-restore CTO904_cts20370-part.rle a
+restore [locate_data_file CTO904_cts20370-part.rle] a
diff --git a/tests/sewing/tol_100/B8 b/tests/sewing/tol_100/B8
index e1bd298fb7..89ca70f72d 100644
--- a/tests/sewing/tol_100/B8
+++ b/tests/sewing/tol_100/B8
@@ -1 +1 @@
-restore CFI_g1234fio.rle a
+restore [locate_data_file CFI_g1234fio.rle] a
diff --git a/tests/sewing/tol_100/B9 b/tests/sewing/tol_100/B9
index c44c4232f7..90f98a12c3 100644
--- a/tests/sewing/tol_100/B9
+++ b/tests/sewing/tol_100/B9
@@ -1 +1 @@
-restore CFI_g5678fip.rle a
+restore [locate_data_file CFI_g5678fip.rle] a
diff --git a/tests/sewing/tol_100/C1 b/tests/sewing/tol_100/C1
index cbd0da53d3..dab416d668 100644
--- a/tests/sewing/tol_100/C1
+++ b/tests/sewing/tol_100/C1
@@ -1 +1 @@
-restore CFI_h1234fiq.rle a
+restore [locate_data_file CFI_h1234fiq.rle] a
diff --git a/tests/sewing/tol_100/C2 b/tests/sewing/tol_100/C2
index 13e8804898..021eed3054 100644
--- a/tests/sewing/tol_100/C2
+++ b/tests/sewing/tol_100/C2
@@ -1 +1 @@
-restore CFI_h5678fir.rle a
+restore [locate_data_file CFI_h5678fir.rle] a
diff --git a/tests/sewing/tol_100/C3 b/tests/sewing/tol_100/C3
index a4ed9eba09..ead84036c9 100644
--- a/tests/sewing/tol_100/C3
+++ b/tests/sewing/tol_100/C3
@@ -1 +1 @@
-restore CFI_hlacgfjh.rle a
+restore [locate_data_file CFI_hlacgfjh.rle] a
diff --git a/tests/sewing/tol_100/C4 b/tests/sewing/tol_100/C4
index 149240e3f2..687ae8945e 100644
--- a/tests/sewing/tol_100/C4
+++ b/tests/sewing/tol_100/C4
@@ -1 +1 @@
-restore CFI_i1234fis.rle a
+restore [locate_data_file CFI_i1234fis.rle] a
diff --git a/tests/sewing/tol_100/C5 b/tests/sewing/tol_100/C5
index f715d0edc1..76029db74c 100644
--- a/tests/sewing/tol_100/C5
+++ b/tests/sewing/tol_100/C5
@@ -1 +1 @@
-restore CFI_pro11907.rle a
+restore [locate_data_file CFI_pro11907.rle] a
diff --git a/tests/sewing/tol_100/C6 b/tests/sewing/tol_100/C6
index c06aceadbe..1c5696f663 100644
--- a/tests/sewing/tol_100/C6
+++ b/tests/sewing/tol_100/C6
@@ -1 +1 @@
-restore CFI_pro13225.rle a
+restore [locate_data_file CFI_pro13225.rle] a
diff --git a/tests/sewing/tol_100/C7 b/tests/sewing/tol_100/C7
index df3f15d154..097ea929ca 100644
--- a/tests/sewing/tol_100/C7
+++ b/tests/sewing/tol_100/C7
@@ -1 +1 @@
-restore CFI_pro14035.rle a
+restore [locate_data_file CFI_pro14035.rle] a
diff --git a/tests/sewing/tol_100/C8 b/tests/sewing/tol_100/C8
index 82a0f55309..a66f3486a6 100644
--- a/tests/sewing/tol_100/C8
+++ b/tests/sewing/tol_100/C8
@@ -1 +1 @@
-restore CFI_pro14550.rle a
+restore [locate_data_file CFI_pro14550.rle] a
diff --git a/tests/sewing/tol_100/C9 b/tests/sewing/tol_100/C9
index 363eeec87a..286be3eb8a 100644
--- a/tests/sewing/tol_100/C9
+++ b/tests/sewing/tol_100/C9
@@ -1 +1 @@
-restore CFI_pro14551.rle a
+restore [locate_data_file CFI_pro14551.rle] a
diff --git a/tests/sewing/tol_100/D1 b/tests/sewing/tol_100/D1
index 79d65e04de..123111e00f 100644
--- a/tests/sewing/tol_100/D1
+++ b/tests/sewing/tol_100/D1
@@ -1 +1 @@
-restore CFI_pro14552.rle a
+restore [locate_data_file CFI_pro14552.rle] a
diff --git a/tests/sewing/tol_100/D2 b/tests/sewing/tol_100/D2
index 3833c0b57a..cc7b5265df 100644
--- a/tests/sewing/tol_100/D2
+++ b/tests/sewing/tol_100/D2
@@ -1 +1 @@
-restore CFI_pro14714.rle a
+restore [locate_data_file CFI_pro14714.rle] a
diff --git a/tests/sewing/tol_100/D3 b/tests/sewing/tol_100/D3
index ad37cd7834..c7f7c9337f 100644
--- a/tests/sewing/tol_100/D3
+++ b/tests/sewing/tol_100/D3
@@ -1,2 +1,2 @@
-restore CFI_pro15441.rle a
+restore [locate_data_file CFI_pro15441.rle] a
 set nb_f ""
diff --git a/tests/sewing/tol_100/D4 b/tests/sewing/tol_100/D4
index 96140bb27a..e4a4d2ddb8 100644
--- a/tests/sewing/tol_100/D4
+++ b/tests/sewing/tol_100/D4
@@ -1 +1 @@
-restore CFI_pro16388.rle a
+restore [locate_data_file CFI_pro16388.rle] a
diff --git a/tests/sewing/tol_100/D5 b/tests/sewing/tol_100/D5
index 379a73005e..112c8b6d9f 100644
--- a/tests/sewing/tol_100/D5
+++ b/tests/sewing/tol_100/D5
@@ -1 +1 @@
-restore CFI_pro7788.rle a
+restore [locate_data_file CFI_pro7788.rle] a
diff --git a/tests/sewing/tol_100/D6 b/tests/sewing/tol_100/D6
index c541d1ec21..9b33e1b92a 100644
--- a/tests/sewing/tol_100/D6
+++ b/tests/sewing/tol_100/D6
@@ -1 +1 @@
-restore CTO904_cts20527b.rle a
+restore [locate_data_file CTO904_cts20527b.rle] a
diff --git a/tests/sewing/tol_100/D7 b/tests/sewing/tol_100/D7
index 281801c655..3f0e71f786 100644
--- a/tests/sewing/tol_100/D7
+++ b/tests/sewing/tol_100/D7
@@ -1 +1 @@
-restore CTO904_cts20549b.rle a
+restore [locate_data_file CTO904_cts20549b.rle] a
diff --git a/tests/sewing/tol_100/D8 b/tests/sewing/tol_100/D8
index f3121bae01..32a0b536dc 100644
--- a/tests/sewing/tol_100/D8
+++ b/tests/sewing/tol_100/D8
@@ -1 +1 @@
-restore CTO904_pro14785c.rle a
+restore [locate_data_file CTO904_pro14785c.rle] a
diff --git a/tests/sewing/tol_100/D9 b/tests/sewing/tol_100/D9
index 05d1d0ff16..ca14f3a69f 100644
--- a/tests/sewing/tol_100/D9
+++ b/tests/sewing/tol_100/D9
@@ -1 +1 @@
-restore CTO900_pro11292f.rle a
+restore [locate_data_file CTO900_pro11292f.rle] a
diff --git a/tests/sewing/tol_100/E1 b/tests/sewing/tol_100/E1
index 1c222f8ff3..50a1308558 100644
--- a/tests/sewing/tol_100/E1
+++ b/tests/sewing/tol_100/E1
@@ -1 +1 @@
-restore CTO900_pro11292g.rle a
+restore [locate_data_file CTO900_pro11292g.rle] a
diff --git a/tests/sewing/tol_100/E2 b/tests/sewing/tol_100/E2
index 3e8902e977..19c90e70db 100644
--- a/tests/sewing/tol_100/E2
+++ b/tests/sewing/tol_100/E2
@@ -1 +1 @@
-restore CTO900_pro11292h.rle a
+restore [locate_data_file CTO900_pro11292h.rle] a
diff --git a/tests/sewing/tol_100/E3 b/tests/sewing/tol_100/E3
index a35a9cb19c..03131961c6 100644
--- a/tests/sewing/tol_100/E3
+++ b/tests/sewing/tol_100/E3
@@ -1 +1 @@
-restore CTO900_pro11292i.rle a
+restore [locate_data_file CTO900_pro11292i.rle] a
diff --git a/tests/sewing/tol_100/E4 b/tests/sewing/tol_100/E4
index 130dcf1965..1b8a14b547 100644
--- a/tests/sewing/tol_100/E4
+++ b/tests/sewing/tol_100/E4
@@ -1 +1 @@
-restore CTO904_cts21326a.rle a
+restore [locate_data_file CTO904_cts21326a.rle] a
diff --git a/tests/sewing/tol_100/E5 b/tests/sewing/tol_100/E5
index d0d52e16f4..e2059770cf 100644
--- a/tests/sewing/tol_100/E5
+++ b/tests/sewing/tol_100/E5
@@ -1 +1 @@
-restore CTO904_cts21347a.rle a
+restore [locate_data_file CTO904_cts21347a.rle] a
diff --git a/tests/sewing/tol_100/E6 b/tests/sewing/tol_100/E6
index 1f423065cc..ddfe0a553e 100644
--- a/tests/sewing/tol_100/E6
+++ b/tests/sewing/tol_100/E6
@@ -1 +1 @@
-restore CTO904_cts21347b.rle a
+restore [locate_data_file CTO904_cts21347b.rle] a
diff --git a/tests/sewing/tol_100/E7 b/tests/sewing/tol_100/E7
index f5a75499b6..17cbb05531 100644
--- a/tests/sewing/tol_100/E7
+++ b/tests/sewing/tol_100/E7
@@ -1 +1 @@
-restore CTO904_cts21349.rle a
+restore [locate_data_file CTO904_cts21349.rle] a
diff --git a/tests/sewing/tol_100/E8 b/tests/sewing/tol_100/E8
index 7dd3bf760e..a5e4d323de 100644
--- a/tests/sewing/tol_100/E8
+++ b/tests/sewing/tol_100/E8
@@ -1 +1 @@
-restore CTO904_cts21364b.rle a
+restore [locate_data_file CTO904_cts21364b.rle] a
diff --git a/tests/sewing/tol_100/E9 b/tests/sewing/tol_100/E9
index 2dc56cc775..9f01f36cf9 100644
--- a/tests/sewing/tol_100/E9
+++ b/tests/sewing/tol_100/E9
@@ -1 +1 @@
-restore CTO904_fra50047a.rle a
+restore [locate_data_file CTO904_fra50047a.rle] a
diff --git a/tests/sewing/tol_100/F1 b/tests/sewing/tol_100/F1
index 61516ff6e3..5d9ae65753 100644
--- a/tests/sewing/tol_100/F1
+++ b/tests/sewing/tol_100/F1
@@ -1 +1 @@
-restore CTO904_fra60275a.rle a
+restore [locate_data_file CTO904_fra60275a.rle] a
diff --git a/tests/sewing/tol_100/F2 b/tests/sewing/tol_100/F2
index c398720b11..36192defbe 100644
--- a/tests/sewing/tol_100/F2
+++ b/tests/sewing/tol_100/F2
@@ -1 +1 @@
-restore CTO904_fra60977-part.rle a
+restore [locate_data_file CTO904_fra60977-part.rle] a
diff --git a/tests/sewing/tol_100/F3 b/tests/sewing/tol_100/F3
index 4b0d311dda..f2dfa5b225 100644
--- a/tests/sewing/tol_100/F3
+++ b/tests/sewing/tol_100/F3
@@ -1 +1 @@
-restore CTO904_fra60977-tool.rle a
+restore [locate_data_file CTO904_fra60977-tool.rle] a
diff --git a/tests/sewing/tol_100/F4 b/tests/sewing/tol_100/F4
index c0dfc67beb..39a21cb4ae 100644
--- a/tests/sewing/tol_100/F4
+++ b/tests/sewing/tol_100/F4
@@ -1 +1 @@
-restore CTO904_fra61146a.rle a
+restore [locate_data_file CTO904_fra61146a.rle] a
diff --git a/tests/sewing/tol_100/F5 b/tests/sewing/tol_100/F5
index 5f6a990234..32198d9abc 100644
--- a/tests/sewing/tol_100/F5
+++ b/tests/sewing/tol_100/F5
@@ -1 +1 @@
-restore CTO904_fra61146b.rle a
+restore [locate_data_file CTO904_fra61146b.rle] a
diff --git a/tests/sewing/tol_100/F6 b/tests/sewing/tol_100/F6
index e6a125cfc7..a976796de3 100644
--- a/tests/sewing/tol_100/F6
+++ b/tests/sewing/tol_100/F6
@@ -1 +1 @@
-restore CTO904_pro13075a.rle a
+restore [locate_data_file CTO904_pro13075a.rle] a
diff --git a/tests/sewing/tol_100/F7 b/tests/sewing/tol_100/F7
index 38405531f2..e1b9fd8889 100644
--- a/tests/sewing/tol_100/F7
+++ b/tests/sewing/tol_100/F7
@@ -1 +1 @@
-restore CTO904_pro13075b.rle a
+restore [locate_data_file CTO904_pro13075b.rle] a
diff --git a/tests/sewing/tol_100/F8 b/tests/sewing/tol_100/F8
index cc5a3c5c00..61335c0ef4 100644
--- a/tests/sewing/tol_100/F8
+++ b/tests/sewing/tol_100/F8
@@ -1 +1 @@
-restore CTO904_pro14785a.rle a
+restore [locate_data_file CTO904_pro14785a.rle] a
diff --git a/tests/sewing/tol_100/F9 b/tests/sewing/tol_100/F9
index fe39ba1ca8..78023a872a 100644
--- a/tests/sewing/tol_100/F9
+++ b/tests/sewing/tol_100/F9
@@ -1 +1 @@
-restore CTO904_cts20578a.rle a
+restore [locate_data_file CTO904_cts20578a.rle] a
diff --git a/tests/sewing/tol_100/G1 b/tests/sewing/tol_100/G1
index 99871ed0f2..2282242acc 100644
--- a/tests/sewing/tol_100/G1
+++ b/tests/sewing/tol_100/G1
@@ -1 +1 @@
-restore CTO904_cts20578b.rle a
+restore [locate_data_file CTO904_cts20578b.rle] a
diff --git a/tests/sewing/tol_100/G2 b/tests/sewing/tol_100/G2
index 25e193d7f4..52c06e66cc 100644
--- a/tests/sewing/tol_100/G2
+++ b/tests/sewing/tol_100/G2
@@ -1 +1 @@
-restore CTO904_cts20751b.rle a
+restore [locate_data_file CTO904_cts20751b.rle] a
diff --git a/tests/sewing/tol_100/G3 b/tests/sewing/tol_100/G3
index db9295bbe3..93af853ded 100644
--- a/tests/sewing/tol_100/G3
+++ b/tests/sewing/tol_100/G3
@@ -1 +1 @@
-restore CTO904_cts20767-tool.rle a
+restore [locate_data_file CTO904_cts20767-tool.rle] a
diff --git a/tests/sewing/tol_100/G4 b/tests/sewing/tol_100/G4
index 0323845823..525c34237f 100644
--- a/tests/sewing/tol_100/G4
+++ b/tests/sewing/tol_100/G4
@@ -1 +1 @@
-restore CTO904_cts20769a.rle a
+restore [locate_data_file CTO904_cts20769a.rle] a
diff --git a/tests/sewing/tol_100/G5 b/tests/sewing/tol_100/G5
index 77e1643a76..dc0895e4e7 100644
--- a/tests/sewing/tol_100/G5
+++ b/tests/sewing/tol_100/G5
@@ -1 +1 @@
-restore CTO904_cts20867-part.rle a
+restore [locate_data_file CTO904_cts20867-part.rle] a
diff --git a/tests/sewing/tol_100/G6 b/tests/sewing/tol_100/G6
index cf5679be4f..930d553111 100644
--- a/tests/sewing/tol_100/G6
+++ b/tests/sewing/tol_100/G6
@@ -1 +1 @@
-restore CTO904_cts20869-part.rle a
+restore [locate_data_file CTO904_cts20869-part.rle] a
diff --git a/tests/sewing/tol_100/G7 b/tests/sewing/tol_100/G7
index db305fc215..11c24ee7d1 100644
--- a/tests/sewing/tol_100/G7
+++ b/tests/sewing/tol_100/G7
@@ -1 +1 @@
-restore CTO904_cts20875-part.rle a
+restore [locate_data_file CTO904_cts20875-part.rle] a
diff --git a/tests/sewing/tol_100/G8 b/tests/sewing/tol_100/G8
index ec28552427..b8b8ac7443 100644
--- a/tests/sewing/tol_100/G8
+++ b/tests/sewing/tol_100/G8
@@ -1 +1 @@
-restore CHE_cc1.rle a
+restore [locate_data_file CHE_cc1.rle] a
diff --git a/tests/sewing/tol_100/G9 b/tests/sewing/tol_100/G9
index a4f37c92f4..c7c84882fa 100644
--- a/tests/sewing/tol_100/G9
+++ b/tests/sewing/tol_100/G9
@@ -1 +1 @@
-restore CHE_cc2.rle a
+restore [locate_data_file CHE_cc2.rle] a
diff --git a/tests/sewing/tol_100/H1 b/tests/sewing/tol_100/H1
index 51326af2f8..3a401f6866 100644
--- a/tests/sewing/tol_100/H1
+++ b/tests/sewing/tol_100/H1
@@ -1,2 +1,2 @@
-restore CHE_filter.rle a
+restore [locate_data_file CHE_filter.rle] a
 set nb_f 16
diff --git a/tests/sewing/tol_100/H2 b/tests/sewing/tol_100/H2
index b9f889565e..1b9091c536 100644
--- a/tests/sewing/tol_100/H2
+++ b/tests/sewing/tol_100/H2
@@ -1 +1 @@
-restore CHE_vevopar.rle a
+restore [locate_data_file CHE_vevopar.rle] a
diff --git a/tests/sewing/tol_100/H3 b/tests/sewing/tol_100/H3
index fabc3a6082..74ee3b01da 100644
--- a/tests/sewing/tol_100/H3
+++ b/tests/sewing/tol_100/H3
@@ -1 +1 @@
-restore CIN001_a10.rle a
+restore [locate_data_file CIN001_a10.rle] a
diff --git a/tests/sewing/tol_100/H4 b/tests/sewing/tol_100/H4
index ad523cdbd5..3776524c89 100644
--- a/tests/sewing/tol_100/H4
+++ b/tests/sewing/tol_100/H4
@@ -1 +1 @@
-restore CTO904_cts20907a.rle a
+restore [locate_data_file CTO904_cts20907a.rle] a
diff --git a/tests/sewing/tol_100/H5 b/tests/sewing/tol_100/H5
index b2180b4947..c0990f21ff 100644
--- a/tests/sewing/tol_100/H5
+++ b/tests/sewing/tol_100/H5
@@ -1 +1 @@
-restore CIN001_a15.rle a
+restore [locate_data_file CIN001_a15.rle] a
diff --git a/tests/sewing/tol_100/H6 b/tests/sewing/tol_100/H6
index 95a0a5be61..f1eb801b1b 100644
--- a/tests/sewing/tol_100/H6
+++ b/tests/sewing/tol_100/H6
@@ -1 +1 @@
-restore CTO904_cts20918b.rle a
+restore [locate_data_file CTO904_cts20918b.rle] a
diff --git a/tests/sewing/tol_100/H7 b/tests/sewing/tol_100/H7
index eecad01ad7..4aedcfa2ac 100644
--- a/tests/sewing/tol_100/H7
+++ b/tests/sewing/tol_100/H7
@@ -1 +1 @@
-restore CTO904_cts20944a.rle a
+restore [locate_data_file CTO904_cts20944a.rle] a
diff --git a/tests/sewing/tol_100/H8 b/tests/sewing/tol_100/H8
index 4446fc8b4b..66b85ebf92 100644
--- a/tests/sewing/tol_100/H8
+++ b/tests/sewing/tol_100/H8
@@ -1,2 +1,2 @@
-restore CIN001_a45.rle a
+restore [locate_data_file CIN001_a45.rle] a
 set nb_f 4
diff --git a/tests/sewing/tol_100/H9 b/tests/sewing/tol_100/H9
index 60101ee57b..c41cecb179 100644
--- a/tests/sewing/tol_100/H9
+++ b/tests/sewing/tol_100/H9
@@ -1 +1 @@
-restore CTO904_cts20944b.rle a
+restore [locate_data_file CTO904_cts20944b.rle] a
diff --git a/tests/sewing/tol_100/I1 b/tests/sewing/tol_100/I1
index 568ea40af8..fa408efdf8 100644
--- a/tests/sewing/tol_100/I1
+++ b/tests/sewing/tol_100/I1
@@ -1 +1 @@
-restore CTO904_cts20960a.rle a
+restore [locate_data_file CTO904_cts20960a.rle] a
diff --git a/tests/sewing/tol_100/I2 b/tests/sewing/tol_100/I2
index 294ef1df8d..8197ed192a 100644
--- a/tests/sewing/tol_100/I2
+++ b/tests/sewing/tol_100/I2
@@ -1 +1 @@
-restore CIN001_a6.rle a
+restore [locate_data_file CIN001_a6.rle] a
diff --git a/tests/sewing/tol_100/I3 b/tests/sewing/tol_100/I3
index 5a73e84fc4..12d26f9159 100644
--- a/tests/sewing/tol_100/I3
+++ b/tests/sewing/tol_100/I3
@@ -1 +1 @@
-restore CTO904_pro14785b.rle a
+restore [locate_data_file CTO904_pro14785b.rle] a
diff --git a/tests/sewing/tol_100/I4 b/tests/sewing/tol_100/I4
index 1913521011..4e56c0262e 100644
--- a/tests/sewing/tol_100/I4
+++ b/tests/sewing/tol_100/I4
@@ -1 +1 @@
-restore CIN900_cts20hli.rle a
+restore [locate_data_file CIN900_cts20hli.rle] a
diff --git a/tests/sewing/tol_100/I5 b/tests/sewing/tol_100/I5
index 1be3572af3..a49532f817 100644
--- a/tests/sewing/tol_100/I5
+++ b/tests/sewing/tol_100/I5
@@ -1 +1 @@
-restore CIN901_intcqhmi.rle a
+restore [locate_data_file CIN901_intcqhmi.rle] a
diff --git a/tests/sewing/tol_100/I6 b/tests/sewing/tol_100/I6
index 5d7354151f..3ef96460e7 100644
--- a/tests/sewing/tol_100/I6
+++ b/tests/sewing/tol_100/I6
@@ -1,2 +1,2 @@
-restore CIN901_intcqhmj.rle a
+restore [locate_data_file CIN901_intcqhmj.rle] a
 set nb_f ""
diff --git a/tests/sewing/tol_100/I7 b/tests/sewing/tol_100/I7
index cc7b3cdba5..1c3216d2f1 100644
--- a/tests/sewing/tol_100/I7
+++ b/tests/sewing/tol_100/I7
@@ -1 +1 @@
-restore CTO904_cts20974b.rle a
+restore [locate_data_file CTO904_cts20974b.rle] a
diff --git a/tests/sewing/tol_100/I8 b/tests/sewing/tol_100/I8
index 05bafa68bf..9343a14c56 100644
--- a/tests/sewing/tol_100/I8
+++ b/tests/sewing/tol_100/I8
@@ -1 +1 @@
-restore CTO904_cts20975b.rle a
+restore [locate_data_file CTO904_cts20975b.rle] a
diff --git a/tests/sewing/tol_100/I9 b/tests/sewing/tol_100/I9
index 1e94aa9678..c87041b91f 100644
--- a/tests/sewing/tol_100/I9
+++ b/tests/sewing/tol_100/I9
@@ -1,2 +1,2 @@
-restore CIN902_intcqhmm.rle a
+restore [locate_data_file CIN902_intcqhmm.rle] a
 set nb_f ""
diff --git a/tests/sewing/tol_100/J1 b/tests/sewing/tol_100/J1
index a30a08dad9..1984ca881c 100644
--- a/tests/sewing/tol_100/J1
+++ b/tests/sewing/tol_100/J1
@@ -1,2 +1,2 @@
-restore CIN902_intcqhmn.rle a
+restore [locate_data_file CIN902_intcqhmn.rle] a
 set nb_f ""
diff --git a/tests/sewing/tol_100/J2 b/tests/sewing/tol_100/J2
index e169e27d96..744dff8c34 100644
--- a/tests/sewing/tol_100/J2
+++ b/tests/sewing/tol_100/J2
@@ -1,2 +1,2 @@
-restore CIN902_intcqhmo.rle a
+restore [locate_data_file CIN902_intcqhmo.rle] a
 set nb_f ""
diff --git a/tests/sewing/tol_100/J3 b/tests/sewing/tol_100/J3
index 89c5464405..22515edd3c 100644
--- a/tests/sewing/tol_100/J3
+++ b/tests/sewing/tol_100/J3
@@ -1,2 +1,2 @@
-restore CIN902_intcqhmp.rle a
+restore [locate_data_file CIN902_intcqhmp.rle] a
 set nb_f 6
diff --git a/tests/sewing/tol_100/J4 b/tests/sewing/tol_100/J4
index 1bf2411d59..7b20873b3a 100644
--- a/tests/sewing/tol_100/J4
+++ b/tests/sewing/tol_100/J4
@@ -1 +1 @@
-restore CIN902_intcqhmq.rle a
+restore [locate_data_file CIN902_intcqhmq.rle] a
diff --git a/tests/sewing/tol_100/J5 b/tests/sewing/tol_100/J5
index ce43654522..4d71a98253 100644
--- a/tests/sewing/tol_100/J5
+++ b/tests/sewing/tol_100/J5
@@ -1,2 +1,2 @@
-restore CIN902_intcqhmr.rle a
+restore [locate_data_file CIN902_intcqhmr.rle] a
 puts "TODO ?#23150 ALL: Error : Number of faulties is"
diff --git a/tests/sewing/tol_100/J6 b/tests/sewing/tol_100/J6
index 3699e30d68..c5d38ff926 100644
--- a/tests/sewing/tol_100/J6
+++ b/tests/sewing/tol_100/J6
@@ -1,2 +1,2 @@
-restore CIN902_intcqhms.rle a
+restore [locate_data_file CIN902_intcqhms.rle] a
 set nb_f ""
diff --git a/tests/sewing/tol_100/J7 b/tests/sewing/tol_100/J7
index 0e30a49e89..778808b60e 100644
--- a/tests/sewing/tol_100/J7
+++ b/tests/sewing/tol_100/J7
@@ -1 +1 @@
-restore CTO904_cts21124a.rle a
+restore [locate_data_file CTO904_cts21124a.rle] a
diff --git a/tests/sewing/tol_100/J8 b/tests/sewing/tol_100/J8
index 04e17bc50b..46c09aaa19 100644
--- a/tests/sewing/tol_100/J8
+++ b/tests/sewing/tol_100/J8
@@ -1 +1 @@
-restore CTO904_cts21143a.rle a
+restore [locate_data_file CTO904_cts21143a.rle] a
diff --git a/tests/sewing/tol_100/J9 b/tests/sewing/tol_100/J9
index 12bb52da05..b4052b52bc 100644
--- a/tests/sewing/tol_100/J9
+++ b/tests/sewing/tol_100/J9
@@ -1 +1 @@
-restore CTO904_cts21208a.rle a
+restore [locate_data_file CTO904_cts21208a.rle] a
diff --git a/tests/sewing/tol_100/K1 b/tests/sewing/tol_100/K1
index fc445005cc..1d4c526203 100644
--- a/tests/sewing/tol_100/K1
+++ b/tests/sewing/tol_100/K1
@@ -1,2 +1,2 @@
-restore CNP002_projoiep.rle a
+restore [locate_data_file CNP002_projoiep.rle] a
 puts "TODO ?#23150 ALL: Error : Number of faulties is"
diff --git a/tests/sewing/tol_100/K2 b/tests/sewing/tol_100/K2
index be071154ed..271ce484b7 100644
--- a/tests/sewing/tol_100/K2
+++ b/tests/sewing/tol_100/K2
@@ -1 +1 @@
-restore CNP002_projoieq.rle a
+restore [locate_data_file CNP002_projoieq.rle] a
diff --git a/tests/sewing/tol_100/K3 b/tests/sewing/tol_100/K3
index 13fa3cf6c2..11776565a0 100644
--- a/tests/sewing/tol_100/K3
+++ b/tests/sewing/tol_100/K3
@@ -1 +1 @@
-restore CNP002_projoier.rle a
+restore [locate_data_file CNP002_projoier.rle] a
diff --git a/tests/sewing/tol_100/K4 b/tests/sewing/tol_100/K4
index cc02d7d4fd..13796084c4 100644
--- a/tests/sewing/tol_100/K4
+++ b/tests/sewing/tol_100/K4
@@ -1 +1 @@
-restore CTO900_buc60219a.rle a
+restore [locate_data_file CTO900_buc60219a.rle] a
diff --git a/tests/sewing/tol_100/K5 b/tests/sewing/tol_100/K5
index 0d142918eb..944d6e14f2 100644
--- a/tests/sewing/tol_100/K5
+++ b/tests/sewing/tol_100/K5
@@ -1 +1 @@
-restore CTO900_cts18078-part.rle a
+restore [locate_data_file CTO900_cts18078-part.rle] a
diff --git a/tests/sewing/tol_100/K6 b/tests/sewing/tol_100/K6
index 81ccd5c114..b7a372b753 100644
--- a/tests/sewing/tol_100/K6
+++ b/tests/sewing/tol_100/K6
@@ -1 +1 @@
-restore CTO900_cts19474part.rle a
+restore [locate_data_file CTO900_cts19474part.rle] a
diff --git a/tests/sewing/tol_100/K7 b/tests/sewing/tol_100/K7
index f79a660896..676153d564 100644
--- a/tests/sewing/tol_100/K7
+++ b/tests/sewing/tol_100/K7
@@ -1 +1 @@
-restore CTO900_cts19485-part.rle a
+restore [locate_data_file CTO900_cts19485-part.rle] a
diff --git a/tests/sewing/tol_100/K8 b/tests/sewing/tol_100/K8
index 4921e499a4..03775c343d 100644
--- a/tests/sewing/tol_100/K8
+++ b/tests/sewing/tol_100/K8
@@ -1 +1 @@
-restore CTO900_cts20105a.rle a
+restore [locate_data_file CTO900_cts20105a.rle] a
diff --git a/tests/sewing/tol_100/K9 b/tests/sewing/tol_100/K9
index e443db698f..08fadfd50c 100644
--- a/tests/sewing/tol_100/K9
+++ b/tests/sewing/tol_100/K9
@@ -1 +1 @@
-restore CTO904_cts21210a.rle a
+restore [locate_data_file CTO904_cts21210a.rle] a
diff --git a/tests/sewing/tol_100/L1 b/tests/sewing/tol_100/L1
index 9f9c015299..3ae404333f 100644
--- a/tests/sewing/tol_100/L1
+++ b/tests/sewing/tol_100/L1
@@ -1 +1 @@
-restore CTO904_cts21216a.rle a
+restore [locate_data_file CTO904_cts21216a.rle] a
diff --git a/tests/sewing/tol_100/L2 b/tests/sewing/tol_100/L2
index 648820f992..13b0c941bd 100644
--- a/tests/sewing/tol_100/L2
+++ b/tests/sewing/tol_100/L2
@@ -1 +1 @@
-restore CTO900_cts20124a.rle a
+restore [locate_data_file CTO900_cts20124a.rle] a
diff --git a/tests/sewing/tol_100/L3 b/tests/sewing/tol_100/L3
index e46d377f51..a6c04f06ca 100644
--- a/tests/sewing/tol_100/L3
+++ b/tests/sewing/tol_100/L3
@@ -1 +1 @@
-restore CTO900_cts20124b.rle a
+restore [locate_data_file CTO900_cts20124b.rle] a
diff --git a/tests/sewing/tol_100/L4 b/tests/sewing/tol_100/L4
index 41527f7177..b4c3375455 100644
--- a/tests/sewing/tol_100/L4
+++ b/tests/sewing/tol_100/L4
@@ -1 +1 @@
-restore CTO900_cts20212-part.rle a
+restore [locate_data_file CTO900_cts20212-part.rle] a
diff --git a/tests/sewing/tol_100/L5 b/tests/sewing/tol_100/L5
index ad632f4cb5..fd9dc07610 100644
--- a/tests/sewing/tol_100/L5
+++ b/tests/sewing/tol_100/L5
@@ -1 +1 @@
-restore CTO900_cts20212-tool.rle a
+restore [locate_data_file CTO900_cts20212-tool.rle] a
diff --git a/tests/sewing/tol_100/L6 b/tests/sewing/tol_100/L6
index 39f37904a6..c27faf3d86 100644
--- a/tests/sewing/tol_100/L6
+++ b/tests/sewing/tol_100/L6
@@ -1 +1 @@
-restore CTO900_cts20374-part.rle a
+restore [locate_data_file CTO900_cts20374-part.rle] a
diff --git a/tests/sewing/tol_100/L7 b/tests/sewing/tol_100/L7
index 5d9a7114a1..5522ddd30f 100644
--- a/tests/sewing/tol_100/L7
+++ b/tests/sewing/tol_100/L7
@@ -1 +1 @@
-restore CTO900_cts20722c.rle a
+restore [locate_data_file CTO900_cts20722c.rle] a
diff --git a/tests/sewing/tol_100/L8 b/tests/sewing/tol_100/L8
index 932748f055..f765024496 100644
--- a/tests/sewing/tol_100/L8
+++ b/tests/sewing/tol_100/L8
@@ -1 +1 @@
-restore CTO900_cts20722d.rle a
+restore [locate_data_file CTO900_cts20722d.rle] a
diff --git a/tests/sewing/tol_100/L9 b/tests/sewing/tol_100/L9
index 42c4748bf2..37f59f928f 100644
--- a/tests/sewing/tol_100/L9
+++ b/tests/sewing/tol_100/L9
@@ -1 +1 @@
-restore CTO900_cts20736a.rle a
+restore [locate_data_file CTO900_cts20736a.rle] a
diff --git a/tests/sewing/tol_100/M1 b/tests/sewing/tol_100/M1
index fa018f3cf2..203d8fd8ae 100644
--- a/tests/sewing/tol_100/M1
+++ b/tests/sewing/tol_100/M1
@@ -1 +1 @@
-restore CTO904_pro13495a.rle a
+restore [locate_data_file CTO904_pro13495a.rle] a
diff --git a/tests/sewing/tol_100/M2 b/tests/sewing/tol_100/M2
index c8596423ec..7df324a2ae 100644
--- a/tests/sewing/tol_100/M2
+++ b/tests/sewing/tol_100/M2
@@ -1 +1 @@
-restore CTO900_cts21180c.rle a
+restore [locate_data_file CTO900_cts21180c.rle] a
diff --git a/tests/sewing/tol_100/M3 b/tests/sewing/tol_100/M3
index d88c53785b..7f5f20cd58 100644
--- a/tests/sewing/tol_100/M3
+++ b/tests/sewing/tol_100/M3
@@ -1 +1 @@
-restore CTO900_cts21180d.rle a
+restore [locate_data_file CTO900_cts21180d.rle] a
diff --git a/tests/sewing/tol_100/M4 b/tests/sewing/tol_100/M4
index 3601b59b4c..e9355c08c3 100644
--- a/tests/sewing/tol_100/M4
+++ b/tests/sewing/tol_100/M4
@@ -1 +1 @@
-restore CTO900_cts21197c.rle a
+restore [locate_data_file CTO900_cts21197c.rle] a
diff --git a/tests/sewing/tol_100/M5 b/tests/sewing/tol_100/M5
index dff78d7331..8d53a0b8c7 100644
--- a/tests/sewing/tol_100/M5
+++ b/tests/sewing/tol_100/M5
@@ -1 +1 @@
-restore CTO900_cts21453a.rle a
+restore [locate_data_file CTO900_cts21453a.rle] a
diff --git a/tests/sewing/tol_100/M6 b/tests/sewing/tol_100/M6
index c7460bc1af..868c1ab834 100644
--- a/tests/sewing/tol_100/M6
+++ b/tests/sewing/tol_100/M6
@@ -1 +1 @@
-restore CTO900_cts21453b.rle a
+restore [locate_data_file CTO900_cts21453b.rle] a
diff --git a/tests/sewing/tol_100/M7 b/tests/sewing/tol_100/M7
index 019a74f0c2..05d4de6975 100644
--- a/tests/sewing/tol_100/M7
+++ b/tests/sewing/tol_100/M7
@@ -1 +1 @@
-restore CTO904_pro14527a.rle a
+restore [locate_data_file CTO904_pro14527a.rle] a
diff --git a/tests/sewing/tol_100/M8 b/tests/sewing/tol_100/M8
index 4d18236b4c..609194a3cd 100644
--- a/tests/sewing/tol_100/M8
+++ b/tests/sewing/tol_100/M8
@@ -1 +1 @@
-restore CTO900_cts40185_ailette.rle a
+restore [locate_data_file CTO900_cts40185_ailette.rle] a
diff --git a/tests/sewing/tol_100/M9 b/tests/sewing/tol_100/M9
index 40386be37e..989d5e711a 100644
--- a/tests/sewing/tol_100/M9
+++ b/tests/sewing/tol_100/M9
@@ -1,2 +1,2 @@
-restore CTO900_cts40185_top.rle a
+restore [locate_data_file CTO900_cts40185_top.rle] a
 set nb_f 8
diff --git a/tests/sewing/tol_100/N1 b/tests/sewing/tol_100/N1
index d50e52b418..45bf4ca990 100644
--- a/tests/sewing/tol_100/N1
+++ b/tests/sewing/tol_100/N1
@@ -1 +1 @@
-restore CTO900_cts60005a.rle a
+restore [locate_data_file CTO900_cts60005a.rle] a
diff --git a/tests/sewing/tol_100/N2 b/tests/sewing/tol_100/N2
index 4e47ffd29a..6259b2b6bd 100644
--- a/tests/sewing/tol_100/N2
+++ b/tests/sewing/tol_100/N2
@@ -1 +1 @@
-restore CTO900_cts60005b.rle a
+restore [locate_data_file CTO900_cts60005b.rle] a
diff --git a/tests/sewing/tol_100/N3 b/tests/sewing/tol_100/N3
index cc18ba587f..96d4b516d9 100644
--- a/tests/sewing/tol_100/N3
+++ b/tests/sewing/tol_100/N3
@@ -1 +1 @@
-restore CTO904_pro14942a.rle a
+restore [locate_data_file CTO904_pro14942a.rle] a
diff --git a/tests/sewing/tol_100/N4 b/tests/sewing/tol_100/N4
index 373eca8bb7..060aaae2c5 100644
--- a/tests/sewing/tol_100/N4
+++ b/tests/sewing/tol_100/N4
@@ -1 +1 @@
-restore CTO900_fra11018a.rle a
+restore [locate_data_file CTO900_fra11018a.rle] a
diff --git a/tests/sewing/tol_100/N5 b/tests/sewing/tol_100/N5
index d663490966..4494ac9904 100644
--- a/tests/sewing/tol_100/N5
+++ b/tests/sewing/tol_100/N5
@@ -1 +1 @@
-restore CTO900_fra11018b.rle a
+restore [locate_data_file CTO900_fra11018b.rle] a
diff --git a/tests/sewing/tol_100/N6 b/tests/sewing/tol_100/N6
index 2a0272b137..d94633af4b 100644
--- a/tests/sewing/tol_100/N6
+++ b/tests/sewing/tol_100/N6
@@ -1 +1 @@
-restore CTO900_fra50089-part.rle a
+restore [locate_data_file CTO900_fra50089-part.rle] a
diff --git a/tests/sewing/tol_100/N7 b/tests/sewing/tol_100/N7
index 4012bab7bc..40426043a5 100644
--- a/tests/sewing/tol_100/N7
+++ b/tests/sewing/tol_100/N7
@@ -1 +1 @@
-restore CTO900_fra60618-part.rle a
+restore [locate_data_file CTO900_fra60618-part.rle] a
diff --git a/tests/sewing/tol_100/N8 b/tests/sewing/tol_100/N8
index 2ec0596dce..6a5c26cdfe 100644
--- a/tests/sewing/tol_100/N8
+++ b/tests/sewing/tol_100/N8
@@ -1 +1 @@
-restore CTO909_Bug3_Tr_obj.rle a
+restore [locate_data_file CTO909_Bug3_Tr_obj.rle] a
diff --git a/tests/sewing/tol_100/N9 b/tests/sewing/tol_100/N9
index dd063664c8..da7f411993 100644
--- a/tests/sewing/tol_100/N9
+++ b/tests/sewing/tol_100/N9
@@ -1 +1 @@
-restore CTO900_fra60656-part.rle a
+restore [locate_data_file CTO900_fra60656-part.rle] a
diff --git a/tests/sewing/tol_100/O1 b/tests/sewing/tol_100/O1
index 9b77f5618c..c98674f63e 100644
--- a/tests/sewing/tol_100/O1
+++ b/tests/sewing/tol_100/O1
@@ -1 +1 @@
-restore CTO900_fra60656-tool.rle a
+restore [locate_data_file CTO900_fra60656-tool.rle] a
diff --git a/tests/sewing/tol_100/O2 b/tests/sewing/tol_100/O2
index 133fdb9c76..c79e72c7ea 100644
--- a/tests/sewing/tol_100/O2
+++ b/tests/sewing/tol_100/O2
@@ -1 +1 @@
-restore CTO900_fra60810-part.rle a
+restore [locate_data_file CTO900_fra60810-part.rle] a
diff --git a/tests/sewing/tol_100/O3 b/tests/sewing/tol_100/O3
index ffb43ad346..9c8ef2b19b 100644
--- a/tests/sewing/tol_100/O3
+++ b/tests/sewing/tol_100/O3
@@ -1 +1 @@
-restore CTO900_fra60810-tool.rle a
+restore [locate_data_file CTO900_fra60810-tool.rle] a
diff --git a/tests/sewing/tol_100/O4 b/tests/sewing/tol_100/O4
index 722eca29e8..6419f1b4b0 100644
--- a/tests/sewing/tol_100/O4
+++ b/tests/sewing/tol_100/O4
@@ -1 +1 @@
-restore CTO900_ger50084c.rle a
+restore [locate_data_file CTO900_ger50084c.rle] a
diff --git a/tests/sewing/tol_100/O5 b/tests/sewing/tol_100/O5
index 57215d953b..d617479266 100644
--- a/tests/sewing/tol_100/O5
+++ b/tests/sewing/tol_100/O5
@@ -1 +1 @@
-restore CTO900_ger50084d.rle a
+restore [locate_data_file CTO900_ger50084d.rle] a
diff --git a/tests/sewing/tol_100/O6 b/tests/sewing/tol_100/O6
index 7854f28a5f..781dc13ec7 100644
--- a/tests/sewing/tol_100/O6
+++ b/tests/sewing/tol_100/O6
@@ -1 +1 @@
-restore CTO900_ger60039a.rle a
+restore [locate_data_file CTO900_ger60039a.rle] a
diff --git a/tests/sewing/tol_100/O7 b/tests/sewing/tol_100/O7
index 4d1b32d7e2..55db9093fb 100644
--- a/tests/sewing/tol_100/O7
+++ b/tests/sewing/tol_100/O7
@@ -1 +1 @@
-restore CTO900_ger60039b.rle a
+restore [locate_data_file CTO900_ger60039b.rle] a
diff --git a/tests/sewing/tol_100/O8 b/tests/sewing/tol_100/O8
index 557aeda906..e7876fb62f 100644
--- a/tests/sewing/tol_100/O8
+++ b/tests/sewing/tol_100/O8
@@ -1 +1 @@
-restore CTO900_ger60040-part.rle a
+restore [locate_data_file CTO900_ger60040-part.rle] a
diff --git a/tests/sewing/tol_100/O9 b/tests/sewing/tol_100/O9
index 6bd2c606d8..80e27313b2 100644
--- a/tests/sewing/tol_100/O9
+++ b/tests/sewing/tol_100/O9
@@ -1 +1 @@
-restore CTO900_ger60041a.rle a
+restore [locate_data_file CTO900_ger60041a.rle] a
diff --git a/tests/sewing/tol_100/P1 b/tests/sewing/tol_100/P1
index 1dc84b6010..c6cfae590c 100644
--- a/tests/sewing/tol_100/P1
+++ b/tests/sewing/tol_100/P1
@@ -1 +1 @@
-restore CTO900_ger60043-part.rle a
+restore [locate_data_file CTO900_ger60043-part.rle] a
diff --git a/tests/sewing/tol_100/P2 b/tests/sewing/tol_100/P2
index 285b073716..b75002a737 100644
--- a/tests/sewing/tol_100/P2
+++ b/tests/sewing/tol_100/P2
@@ -1 +1 @@
-restore CTO900_ger60043-tool.rle a
+restore [locate_data_file CTO900_ger60043-tool.rle] a
diff --git a/tests/sewing/tol_100/P3 b/tests/sewing/tol_100/P3
index 0d03c5fe3e..3a56303df6 100644
--- a/tests/sewing/tol_100/P3
+++ b/tests/sewing/tol_100/P3
@@ -1 +1 @@
-restore CTO900_ger60054a.rle a
+restore [locate_data_file CTO900_ger60054a.rle] a
diff --git a/tests/sewing/tol_100/P4 b/tests/sewing/tol_100/P4
index 5d1229f1f3..7d3a8de262 100644
--- a/tests/sewing/tol_100/P4
+++ b/tests/sewing/tol_100/P4
@@ -1 +1 @@
-restore CTO900_ger60054b.rle a
+restore [locate_data_file CTO900_ger60054b.rle] a
diff --git a/tests/sewing/tol_100/P5 b/tests/sewing/tol_100/P5
index 4f5da17dc8..a91f7b3bd1 100644
--- a/tests/sewing/tol_100/P5
+++ b/tests/sewing/tol_100/P5
@@ -1 +1 @@
-restore CTO900_ger60065-part.rle a
+restore [locate_data_file CTO900_ger60065-part.rle] a
diff --git a/tests/sewing/tol_100/P6 b/tests/sewing/tol_100/P6
index 415d4b75ef..384848a516 100644
--- a/tests/sewing/tol_100/P6
+++ b/tests/sewing/tol_100/P6
@@ -1 +1 @@
-restore CTO900_ger60224-part.rle a
+restore [locate_data_file CTO900_ger60224-part.rle] a
diff --git a/tests/sewing/tol_100/P7 b/tests/sewing/tol_100/P7
index 2af35f6066..3eae37a39d 100644
--- a/tests/sewing/tol_100/P7
+++ b/tests/sewing/tol_100/P7
@@ -1 +1 @@
-restore CTO900_ger60224c.rle a
+restore [locate_data_file CTO900_ger60224c.rle] a
diff --git a/tests/sewing/tol_100/P8 b/tests/sewing/tol_100/P8
index f768224ee3..d58b2465f6 100644
--- a/tests/sewing/tol_100/P8
+++ b/tests/sewing/tol_100/P8
@@ -1 +1 @@
-restore CTO900_ger60239a.rle a
+restore [locate_data_file CTO900_ger60239a.rle] a
diff --git a/tests/sewing/tol_100/P9 b/tests/sewing/tol_100/P9
index ab4e244513..ccf8cd0431 100644
--- a/tests/sewing/tol_100/P9
+++ b/tests/sewing/tol_100/P9
@@ -1 +1 @@
-restore CTO900_ger60239b.rle a
+restore [locate_data_file CTO900_ger60239b.rle] a
diff --git a/tests/sewing/tol_100/Q1 b/tests/sewing/tol_100/Q1
index 673d51f4b8..18dbcff20e 100644
--- a/tests/sewing/tol_100/Q1
+++ b/tests/sewing/tol_100/Q1
@@ -1 +1 @@
-restore CTO900_ger60598c.rle a
+restore [locate_data_file CTO900_ger60598c.rle] a
diff --git a/tests/sewing/tol_100/Q2 b/tests/sewing/tol_100/Q2
index 5fb74534e5..43d35013d6 100644
--- a/tests/sewing/tol_100/Q2
+++ b/tests/sewing/tol_100/Q2
@@ -1 +1 @@
-restore CTO900_hkg60163c.rle a
+restore [locate_data_file CTO900_hkg60163c.rle] a
diff --git a/tests/sewing/tol_100/Q3 b/tests/sewing/tol_100/Q3
index 320b166954..1e5531efd0 100644
--- a/tests/sewing/tol_100/Q3
+++ b/tests/sewing/tol_100/Q3
@@ -1 +1 @@
-restore CTO900_pro10505a.rle a
+restore [locate_data_file CTO900_pro10505a.rle] a
diff --git a/tests/sewing/tol_100/Q4 b/tests/sewing/tol_100/Q4
index 4b084ca359..07602404ae 100644
--- a/tests/sewing/tol_100/Q4
+++ b/tests/sewing/tol_100/Q4
@@ -1 +1 @@
-restore CTO900_pro10505b.rle a
+restore [locate_data_file CTO900_pro10505b.rle] a
diff --git a/tests/sewing/tol_100/Q5 b/tests/sewing/tol_100/Q5
index ee3ef33d10..f4a7979671 100644
--- a/tests/sewing/tol_100/Q5
+++ b/tests/sewing/tol_100/Q5
@@ -1 +1 @@
-restore CTO900_pro12660b.rle a
+restore [locate_data_file CTO900_pro12660b.rle] a
diff --git a/tests/sewing/tol_100/Q6 b/tests/sewing/tol_100/Q6
index e0fa1ae633..342aba3588 100644
--- a/tests/sewing/tol_100/Q6
+++ b/tests/sewing/tol_100/Q6
@@ -1 +1 @@
-restore CTO900_pro12663-part.rle a
+restore [locate_data_file CTO900_pro12663-part.rle] a
diff --git a/tests/sewing/tol_100/Q7 b/tests/sewing/tol_100/Q7
index a52877782b..c9b95c7cfb 100644
--- a/tests/sewing/tol_100/Q7
+++ b/tests/sewing/tol_100/Q7
@@ -1 +1 @@
-restore CTO900_pro12663-tool.rle a
+restore [locate_data_file CTO900_pro12663-tool.rle] a
diff --git a/tests/sewing/tol_100/Q8 b/tests/sewing/tol_100/Q8
index be58ea4076..d389bd1261 100644
--- a/tests/sewing/tol_100/Q8
+++ b/tests/sewing/tol_100/Q8
@@ -1 +1 @@
-restore CTO900_pro14621c.rle a
+restore [locate_data_file CTO900_pro14621c.rle] a
diff --git a/tests/sewing/tol_100/Q9 b/tests/sewing/tol_100/Q9
index cb2d1ef0e6..d9d26e7f02 100644
--- a/tests/sewing/tol_100/Q9
+++ b/tests/sewing/tol_100/Q9
@@ -1 +1 @@
-restore CTO900_pro5640_wanted.rle a
+restore [locate_data_file CTO900_pro5640_wanted.rle] a
diff --git a/tests/sewing/tol_100/R1 b/tests/sewing/tol_100/R1
index 039a935e4e..2c672a7dd6 100644
--- a/tests/sewing/tol_100/R1
+++ b/tests/sewing/tol_100/R1
@@ -1 +1 @@
-restore CTO900_pro5640a.rle a
+restore [locate_data_file CTO900_pro5640a.rle] a
diff --git a/tests/sewing/tol_100/R2 b/tests/sewing/tol_100/R2
index 0192f39f93..a509bda029 100644
--- a/tests/sewing/tol_100/R2
+++ b/tests/sewing/tol_100/R2
@@ -1 +1 @@
-restore CTO900_pro5640b.rle a
+restore [locate_data_file CTO900_pro5640b.rle] a
diff --git a/tests/sewing/tol_100/R3 b/tests/sewing/tol_100/R3
index 5bd8379b43..230bcaf86d 100644
--- a/tests/sewing/tol_100/R3
+++ b/tests/sewing/tol_100/R3
@@ -1 +1 @@
-restore CTO900_pro6050a.rle a
+restore [locate_data_file CTO900_pro6050a.rle] a
diff --git a/tests/sewing/tol_100/R4 b/tests/sewing/tol_100/R4
index aa29aa65be..88008005c1 100644
--- a/tests/sewing/tol_100/R4
+++ b/tests/sewing/tol_100/R4
@@ -1 +1 @@
-restore CTO900_pro6050b.rle a
+restore [locate_data_file CTO900_pro6050b.rle] a
diff --git a/tests/sewing/tol_100/R5 b/tests/sewing/tol_100/R5
index 89b2236c07..42328cf609 100644
--- a/tests/sewing/tol_100/R5
+++ b/tests/sewing/tol_100/R5
@@ -1 +1 @@
-restore CTO900_pro6066-part.rle a
+restore [locate_data_file CTO900_pro6066-part.rle] a
diff --git a/tests/sewing/tol_100/R6 b/tests/sewing/tol_100/R6
index f054c42d4e..fdb10b5866 100644
--- a/tests/sewing/tol_100/R6
+++ b/tests/sewing/tol_100/R6
@@ -1 +1 @@
-restore CTO900_pro6066-tool.rle a
+restore [locate_data_file CTO900_pro6066-tool.rle] a
diff --git a/tests/sewing/tol_100/R7 b/tests/sewing/tol_100/R7
index 5dda27585a..978097f21e 100644
--- a/tests/sewing/tol_100/R7
+++ b/tests/sewing/tol_100/R7
@@ -1 +1 @@
-restore CTO900_pro6066a.rle a
+restore [locate_data_file CTO900_pro6066a.rle] a
diff --git a/tests/sewing/tol_100/R8 b/tests/sewing/tol_100/R8
index c1437d503e..8aaf20b89c 100644
--- a/tests/sewing/tol_100/R8
+++ b/tests/sewing/tol_100/R8
@@ -1 +1 @@
-restore CTO900_pro6066b.rle a
+restore [locate_data_file CTO900_pro6066b.rle] a
diff --git a/tests/sewing/tol_100/R9 b/tests/sewing/tol_100/R9
index 086e17116f..f8dc754bb8 100644
--- a/tests/sewing/tol_100/R9
+++ b/tests/sewing/tol_100/R9
@@ -1 +1 @@
-restore CTO900_pro6110a.rle a
+restore [locate_data_file CTO900_pro6110a.rle] a
diff --git a/tests/sewing/tol_100/S1 b/tests/sewing/tol_100/S1
index ec5e9bc2bf..8540c99f6c 100644
--- a/tests/sewing/tol_100/S1
+++ b/tests/sewing/tol_100/S1
@@ -1 +1 @@
-restore CTO900_pro6110b.rle a
+restore [locate_data_file CTO900_pro6110b.rle] a
diff --git a/tests/sewing/tol_100/S2 b/tests/sewing/tol_100/S2
index 4782024841..b1869d7144 100644
--- a/tests/sewing/tol_100/S2
+++ b/tests/sewing/tol_100/S2
@@ -1 +1 @@
-restore CTO900_pro6965a.rle a
+restore [locate_data_file CTO900_pro6965a.rle] a
diff --git a/tests/sewing/tol_100/S3 b/tests/sewing/tol_100/S3
index 250ea3014e..9154b2bb3a 100644
--- a/tests/sewing/tol_100/S3
+++ b/tests/sewing/tol_100/S3
@@ -1 +1 @@
-restore CTO900_pro6965b.rle a
+restore [locate_data_file CTO900_pro6965b.rle] a
diff --git a/tests/sewing/tol_100/S4 b/tests/sewing/tol_100/S4
index 3bc929be52..dfa1cd4318 100644
--- a/tests/sewing/tol_100/S4
+++ b/tests/sewing/tol_100/S4
@@ -1 +1 @@
-restore CTO900_pro6974.rle a
+restore [locate_data_file CTO900_pro6974.rle] a
diff --git a/tests/sewing/tol_100/S5 b/tests/sewing/tol_100/S5
index a251df6ef3..3b1c76b64a 100644
--- a/tests/sewing/tol_100/S5
+++ b/tests/sewing/tol_100/S5
@@ -1 +1 @@
-restore CTO900_pro6974_box.rle a
+restore [locate_data_file CTO900_pro6974_box.rle] a
diff --git a/tests/sewing/tol_100/S6 b/tests/sewing/tol_100/S6
index c7bd6ae7dc..90cf97487b 100644
--- a/tests/sewing/tol_100/S6
+++ b/tests/sewing/tol_100/S6
@@ -1 +1 @@
-restore CTO900_pro7637_box.rle a
+restore [locate_data_file CTO900_pro7637_box.rle] a
diff --git a/tests/sewing/tol_100/S7 b/tests/sewing/tol_100/S7
index 2cb4002707..4a38fcc651 100644
--- a/tests/sewing/tol_100/S7
+++ b/tests/sewing/tol_100/S7
@@ -1 +1 @@
-restore CTO900_pro7637_prism_oblong.rle a
+restore [locate_data_file CTO900_pro7637_prism_oblong.rle] a
diff --git a/tests/sewing/tol_100/S8 b/tests/sewing/tol_100/S8
index d1fdd48edc..da174ce481 100644
--- a/tests/sewing/tol_100/S8
+++ b/tests/sewing/tol_100/S8
@@ -1 +1 @@
-restore CTO900_pro7637c_box_dsg.rle a
+restore [locate_data_file CTO900_pro7637c_box_dsg.rle] a
diff --git a/tests/sewing/tol_100/S9 b/tests/sewing/tol_100/S9
index 407ba128c7..4ade6718a9 100644
--- a/tests/sewing/tol_100/S9
+++ b/tests/sewing/tol_100/S9
@@ -1 +1 @@
-restore CTO900_pro7637c_prism_oblong_dsg.rle a
+restore [locate_data_file CTO900_pro7637c_prism_oblong_dsg.rle] a
diff --git a/tests/sewing/tol_100/T1 b/tests/sewing/tol_100/T1
index 8a0e010486..537e2d5f00 100644
--- a/tests/sewing/tol_100/T1
+++ b/tests/sewing/tol_100/T1
@@ -1 +1 @@
-restore CTO900_pro7637c_result_dsg.rle a
+restore [locate_data_file CTO900_pro7637c_result_dsg.rle] a
diff --git a/tests/sewing/tol_100/T2 b/tests/sewing/tol_100/T2
index a84ab30d1b..6ae301f03a 100644
--- a/tests/sewing/tol_100/T2
+++ b/tests/sewing/tol_100/T2
@@ -1 +1 @@
-restore CTO900_pro7934a.rle a
+restore [locate_data_file CTO900_pro7934a.rle] a
diff --git a/tests/sewing/tol_100/T3 b/tests/sewing/tol_100/T3
index 0d6fba172a..683843c527 100644
--- a/tests/sewing/tol_100/T3
+++ b/tests/sewing/tol_100/T3
@@ -1 +1 @@
-restore CTO900_pro7934b.rle a
+restore [locate_data_file CTO900_pro7934b.rle] a
diff --git a/tests/sewing/tol_100/T4 b/tests/sewing/tol_100/T4
index ec1711e58d..e35dfffc24 100644
--- a/tests/sewing/tol_100/T4
+++ b/tests/sewing/tol_100/T4
@@ -1 +1 @@
-restore CTO900_pro8320-part.rle a
+restore [locate_data_file CTO900_pro8320-part.rle] a
diff --git a/tests/sewing/tol_100/T5 b/tests/sewing/tol_100/T5
index 7c3b84d905..becbc0d3a2 100644
--- a/tests/sewing/tol_100/T5
+++ b/tests/sewing/tol_100/T5
@@ -1 +1 @@
-restore CTO900_pro8934a.rle a
+restore [locate_data_file CTO900_pro8934a.rle] a
diff --git a/tests/sewing/tol_100/T6 b/tests/sewing/tol_100/T6
index 1f1cdd27e9..0592537508 100644
--- a/tests/sewing/tol_100/T6
+++ b/tests/sewing/tol_100/T6
@@ -1 +1 @@
-restore CTO900_pro8934b.rle a
+restore [locate_data_file CTO900_pro8934b.rle] a
diff --git a/tests/sewing/tol_100/T7 b/tests/sewing/tol_100/T7
index 5fc9bf2199..34dffb3cd4 100644
--- a/tests/sewing/tol_100/T7
+++ b/tests/sewing/tol_100/T7
@@ -1 +1 @@
-restore CTO900_pro8951a.rle a
+restore [locate_data_file CTO900_pro8951a.rle] a
diff --git a/tests/sewing/tol_100/T8 b/tests/sewing/tol_100/T8
index 58a2364938..0970eaa0f5 100644
--- a/tests/sewing/tol_100/T8
+++ b/tests/sewing/tol_100/T8
@@ -1 +1 @@
-restore ma-test3.rle a
+restore [locate_data_file ma-test3.rle] a
diff --git a/tests/sewing/tol_100/T9 b/tests/sewing/tol_100/T9
index 807be3edd2..a111b07ac4 100644
--- a/tests/sewing/tol_100/T9
+++ b/tests/sewing/tol_100/T9
@@ -1 +1 @@
-restore CTO900_pro8951c.rle a
+restore [locate_data_file CTO900_pro8951c.rle] a
diff --git a/tests/sewing/tol_100/U1 b/tests/sewing/tol_100/U1
index 3f3d076d14..644f2c193a 100644
--- a/tests/sewing/tol_100/U1
+++ b/tests/sewing/tol_100/U1
@@ -1 +1 @@
-restore ma-test5.rle a
+restore [locate_data_file ma-test5.rle] a
diff --git a/tests/sewing/tol_100/U2 b/tests/sewing/tol_100/U2
index 6bf4b0b3f1..3d2254b83c 100644
--- a/tests/sewing/tol_100/U2
+++ b/tests/sewing/tol_100/U2
@@ -1 +1 @@
-restore support-fixed.rle a
+restore [locate_data_file support-fixed.rle] a
diff --git a/tests/sewing/tol_100/U3 b/tests/sewing/tol_100/U3
index f493528922..652fabc185 100644
--- a/tests/sewing/tol_100/U3
+++ b/tests/sewing/tol_100/U3
@@ -1 +1 @@
-restore CTO900_pro9476-part.rle a
+restore [locate_data_file CTO900_pro9476-part.rle] a
diff --git a/tests/sewing/tol_100/U4 b/tests/sewing/tol_100/U4
index 6af60fa84a..73c75890bc 100644
--- a/tests/sewing/tol_100/U4
+++ b/tests/sewing/tol_100/U4
@@ -1 +1 @@
-restore CTO900_pro9476-tool.rle a
+restore [locate_data_file CTO900_pro9476-tool.rle] a
diff --git a/tests/sewing/tol_100/U5 b/tests/sewing/tol_100/U5
index 780a39977a..26c17a3f51 100644
--- a/tests/sewing/tol_100/U5
+++ b/tests/sewing/tol_100/U5
@@ -1 +1 @@
-restore CTO901_cts20138_base.rle a
+restore [locate_data_file CTO901_cts20138_base.rle] a
diff --git a/tests/sewing/tol_100/U6 b/tests/sewing/tol_100/U6
index 6cd7ff414e..15e8581432 100644
--- a/tests/sewing/tol_100/U6
+++ b/tests/sewing/tol_100/U6
@@ -1 +1 @@
-restore CTO901_cts20138_outil.rle a
+restore [locate_data_file CTO901_cts20138_outil.rle] a
diff --git a/tests/sewing/tol_100/U7 b/tests/sewing/tol_100/U7
index 9d33cee013..38a1a82316 100644
--- a/tests/sewing/tol_100/U7
+++ b/tests/sewing/tol_100/U7
@@ -1 +1 @@
-restore CTO901_cts20150_base.rle a
+restore [locate_data_file CTO901_cts20150_base.rle] a
diff --git a/tests/sewing/tol_100/U8 b/tests/sewing/tol_100/U8
index f3d1eda40a..bd74df0eaa 100644
--- a/tests/sewing/tol_100/U8
+++ b/tests/sewing/tol_100/U8
@@ -1 +1 @@
-restore CTO901_cts20150_outil.rle a
+restore [locate_data_file CTO901_cts20150_outil.rle] a
diff --git a/tests/sewing/tol_100/U9 b/tests/sewing/tol_100/U9
index 1d81f99f2b..9781fff712 100644
--- a/tests/sewing/tol_100/U9
+++ b/tests/sewing/tol_100/U9
@@ -1 +1 @@
-restore CTO901_cts20171_base.rle a
+restore [locate_data_file CTO901_cts20171_base.rle] a
diff --git a/tests/sewing/tol_100/V1 b/tests/sewing/tol_100/V1
index d0533fda8b..0401c96e04 100644
--- a/tests/sewing/tol_100/V1
+++ b/tests/sewing/tol_100/V1
@@ -1 +1 @@
-restore CTO901_cts20171_outil.rle a
+restore [locate_data_file CTO901_cts20171_outil.rle] a
diff --git a/tests/sewing/tol_100/V2 b/tests/sewing/tol_100/V2
index ea8d6f89e2..0620ed030f 100644
--- a/tests/sewing/tol_100/V2
+++ b/tests/sewing/tol_100/V2
@@ -1 +1 @@
-restore CTO901_cts20172_base.rle a
+restore [locate_data_file CTO901_cts20172_base.rle] a
diff --git a/tests/sewing/tol_100/V3 b/tests/sewing/tol_100/V3
index 3f96345bcc..4ffb0319f8 100644
--- a/tests/sewing/tol_100/V3
+++ b/tests/sewing/tol_100/V3
@@ -1 +1 @@
-restore CTO901_cts20203_base.rle a
+restore [locate_data_file CTO901_cts20203_base.rle] a
diff --git a/tests/sewing/tol_100/V4 b/tests/sewing/tol_100/V4
index b4ab72d945..30d4b5ce1c 100644
--- a/tests/sewing/tol_100/V4
+++ b/tests/sewing/tol_100/V4
@@ -1 +1 @@
-restore CTO901_cts20203_outil.rle a
+restore [locate_data_file CTO901_cts20203_outil.rle] a
diff --git a/tests/sewing/tol_100/V5 b/tests/sewing/tol_100/V5
index f0f4dc15e3..83b778dbf2 100644
--- a/tests/sewing/tol_100/V5
+++ b/tests/sewing/tol_100/V5
@@ -1 +1 @@
-restore CTO901_cts20204_base.rle a
+restore [locate_data_file CTO901_cts20204_base.rle] a
diff --git a/tests/sewing/tol_100/V6 b/tests/sewing/tol_100/V6
index 6df2eba14f..6e6efe3b0a 100644
--- a/tests/sewing/tol_100/V6
+++ b/tests/sewing/tol_100/V6
@@ -1 +1 @@
-restore CTO901_cts20204_outil.rle a
+restore [locate_data_file CTO901_cts20204_outil.rle] a
diff --git a/tests/sewing/tol_100/V7 b/tests/sewing/tol_100/V7
index 2a0159aced..5220e40235 100644
--- a/tests/sewing/tol_100/V7
+++ b/tests/sewing/tol_100/V7
@@ -1 +1 @@
-restore CTO901_cts20205-base.rle a
+restore [locate_data_file CTO901_cts20205-base.rle] a
diff --git a/tests/sewing/tol_100/V8 b/tests/sewing/tol_100/V8
index 6aeb2ce306..51561a2e11 100644
--- a/tests/sewing/tol_100/V8
+++ b/tests/sewing/tol_100/V8
@@ -1 +1 @@
-restore CTO901_cts20205-outil.rle a
+restore [locate_data_file CTO901_cts20205-outil.rle] a
diff --git a/tests/sewing/tol_100/V9 b/tests/sewing/tol_100/V9
index b61af86a2b..caa5ac49e8 100644
--- a/tests/sewing/tol_100/V9
+++ b/tests/sewing/tol_100/V9
@@ -1 +1 @@
-restore CTO901_cts20216_base.rle a
+restore [locate_data_file CTO901_cts20216_base.rle] a
diff --git a/tests/sewing/tol_100/W1 b/tests/sewing/tol_100/W1
index 1514152d81..ea7f9f9017 100644
--- a/tests/sewing/tol_100/W1
+++ b/tests/sewing/tol_100/W1
@@ -1 +1 @@
-restore CTO904_cts20077a.rle a
+restore [locate_data_file CTO904_cts20077a.rle] a
diff --git a/tests/sewing/tol_100/W2 b/tests/sewing/tol_100/W2
index 46fe43ab9a..3e0b6698db 100644
--- a/tests/sewing/tol_100/W2
+++ b/tests/sewing/tol_100/W2
@@ -1 +1 @@
-restore CTO904_cts20088a.rle a
+restore [locate_data_file CTO904_cts20088a.rle] a
diff --git a/tests/sewing/tol_100/W3 b/tests/sewing/tol_100/W3
index 7c15592997..21c0a4b78f 100644
--- a/tests/sewing/tol_100/W3
+++ b/tests/sewing/tol_100/W3
@@ -1 +1 @@
-restore CTO904_cts20088b.rle a
+restore [locate_data_file CTO904_cts20088b.rle] a
diff --git a/tests/sewing/tol_100/W4 b/tests/sewing/tol_100/W4
index c015fb8c30..001b9d84fe 100644
--- a/tests/sewing/tol_100/W4
+++ b/tests/sewing/tol_100/W4
@@ -1 +1 @@
-restore CTO904_cts20148a.rle a
+restore [locate_data_file CTO904_cts20148a.rle] a
diff --git a/tests/sewing/tol_100/W5 b/tests/sewing/tol_100/W5
index 7c6d79230a..11a2dacc8a 100644
--- a/tests/sewing/tol_100/W5
+++ b/tests/sewing/tol_100/W5
@@ -1 +1 @@
-restore CTO904_cts20148b.rle a
+restore [locate_data_file CTO904_cts20148b.rle] a
diff --git a/tests/sewing/tol_100/W6 b/tests/sewing/tol_100/W6
index fb5b6f3d37..ba77e445ed 100644
--- a/tests/sewing/tol_100/W6
+++ b/tests/sewing/tol_100/W6
@@ -1 +1 @@
-restore CTO904_cts20176a.rle a
+restore [locate_data_file CTO904_cts20176a.rle] a
diff --git a/tests/sewing/tol_100/W7 b/tests/sewing/tol_100/W7
index 1d34c75587..bb7c99db3d 100644
--- a/tests/sewing/tol_100/W7
+++ b/tests/sewing/tol_100/W7
@@ -1 +1 @@
-restore CTO904_cts20280a.rle a
+restore [locate_data_file CTO904_cts20280a.rle] a
diff --git a/tests/sewing/tol_100/W8 b/tests/sewing/tol_100/W8
index 098225a87d..0873c0bf9f 100644
--- a/tests/sewing/tol_100/W8
+++ b/tests/sewing/tol_100/W8
@@ -1 +1 @@
-restore CTO904_cts20280b.rle a
+restore [locate_data_file CTO904_cts20280b.rle] a
diff --git a/tests/sewing/tol_100/W9 b/tests/sewing/tol_100/W9
index c2f1f7f1e3..af860a4650 100644
--- a/tests/sewing/tol_100/W9
+++ b/tests/sewing/tol_100/W9
@@ -1 +1 @@
-restore CTO904_cts20290a.rle a
+restore [locate_data_file CTO904_cts20290a.rle] a
diff --git a/tests/sewing/tol_100/X1 b/tests/sewing/tol_100/X1
index f4b2d5da4e..a654d96872 100644
--- a/tests/sewing/tol_100/X1
+++ b/tests/sewing/tol_100/X1
@@ -1 +1 @@
-restore CTO904_cts20974a.rle a
+restore [locate_data_file CTO904_cts20974a.rle] a
diff --git a/tests/sewing/tol_100/X2 b/tests/sewing/tol_100/X2
index c4f83b39f9..dbe72796c9 100644
--- a/tests/sewing/tol_100/X2
+++ b/tests/sewing/tol_100/X2
@@ -1 +1 @@
-restore support.rle a
+restore [locate_data_file support.rle] a
diff --git a/tests/sewing/tol_100/X3 b/tests/sewing/tol_100/X3
index dbbd98849c..a38afd788b 100644
--- a/tests/sewing/tol_100/X3
+++ b/tests/sewing/tol_100/X3
@@ -1 +1 @@
-restore CTO904_cts21364a.rle a
+restore [locate_data_file CTO904_cts21364a.rle] a
diff --git a/tests/sewing/tol_100/X4 b/tests/sewing/tol_100/X4
index 47ad7a2bfd..e1abed8c40 100644
--- a/tests/sewing/tol_100/X4
+++ b/tests/sewing/tol_100/X4
@@ -1 +1 @@
-restore CTO904_fra61199a.rle a
+restore [locate_data_file CTO904_fra61199a.rle] a
diff --git a/tests/sewing/tol_100/X5 b/tests/sewing/tol_100/X5
index dc947f724f..9f3db5f563 100644
--- a/tests/sewing/tol_100/X5
+++ b/tests/sewing/tol_100/X5
@@ -1 +1 @@
-restore CTO904_fra61199b.rle a
+restore [locate_data_file CTO904_fra61199b.rle] a
diff --git a/tests/sewing/tol_100/X6 b/tests/sewing/tol_100/X6
index cf68f0a496..a895b60861 100644
--- a/tests/sewing/tol_100/X6
+++ b/tests/sewing/tol_100/X6
@@ -1 +1 @@
-restore CTO904_ger60038.rle a
+restore [locate_data_file CTO904_ger60038.rle] a
diff --git a/tests/sewing/tol_100/X7 b/tests/sewing/tol_100/X7
index 33a4180a01..7a7eea7adc 100644
--- a/tests/sewing/tol_100/X7
+++ b/tests/sewing/tol_100/X7
@@ -1 +1 @@
-restore CTO904_ger60224a.rle a
+restore [locate_data_file CTO904_ger60224a.rle] a
diff --git a/tests/sewing/tol_100/X8 b/tests/sewing/tol_100/X8
index 8d94a73b1e..655a544394 100644
--- a/tests/sewing/tol_100/X8
+++ b/tests/sewing/tol_100/X8
@@ -1 +1 @@
-restore CTO904_hkg60150a.rle a
+restore [locate_data_file CTO904_hkg60150a.rle] a
diff --git a/tests/sewing/tol_100/X9 b/tests/sewing/tol_100/X9
index 2f3aaadf3d..44dcbae226 100644
--- a/tests/sewing/tol_100/X9
+++ b/tests/sewing/tol_100/X9
@@ -1 +1 @@
-restore CTO904_hkg60150b.rle a
+restore [locate_data_file CTO904_hkg60150b.rle] a
diff --git a/tests/sewing/tol_100/Y1 b/tests/sewing/tol_100/Y1
index b823e5df9b..43a646d319 100644
--- a/tests/sewing/tol_100/Y1
+++ b/tests/sewing/tol_100/Y1
@@ -1 +1 @@
-restore CTO904_hkg60155a.rle a
+restore [locate_data_file CTO904_hkg60155a.rle] a
diff --git a/tests/sewing/tol_100/Y2 b/tests/sewing/tol_100/Y2
index 16f57d4edf..ff756e88ba 100644
--- a/tests/sewing/tol_100/Y2
+++ b/tests/sewing/tol_100/Y2
@@ -1 +1 @@
-restore CTO904_hkg60155b.rle a
+restore [locate_data_file CTO904_hkg60155b.rle] a
diff --git a/tests/sewing/tol_100/Y3 b/tests/sewing/tol_100/Y3
index 84c631707e..fd30f76a83 100644
--- a/tests/sewing/tol_100/Y3
+++ b/tests/sewing/tol_100/Y3
@@ -1 +1 @@
-restore CTO904_hkg60156a.rle a
+restore [locate_data_file CTO904_hkg60156a.rle] a
diff --git a/tests/sewing/tol_100/Y4 b/tests/sewing/tol_100/Y4
index 3a625b3be5..882eeee2ec 100644
--- a/tests/sewing/tol_100/Y4
+++ b/tests/sewing/tol_100/Y4
@@ -1 +1 @@
-restore CTO904_hkg60156b.rle a
+restore [locate_data_file CTO904_hkg60156b.rle] a
diff --git a/tests/sewing/tol_100/Y5 b/tests/sewing/tol_100/Y5
index 7acd2c8b5c..e7e649737d 100644
--- a/tests/sewing/tol_100/Y5
+++ b/tests/sewing/tol_100/Y5
@@ -1 +1 @@
-restore CTO904_hkg60206.rle a
+restore [locate_data_file CTO904_hkg60206.rle] a
diff --git a/tests/sewing/tol_100/Y6 b/tests/sewing/tol_100/Y6
index 86da2b2a77..0af71ec8a9 100644
--- a/tests/sewing/tol_100/Y6
+++ b/tests/sewing/tol_100/Y6
@@ -1 +1 @@
-restore CTO904_pro10095a.rle a
+restore [locate_data_file CTO904_pro10095a.rle] a
diff --git a/tests/sewing/tol_100/Y7 b/tests/sewing/tol_100/Y7
index 9bd1edda00..fbbd96edf8 100644
--- a/tests/sewing/tol_100/Y7
+++ b/tests/sewing/tol_100/Y7
@@ -1 +1 @@
-restore CTO904_pro10095b.rle a
+restore [locate_data_file CTO904_pro10095b.rle] a
diff --git a/tests/sewing/tol_100/Y9 b/tests/sewing/tol_100/Y9
index fa8859d197..0214caaa95 100644
--- a/tests/sewing/tol_100/Y9
+++ b/tests/sewing/tol_100/Y9
@@ -1 +1 @@
-restore CTO904_pro11615b.rle a
+restore [locate_data_file CTO904_pro11615b.rle] a
diff --git a/tests/sewing/tol_100/Z1 b/tests/sewing/tol_100/Z1
index cbfd35cc43..4e68f427a2 100644
--- a/tests/sewing/tol_100/Z1
+++ b/tests/sewing/tol_100/Z1
@@ -1 +1 @@
-restore CTO904_pro12852a.rle a
+restore [locate_data_file CTO904_pro12852a.rle] a
diff --git a/tests/sewing/tol_100/Z2 b/tests/sewing/tol_100/Z2
index 584ad52c33..a746cb3c11 100644
--- a/tests/sewing/tol_100/Z2
+++ b/tests/sewing/tol_100/Z2
@@ -1 +1 @@
-restore CTO904_pro12852b.rle a
+restore [locate_data_file CTO904_pro12852b.rle] a
diff --git a/tests/sewing/tol_100/Z3 b/tests/sewing/tol_100/Z3
index 3953b522f5..c4eb1fd249 100644
--- a/tests/sewing/tol_100/Z3
+++ b/tests/sewing/tol_100/Z3
@@ -1 +1 @@
-restore CTO904_pro12859a.rle a
+restore [locate_data_file CTO904_pro12859a.rle] a
diff --git a/tests/sewing/tol_100/Z4 b/tests/sewing/tol_100/Z4
index 06baa4e9e9..8565ea75bd 100644
--- a/tests/sewing/tol_100/Z4
+++ b/tests/sewing/tol_100/Z4
@@ -1 +1 @@
-restore CTO904_pro12859b.rle a
+restore [locate_data_file CTO904_pro12859b.rle] a
diff --git a/tests/sewing/tol_100/Z5 b/tests/sewing/tol_100/Z5
index 63e6430414..7031562d92 100644
--- a/tests/sewing/tol_100/Z5
+++ b/tests/sewing/tol_100/Z5
@@ -1 +1 @@
-restore CTO904_pro12875a.rle a
+restore [locate_data_file CTO904_pro12875a.rle] a
diff --git a/tests/sewing/tol_100/Z6 b/tests/sewing/tol_100/Z6
index 2c7ba3cdeb..e04ac78bb7 100644
--- a/tests/sewing/tol_100/Z6
+++ b/tests/sewing/tol_100/Z6
@@ -1 +1 @@
-restore CTO904_pro12875b.rle a
+restore [locate_data_file CTO904_pro12875b.rle] a
diff --git a/tests/sewing/tol_100/Z7 b/tests/sewing/tol_100/Z7
index 0a3f3fc622..879598aed1 100644
--- a/tests/sewing/tol_100/Z7
+++ b/tests/sewing/tol_100/Z7
@@ -1 +1 @@
-restore CTO904_pro12956b.rle a
+restore [locate_data_file CTO904_pro12956b.rle] a
diff --git a/tests/sewing/tol_100/Z8 b/tests/sewing/tol_100/Z8
index 752a3e9722..29249ce1d3 100644
--- a/tests/sewing/tol_100/Z8
+++ b/tests/sewing/tol_100/Z8
@@ -1 +1 @@
-restore CTO904_pro13555a.rle a
+restore [locate_data_file CTO904_pro13555a.rle] a
diff --git a/tests/thrusection/begin b/tests/thrusection/begin
index 6d2368a579..f49fc763cd 100644
--- a/tests/thrusection/begin
+++ b/tests/thrusection/begin
@@ -4,10 +4,6 @@ if { [array get Draw_Groups "TOPOLOGY Check commands"] == "" } {
 # To prevent loops limit to 10 minutes
 cpulimit 600
 
-if {[string compare [datadir] "."] == 0} { 
-   datadir [file dirname [info script]]/data
-}
-
 if { [info exists imagedir] == 0 } {
    set imagedir .
 }
diff --git a/tests/thrusection/not_solids/A1 b/tests/thrusection/not_solids/A1
old mode 100755
new mode 100644
index 9c6ca6775a..389288d9ca
--- a/tests/thrusection/not_solids/A1
+++ b/tests/thrusection/not_solids/A1
@@ -1,5 +1,5 @@
-restore D1 w1
-restore D1 w2
+restore [locate_data_file D1] w1
+restore [locate_data_file D1] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 200
diff --git a/tests/thrusection/not_solids/A2 b/tests/thrusection/not_solids/A2
old mode 100755
new mode 100644
index d45afe2455..95365eafc8
--- a/tests/thrusection/not_solids/A2
+++ b/tests/thrusection/not_solids/A2
@@ -1,5 +1,5 @@
-restore D1 w1
-restore D2 w2
+restore [locate_data_file D1] w1
+restore [locate_data_file D2] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 211.603
diff --git a/tests/thrusection/not_solids/A3 b/tests/thrusection/not_solids/A3
old mode 100755
new mode 100644
index 1d31768003..131dc8886a
--- a/tests/thrusection/not_solids/A3
+++ b/tests/thrusection/not_solids/A3
@@ -1,5 +1,5 @@
-restore D1 w1
-restore D3 w2
+restore [locate_data_file D1] w1
+restore [locate_data_file D3] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 250
diff --git a/tests/thrusection/not_solids/A4 b/tests/thrusection/not_solids/A4
old mode 100755
new mode 100644
index 2d7d9a8592..506ee64428
--- a/tests/thrusection/not_solids/A4
+++ b/tests/thrusection/not_solids/A4
@@ -1,5 +1,5 @@
-restore D1 w1
-restore D4 w2
+restore [locate_data_file D1] w1
+restore [locate_data_file D4] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 200
diff --git a/tests/thrusection/not_solids/A5 b/tests/thrusection/not_solids/A5
old mode 100755
new mode 100644
index 491b75eabc..37af5916d5
--- a/tests/thrusection/not_solids/A5
+++ b/tests/thrusection/not_solids/A5
@@ -1,5 +1,5 @@
-restore D1 w1
-restore D5 w2
+restore [locate_data_file D1] w1
+restore [locate_data_file D5] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 211.603
diff --git a/tests/thrusection/not_solids/A6 b/tests/thrusection/not_solids/A6
old mode 100755
new mode 100644
index 2c524e6046..45e2bbd2f8
--- a/tests/thrusection/not_solids/A6
+++ b/tests/thrusection/not_solids/A6
@@ -1,5 +1,5 @@
-restore D1 w1
-restore D6 w2
+restore [locate_data_file D1] w1
+restore [locate_data_file D6] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 250
diff --git a/tests/thrusection/not_solids/A7 b/tests/thrusection/not_solids/A7
old mode 100755
new mode 100644
index 08cda76139..6d78a6fa32
--- a/tests/thrusection/not_solids/A7
+++ b/tests/thrusection/not_solids/A7
@@ -1,5 +1,5 @@
-restore D2 w1
-restore D1 w2
+restore [locate_data_file D2] w1
+restore [locate_data_file D1] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 161.603
diff --git a/tests/thrusection/not_solids/A8 b/tests/thrusection/not_solids/A8
old mode 100755
new mode 100644
index 1fcbb21379..377e4f0897
--- a/tests/thrusection/not_solids/A8
+++ b/tests/thrusection/not_solids/A8
@@ -1,5 +1,5 @@
-restore D2 w1
-restore D2 w2
+restore [locate_data_file D2] w1
+restore [locate_data_file D2] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 173.205
diff --git a/tests/thrusection/not_solids/A9 b/tests/thrusection/not_solids/A9
old mode 100755
new mode 100644
index 5988ac5cf4..ab87b5ec9e
--- a/tests/thrusection/not_solids/A9
+++ b/tests/thrusection/not_solids/A9
@@ -1,5 +1,5 @@
-restore D2 w1
-restore D3 w2
+restore [locate_data_file D2] w1
+restore [locate_data_file D3] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 199.103
diff --git a/tests/thrusection/not_solids/B1 b/tests/thrusection/not_solids/B1
old mode 100755
new mode 100644
index 5857628807..56d413b732
--- a/tests/thrusection/not_solids/B1
+++ b/tests/thrusection/not_solids/B1
@@ -1,5 +1,5 @@
-restore D2 w1
-restore D4 w2
+restore [locate_data_file D2] w1
+restore [locate_data_file D4] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 161.603
diff --git a/tests/thrusection/not_solids/B2 b/tests/thrusection/not_solids/B2
old mode 100755
new mode 100644
index f4aa41fbf8..8f7f072de9
--- a/tests/thrusection/not_solids/B2
+++ b/tests/thrusection/not_solids/B2
@@ -1,5 +1,5 @@
-restore D2 w1
-restore D5 w2
+restore [locate_data_file D2] w1
+restore [locate_data_file D5] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 173.205
diff --git a/tests/thrusection/not_solids/B3 b/tests/thrusection/not_solids/B3
old mode 100755
new mode 100644
index ad3f4ae338..e9ff166061
--- a/tests/thrusection/not_solids/B3
+++ b/tests/thrusection/not_solids/B3
@@ -1,5 +1,5 @@
-restore D2 w1
-restore D6 w2
+restore [locate_data_file D2] w1
+restore [locate_data_file D6] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 199.103
diff --git a/tests/thrusection/not_solids/B4 b/tests/thrusection/not_solids/B4
old mode 100755
new mode 100644
index 59ba2f289a..dfa4f31bb5
--- a/tests/thrusection/not_solids/B4
+++ b/tests/thrusection/not_solids/B4
@@ -1,5 +1,5 @@
-restore D3 w1
-restore D1 w2
+restore [locate_data_file D3] w1
+restore [locate_data_file D1] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 250
diff --git a/tests/thrusection/not_solids/B5 b/tests/thrusection/not_solids/B5
old mode 100755
new mode 100644
index 5084227e3d..d27eb3acd5
--- a/tests/thrusection/not_solids/B5
+++ b/tests/thrusection/not_solids/B5
@@ -1,5 +1,5 @@
-restore D3 w1
-restore D2 w2
+restore [locate_data_file D3] w1
+restore [locate_data_file D2] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 274.103
diff --git a/tests/thrusection/not_solids/B6 b/tests/thrusection/not_solids/B6
old mode 100755
new mode 100644
index ef3c8a209e..d142d0da64
--- a/tests/thrusection/not_solids/B6
+++ b/tests/thrusection/not_solids/B6
@@ -1,5 +1,5 @@
-restore D3 w1
-restore D3 w2
+restore [locate_data_file D3] w1
+restore [locate_data_file D3] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 300
diff --git a/tests/thrusection/not_solids/B7 b/tests/thrusection/not_solids/B7
old mode 100755
new mode 100644
index e9257d27f6..f36cecfeca
--- a/tests/thrusection/not_solids/B7
+++ b/tests/thrusection/not_solids/B7
@@ -1,5 +1,5 @@
-restore D3 w1
-restore D4 w2
+restore [locate_data_file D3] w1
+restore [locate_data_file D4] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 250
diff --git a/tests/thrusection/not_solids/B8 b/tests/thrusection/not_solids/B8
old mode 100755
new mode 100644
index 634890bfc9..88398b2ea2
--- a/tests/thrusection/not_solids/B8
+++ b/tests/thrusection/not_solids/B8
@@ -1,5 +1,5 @@
-restore D3 w1
-restore D5 w2
+restore [locate_data_file D3] w1
+restore [locate_data_file D5] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 274.103
diff --git a/tests/thrusection/not_solids/B9 b/tests/thrusection/not_solids/B9
old mode 100755
new mode 100644
index ed94dbb31e..53fe3ea200
--- a/tests/thrusection/not_solids/B9
+++ b/tests/thrusection/not_solids/B9
@@ -1,5 +1,5 @@
-restore D3 w1
-restore D6 w2
+restore [locate_data_file D3] w1
+restore [locate_data_file D6] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 300
diff --git a/tests/thrusection/not_solids/C1 b/tests/thrusection/not_solids/C1
old mode 100755
new mode 100644
index 1cf2e828e1..1a3d8f1c33
--- a/tests/thrusection/not_solids/C1
+++ b/tests/thrusection/not_solids/C1
@@ -1,5 +1,5 @@
-restore D4 w1
-restore D1 w2
+restore [locate_data_file D4] w1
+restore [locate_data_file D1] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 200
diff --git a/tests/thrusection/not_solids/C2 b/tests/thrusection/not_solids/C2
old mode 100755
new mode 100644
index ddbb3c38e7..e38be68216
--- a/tests/thrusection/not_solids/C2
+++ b/tests/thrusection/not_solids/C2
@@ -1,5 +1,5 @@
-restore D4 w1
-restore D2 w2
+restore [locate_data_file D4] w1
+restore [locate_data_file D2] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 211.603
diff --git a/tests/thrusection/not_solids/C3 b/tests/thrusection/not_solids/C3
old mode 100755
new mode 100644
index 644c53f75a..a810e774fa
--- a/tests/thrusection/not_solids/C3
+++ b/tests/thrusection/not_solids/C3
@@ -1,5 +1,5 @@
-restore D4 w1
-restore D3 w2
+restore [locate_data_file D4] w1
+restore [locate_data_file D3] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 250
diff --git a/tests/thrusection/not_solids/C4 b/tests/thrusection/not_solids/C4
old mode 100755
new mode 100644
index 923f065f11..2bdae604ae
--- a/tests/thrusection/not_solids/C4
+++ b/tests/thrusection/not_solids/C4
@@ -1,5 +1,5 @@
-restore D4 w1
-restore D4 w2
+restore [locate_data_file D4] w1
+restore [locate_data_file D4] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 200
diff --git a/tests/thrusection/not_solids/C5 b/tests/thrusection/not_solids/C5
old mode 100755
new mode 100644
index 7ce10f206c..828a3deec6
--- a/tests/thrusection/not_solids/C5
+++ b/tests/thrusection/not_solids/C5
@@ -1,5 +1,5 @@
-restore D4 w1
-restore D5 w2
+restore [locate_data_file D4] w1
+restore [locate_data_file D5] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 211.603
diff --git a/tests/thrusection/not_solids/C6 b/tests/thrusection/not_solids/C6
old mode 100755
new mode 100644
index 3637ab8f06..65871ac9cd
--- a/tests/thrusection/not_solids/C6
+++ b/tests/thrusection/not_solids/C6
@@ -1,5 +1,5 @@
-restore D4 w1
-restore D6 w2
+restore [locate_data_file D4] w1
+restore [locate_data_file D6] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 250
diff --git a/tests/thrusection/not_solids/C7 b/tests/thrusection/not_solids/C7
old mode 100755
new mode 100644
index f6b2338e36..1220a85acd
--- a/tests/thrusection/not_solids/C7
+++ b/tests/thrusection/not_solids/C7
@@ -1,5 +1,5 @@
-restore D5 w1
-restore D1 w2
+restore [locate_data_file D5] w1
+restore [locate_data_file D1] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 161.603
diff --git a/tests/thrusection/not_solids/C8 b/tests/thrusection/not_solids/C8
old mode 100755
new mode 100644
index 0d4509a4e6..8e17459523
--- a/tests/thrusection/not_solids/C8
+++ b/tests/thrusection/not_solids/C8
@@ -1,5 +1,5 @@
-restore D5 w1
-restore D2 w2
+restore [locate_data_file D5] w1
+restore [locate_data_file D2] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 173.205
diff --git a/tests/thrusection/not_solids/C9 b/tests/thrusection/not_solids/C9
old mode 100755
new mode 100644
index 13aa836524..00b9961409
--- a/tests/thrusection/not_solids/C9
+++ b/tests/thrusection/not_solids/C9
@@ -1,5 +1,5 @@
-restore D5 w1
-restore D3 w2
+restore [locate_data_file D5] w1
+restore [locate_data_file D3] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 199.103
diff --git a/tests/thrusection/not_solids/D1 b/tests/thrusection/not_solids/D1
old mode 100755
new mode 100644
index 89cb3c1841..2933f34304
--- a/tests/thrusection/not_solids/D1
+++ b/tests/thrusection/not_solids/D1
@@ -1,5 +1,5 @@
-restore D5 w1
-restore D4 w2
+restore [locate_data_file D5] w1
+restore [locate_data_file D4] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 161.603
diff --git a/tests/thrusection/not_solids/D2 b/tests/thrusection/not_solids/D2
old mode 100755
new mode 100644
index 70018ce156..b5042e21ad
--- a/tests/thrusection/not_solids/D2
+++ b/tests/thrusection/not_solids/D2
@@ -1,5 +1,5 @@
-restore D5 w1
-restore D5 w2
+restore [locate_data_file D5] w1
+restore [locate_data_file D5] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 173.205
diff --git a/tests/thrusection/not_solids/D3 b/tests/thrusection/not_solids/D3
old mode 100755
new mode 100644
index 6158eda430..c67e0ad73d
--- a/tests/thrusection/not_solids/D3
+++ b/tests/thrusection/not_solids/D3
@@ -1,5 +1,5 @@
-restore D5 w1
-restore D6 w2
+restore [locate_data_file D5] w1
+restore [locate_data_file D6] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 199.103
diff --git a/tests/thrusection/not_solids/D4 b/tests/thrusection/not_solids/D4
old mode 100755
new mode 100644
index 7f710ac503..5ecf13eb38
--- a/tests/thrusection/not_solids/D4
+++ b/tests/thrusection/not_solids/D4
@@ -1,5 +1,5 @@
-restore D6 w1
-restore D1 w2
+restore [locate_data_file D6] w1
+restore [locate_data_file D1] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 250
diff --git a/tests/thrusection/not_solids/D5 b/tests/thrusection/not_solids/D5
old mode 100755
new mode 100644
index 3eb709a0d2..d016b42fbf
--- a/tests/thrusection/not_solids/D5
+++ b/tests/thrusection/not_solids/D5
@@ -1,5 +1,5 @@
-restore D6 w1
-restore D2 w2
+restore [locate_data_file D6] w1
+restore [locate_data_file D2] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 274.103
diff --git a/tests/thrusection/not_solids/D6 b/tests/thrusection/not_solids/D6
old mode 100755
new mode 100644
index 4551059cb0..d2d09c7a8b
--- a/tests/thrusection/not_solids/D6
+++ b/tests/thrusection/not_solids/D6
@@ -1,5 +1,5 @@
-restore D6 w1
-restore D3 w2
+restore [locate_data_file D6] w1
+restore [locate_data_file D3] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 300
diff --git a/tests/thrusection/not_solids/D7 b/tests/thrusection/not_solids/D7
old mode 100755
new mode 100644
index 36bf370793..4dff5068cd
--- a/tests/thrusection/not_solids/D7
+++ b/tests/thrusection/not_solids/D7
@@ -1,5 +1,5 @@
-restore D6 w1
-restore D4 w2
+restore [locate_data_file D6] w1
+restore [locate_data_file D4] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 250
diff --git a/tests/thrusection/not_solids/D8 b/tests/thrusection/not_solids/D8
old mode 100755
new mode 100644
index afe56cfe72..9887c9ed06
--- a/tests/thrusection/not_solids/D8
+++ b/tests/thrusection/not_solids/D8
@@ -1,5 +1,5 @@
-restore D6 w1
-restore D5 w2
+restore [locate_data_file D6] w1
+restore [locate_data_file D5] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 274.103
diff --git a/tests/thrusection/not_solids/D9 b/tests/thrusection/not_solids/D9
old mode 100755
new mode 100644
index 5c93277da5..f110afd040
--- a/tests/thrusection/not_solids/D9
+++ b/tests/thrusection/not_solids/D9
@@ -1,5 +1,5 @@
-restore D6 w1
-restore D6 w2
+restore [locate_data_file D6] w1
+restore [locate_data_file D6] w2
 ttranslate w2 0 20 0
 thrusections result 0 0 w1 w2
 set square 300
diff --git a/tests/thrusection/not_solids/E1 b/tests/thrusection/not_solids/E1
old mode 100755
new mode 100644
index d93091859b..3544b60497
--- a/tests/thrusection/not_solids/E1
+++ b/tests/thrusection/not_solids/E1
@@ -1,5 +1,5 @@
-restore C1 w1
-restore C1 w2
+restore [locate_data_file C1] w1
+restore [locate_data_file C1] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2513.27
diff --git a/tests/thrusection/not_solids/E2 b/tests/thrusection/not_solids/E2
old mode 100755
new mode 100644
index 14155957e9..ca8f9b9ff7
--- a/tests/thrusection/not_solids/E2
+++ b/tests/thrusection/not_solids/E2
@@ -1,5 +1,5 @@
-restore C1 w1
-restore C2 w2
+restore [locate_data_file C1] w1
+restore [locate_data_file C2] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2513.27
diff --git a/tests/thrusection/not_solids/E3 b/tests/thrusection/not_solids/E3
old mode 100755
new mode 100644
index 82b41565ae..7b9b907810
--- a/tests/thrusection/not_solids/E3
+++ b/tests/thrusection/not_solids/E3
@@ -1,5 +1,5 @@
-restore C1 w1
-restore C3 w2
+restore [locate_data_file C1] w1
+restore [locate_data_file C3] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2196.82
diff --git a/tests/thrusection/not_solids/E4 b/tests/thrusection/not_solids/E4
old mode 100755
new mode 100644
index 42947778cc..dd9601933f
--- a/tests/thrusection/not_solids/E4
+++ b/tests/thrusection/not_solids/E4
@@ -1,5 +1,5 @@
-restore C1 w1
-restore C4 w2
+restore [locate_data_file C1] w1
+restore [locate_data_file C4] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2513.27
diff --git a/tests/thrusection/not_solids/E5 b/tests/thrusection/not_solids/E5
old mode 100755
new mode 100644
index 295bfb7f6b..b1e4820e20
--- a/tests/thrusection/not_solids/E5
+++ b/tests/thrusection/not_solids/E5
@@ -1,5 +1,5 @@
-restore C1 w1
-restore C5 w2
+restore [locate_data_file C1] w1
+restore [locate_data_file C5] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2513.27
diff --git a/tests/thrusection/not_solids/E6 b/tests/thrusection/not_solids/E6
old mode 100755
new mode 100644
index b79b907c2b..9c5ffe400f
--- a/tests/thrusection/not_solids/E6
+++ b/tests/thrusection/not_solids/E6
@@ -1,5 +1,5 @@
-restore C1 w1
-restore C6 w2
+restore [locate_data_file C1] w1
+restore [locate_data_file C6] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2196.82
diff --git a/tests/thrusection/not_solids/E7 b/tests/thrusection/not_solids/E7
old mode 100755
new mode 100644
index 58e40b0eba..4bb5bc5f32
--- a/tests/thrusection/not_solids/E7
+++ b/tests/thrusection/not_solids/E7
@@ -1,5 +1,5 @@
-restore C1 w1
-restore C7 w2
+restore [locate_data_file C1] w1
+restore [locate_data_file C7] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 
diff --git a/tests/thrusection/not_solids/E8 b/tests/thrusection/not_solids/E8
old mode 100755
new mode 100644
index 3a7188414b..b045860da4
--- a/tests/thrusection/not_solids/E8
+++ b/tests/thrusection/not_solids/E8
@@ -1,5 +1,5 @@
-restore C1 w1
-restore C8 w2
+restore [locate_data_file C1] w1
+restore [locate_data_file C8] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/E9 b/tests/thrusection/not_solids/E9
old mode 100755
new mode 100644
index 3b0b966f41..2983ac42ea
--- a/tests/thrusection/not_solids/E9
+++ b/tests/thrusection/not_solids/E9
@@ -1,5 +1,5 @@
-restore C1 w1
-restore C9 w2
+restore [locate_data_file C1] w1
+restore [locate_data_file C9] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1834.5
diff --git a/tests/thrusection/not_solids/F1 b/tests/thrusection/not_solids/F1
old mode 100755
new mode 100644
index fe78b9e027..3c017bd63a
--- a/tests/thrusection/not_solids/F1
+++ b/tests/thrusection/not_solids/F1
@@ -1,5 +1,5 @@
-restore C2 w1
-restore C1 w2
+restore [locate_data_file C2] w1
+restore [locate_data_file C1] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2513.27
diff --git a/tests/thrusection/not_solids/F2 b/tests/thrusection/not_solids/F2
old mode 100755
new mode 100644
index 83178b6770..d96e0d852b
--- a/tests/thrusection/not_solids/F2
+++ b/tests/thrusection/not_solids/F2
@@ -1,5 +1,5 @@
-restore C2 w1
-restore C2 w2
+restore [locate_data_file C2] w1
+restore [locate_data_file C2] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2513.27
diff --git a/tests/thrusection/not_solids/F3 b/tests/thrusection/not_solids/F3
old mode 100755
new mode 100644
index 6e588ead20..8757545a95
--- a/tests/thrusection/not_solids/F3
+++ b/tests/thrusection/not_solids/F3
@@ -1,5 +1,5 @@
-restore C2 w1
-restore C3 w2
+restore [locate_data_file C2] w1
+restore [locate_data_file C3] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2196.82
diff --git a/tests/thrusection/not_solids/F4 b/tests/thrusection/not_solids/F4
old mode 100755
new mode 100644
index 229efaad2e..112a8dcf49
--- a/tests/thrusection/not_solids/F4
+++ b/tests/thrusection/not_solids/F4
@@ -1,5 +1,5 @@
-restore C2 w1
-restore C4 w2
+restore [locate_data_file C2] w1
+restore [locate_data_file C4] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2513.27
diff --git a/tests/thrusection/not_solids/F5 b/tests/thrusection/not_solids/F5
old mode 100755
new mode 100644
index aaf397e118..b74cf23664
--- a/tests/thrusection/not_solids/F5
+++ b/tests/thrusection/not_solids/F5
@@ -1,5 +1,5 @@
-restore C2 w1
-restore C5 w2
+restore [locate_data_file C2] w1
+restore [locate_data_file C5] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2513.27
diff --git a/tests/thrusection/not_solids/F6 b/tests/thrusection/not_solids/F6
old mode 100755
new mode 100644
index 00c838d2be..f746ecf7c4
--- a/tests/thrusection/not_solids/F6
+++ b/tests/thrusection/not_solids/F6
@@ -1,5 +1,5 @@
-restore C2 w1
-restore C6 w2
+restore [locate_data_file C2] w1
+restore [locate_data_file C6] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2196.82
diff --git a/tests/thrusection/not_solids/F7 b/tests/thrusection/not_solids/F7
old mode 100755
new mode 100644
index 06549093a4..219a3d59b7
--- a/tests/thrusection/not_solids/F7
+++ b/tests/thrusection/not_solids/F7
@@ -1,5 +1,5 @@
-restore C2 w1
-restore C7 w2
+restore [locate_data_file C2] w1
+restore [locate_data_file C7] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/F8 b/tests/thrusection/not_solids/F8
old mode 100755
new mode 100644
index b9cf02e3ff..ba59d5dc6f
--- a/tests/thrusection/not_solids/F8
+++ b/tests/thrusection/not_solids/F8
@@ -1,5 +1,5 @@
-restore C2 w1
-restore C8 w2
+restore [locate_data_file C2] w1
+restore [locate_data_file C8] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/F9 b/tests/thrusection/not_solids/F9
old mode 100755
new mode 100644
index f7fa35a5db..1e5e46209b
--- a/tests/thrusection/not_solids/F9
+++ b/tests/thrusection/not_solids/F9
@@ -1,5 +1,5 @@
-restore C2 w1
-restore C9 w2
+restore [locate_data_file C2] w1
+restore [locate_data_file C9] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1834.5
diff --git a/tests/thrusection/not_solids/G1 b/tests/thrusection/not_solids/G1
old mode 100755
new mode 100644
index c966a4c742..a9d25c87e3
--- a/tests/thrusection/not_solids/G1
+++ b/tests/thrusection/not_solids/G1
@@ -1,5 +1,5 @@
-restore C3 w1
-restore C1 w2
+restore [locate_data_file C3] w1
+restore [locate_data_file C1] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2196.82
diff --git a/tests/thrusection/not_solids/G2 b/tests/thrusection/not_solids/G2
old mode 100755
new mode 100644
index 1cef145b56..0c91a6c6e7
--- a/tests/thrusection/not_solids/G2
+++ b/tests/thrusection/not_solids/G2
@@ -1,5 +1,5 @@
-restore C3 w1
-restore C2 w2
+restore [locate_data_file C3] w1
+restore [locate_data_file C2] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2196.82
diff --git a/tests/thrusection/not_solids/G3 b/tests/thrusection/not_solids/G3
old mode 100755
new mode 100644
index d24eabf9fa..bfca625e64
--- a/tests/thrusection/not_solids/G3
+++ b/tests/thrusection/not_solids/G3
@@ -1,5 +1,5 @@
-restore C3 w1
-restore C3 w2
+restore [locate_data_file C3] w1
+restore [locate_data_file C3] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1885.58
diff --git a/tests/thrusection/not_solids/G4 b/tests/thrusection/not_solids/G4
old mode 100755
new mode 100644
index 69ee0e27fd..e699b901cd
--- a/tests/thrusection/not_solids/G4
+++ b/tests/thrusection/not_solids/G4
@@ -1,5 +1,5 @@
-restore C3 w1
-restore C4 w2
+restore [locate_data_file C3] w1
+restore [locate_data_file C4] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2196.82
diff --git a/tests/thrusection/not_solids/G5 b/tests/thrusection/not_solids/G5
old mode 100755
new mode 100644
index fb70c4cdbc..2a8add7f21
--- a/tests/thrusection/not_solids/G5
+++ b/tests/thrusection/not_solids/G5
@@ -1,5 +1,5 @@
-restore C3 w1
-restore C5 w2
+restore [locate_data_file C3] w1
+restore [locate_data_file C5] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2196.82
diff --git a/tests/thrusection/not_solids/G6 b/tests/thrusection/not_solids/G6
old mode 100755
new mode 100644
index edcc6e7722..5e4f9eaf11
--- a/tests/thrusection/not_solids/G6
+++ b/tests/thrusection/not_solids/G6
@@ -1,5 +1,5 @@
-restore C3 w1
-restore C6 w2
+restore [locate_data_file C3] w1
+restore [locate_data_file C6] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1885.58
diff --git a/tests/thrusection/not_solids/G7 b/tests/thrusection/not_solids/G7
old mode 100755
new mode 100644
index 97a4f124eb..2eb98f8f61
--- a/tests/thrusection/not_solids/G7
+++ b/tests/thrusection/not_solids/G7
@@ -1,5 +1,5 @@
-restore C3 w1
-restore C7 w2
+restore [locate_data_file C3] w1
+restore [locate_data_file C7] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1690.09
diff --git a/tests/thrusection/not_solids/G8 b/tests/thrusection/not_solids/G8
old mode 100755
new mode 100644
index 95a7964ea8..a7b1fa6721
--- a/tests/thrusection/not_solids/G8
+++ b/tests/thrusection/not_solids/G8
@@ -1,5 +1,5 @@
-restore C3 w1
-restore C8 w2
+restore [locate_data_file C3] w1
+restore [locate_data_file C8] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1690.09
diff --git a/tests/thrusection/not_solids/G9 b/tests/thrusection/not_solids/G9
old mode 100755
new mode 100644
index 6ed50dfb06..27535b89c0
--- a/tests/thrusection/not_solids/G9
+++ b/tests/thrusection/not_solids/G9
@@ -1,5 +1,5 @@
-restore C3 w1
-restore C9 w2
+restore [locate_data_file C3] w1
+restore [locate_data_file C9] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1516.01
diff --git a/tests/thrusection/not_solids/H1 b/tests/thrusection/not_solids/H1
old mode 100755
new mode 100644
index fe1aa5de96..842e8107ad
--- a/tests/thrusection/not_solids/H1
+++ b/tests/thrusection/not_solids/H1
@@ -1,5 +1,5 @@
-restore C4 w1
-restore C1 w2
+restore [locate_data_file C4] w1
+restore [locate_data_file C1] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2513.27
diff --git a/tests/thrusection/not_solids/H2 b/tests/thrusection/not_solids/H2
old mode 100755
new mode 100644
index f81f2b6d2d..efc528a461
--- a/tests/thrusection/not_solids/H2
+++ b/tests/thrusection/not_solids/H2
@@ -1,5 +1,5 @@
-restore C4 w1
-restore C2 w2
+restore [locate_data_file C4] w1
+restore [locate_data_file C2] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2513.27
diff --git a/tests/thrusection/not_solids/H3 b/tests/thrusection/not_solids/H3
old mode 100755
new mode 100644
index 9d1877cf14..251ed772e7
--- a/tests/thrusection/not_solids/H3
+++ b/tests/thrusection/not_solids/H3
@@ -1,5 +1,5 @@
-restore C4 w1
-restore C3 w2
+restore [locate_data_file C4] w1
+restore [locate_data_file C3] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2196.82
diff --git a/tests/thrusection/not_solids/H4 b/tests/thrusection/not_solids/H4
old mode 100755
new mode 100644
index 39d3be5fc2..c176a626bf
--- a/tests/thrusection/not_solids/H4
+++ b/tests/thrusection/not_solids/H4
@@ -1,5 +1,5 @@
-restore C4 w1
-restore C4 w2
+restore [locate_data_file C4] w1
+restore [locate_data_file C4] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2513.27
diff --git a/tests/thrusection/not_solids/H5 b/tests/thrusection/not_solids/H5
old mode 100755
new mode 100644
index 4758786ccd..c42a89060a
--- a/tests/thrusection/not_solids/H5
+++ b/tests/thrusection/not_solids/H5
@@ -1,5 +1,5 @@
-restore C4 w1
-restore C5 w2
+restore [locate_data_file C4] w1
+restore [locate_data_file C5] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2513.27
diff --git a/tests/thrusection/not_solids/H6 b/tests/thrusection/not_solids/H6
old mode 100755
new mode 100644
index 906c342163..eb7f88257b
--- a/tests/thrusection/not_solids/H6
+++ b/tests/thrusection/not_solids/H6
@@ -1,5 +1,5 @@
-restore C4 w1
-restore C6 w2
+restore [locate_data_file C4] w1
+restore [locate_data_file C6] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2196.82
diff --git a/tests/thrusection/not_solids/H7 b/tests/thrusection/not_solids/H7
old mode 100755
new mode 100644
index 9a42e80878..65e419c05d
--- a/tests/thrusection/not_solids/H7
+++ b/tests/thrusection/not_solids/H7
@@ -1,5 +1,5 @@
-restore C4 w1
-restore C7 w2
+restore [locate_data_file C4] w1
+restore [locate_data_file C7] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/H8 b/tests/thrusection/not_solids/H8
old mode 100755
new mode 100644
index c356242a3a..6b3edac563
--- a/tests/thrusection/not_solids/H8
+++ b/tests/thrusection/not_solids/H8
@@ -1,5 +1,5 @@
-restore C4 w1
-restore C8 w2
+restore [locate_data_file C4] w1
+restore [locate_data_file C8] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/H9 b/tests/thrusection/not_solids/H9
old mode 100755
new mode 100644
index 705aea0629..b213c92861
--- a/tests/thrusection/not_solids/H9
+++ b/tests/thrusection/not_solids/H9
@@ -1,5 +1,5 @@
-restore C4 w1
-restore C9 w2
+restore [locate_data_file C4] w1
+restore [locate_data_file C9] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1834.5
diff --git a/tests/thrusection/not_solids/I1 b/tests/thrusection/not_solids/I1
old mode 100755
new mode 100644
index 1452598708..e879223d89
--- a/tests/thrusection/not_solids/I1
+++ b/tests/thrusection/not_solids/I1
@@ -1,5 +1,5 @@
-restore C5 w1
-restore C1 w2
+restore [locate_data_file C5] w1
+restore [locate_data_file C1] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2513.27
diff --git a/tests/thrusection/not_solids/I2 b/tests/thrusection/not_solids/I2
old mode 100755
new mode 100644
index fbb69a76b5..540fdd7757
--- a/tests/thrusection/not_solids/I2
+++ b/tests/thrusection/not_solids/I2
@@ -1,5 +1,5 @@
-restore C5 w1
-restore C2 w2
+restore [locate_data_file C5] w1
+restore [locate_data_file C2] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2513.27
diff --git a/tests/thrusection/not_solids/I3 b/tests/thrusection/not_solids/I3
old mode 100755
new mode 100644
index fbcfe8c22a..f59a69b8a4
--- a/tests/thrusection/not_solids/I3
+++ b/tests/thrusection/not_solids/I3
@@ -1,5 +1,5 @@
-restore C5 w1
-restore C3 w2
+restore [locate_data_file C5] w1
+restore [locate_data_file C3] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2196.82
diff --git a/tests/thrusection/not_solids/I4 b/tests/thrusection/not_solids/I4
old mode 100755
new mode 100644
index 7c4600a215..758d67d967
--- a/tests/thrusection/not_solids/I4
+++ b/tests/thrusection/not_solids/I4
@@ -1,5 +1,5 @@
-restore C5 w1
-restore C4 w2
+restore [locate_data_file C5] w1
+restore [locate_data_file C4] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2513.27
diff --git a/tests/thrusection/not_solids/I5 b/tests/thrusection/not_solids/I5
old mode 100755
new mode 100644
index 692c958768..bfbac10f50
--- a/tests/thrusection/not_solids/I5
+++ b/tests/thrusection/not_solids/I5
@@ -1,5 +1,5 @@
-restore C5 w1
-restore C5 w2
+restore [locate_data_file C5] w1
+restore [locate_data_file C5] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2513.27
diff --git a/tests/thrusection/not_solids/I6 b/tests/thrusection/not_solids/I6
old mode 100755
new mode 100644
index 68fe38bd39..7ff38f2758
--- a/tests/thrusection/not_solids/I6
+++ b/tests/thrusection/not_solids/I6
@@ -1,5 +1,5 @@
-restore C5 w1
-restore C6 w2
+restore [locate_data_file C5] w1
+restore [locate_data_file C6] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2196.82
diff --git a/tests/thrusection/not_solids/I7 b/tests/thrusection/not_solids/I7
old mode 100755
new mode 100644
index 87e35e63ee..d704bc593a
--- a/tests/thrusection/not_solids/I7
+++ b/tests/thrusection/not_solids/I7
@@ -1,5 +1,5 @@
-restore C5 w1
-restore C7 w2
+restore [locate_data_file C5] w1
+restore [locate_data_file C7] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/I8 b/tests/thrusection/not_solids/I8
old mode 100755
new mode 100644
index 0a1187a844..f1b4dd4c59
--- a/tests/thrusection/not_solids/I8
+++ b/tests/thrusection/not_solids/I8
@@ -1,5 +1,5 @@
-restore C5 w1
-restore C8 w2
+restore [locate_data_file C5] w1
+restore [locate_data_file C8] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/I9 b/tests/thrusection/not_solids/I9
old mode 100755
new mode 100644
index a23f4ff4e5..afd2e84cf3
--- a/tests/thrusection/not_solids/I9
+++ b/tests/thrusection/not_solids/I9
@@ -1,5 +1,5 @@
-restore C5 w1
-restore C9 w2
+restore [locate_data_file C5] w1
+restore [locate_data_file C9] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1834.5
diff --git a/tests/thrusection/not_solids/J1 b/tests/thrusection/not_solids/J1
old mode 100755
new mode 100644
index fc90b6e9a7..9828a26087
--- a/tests/thrusection/not_solids/J1
+++ b/tests/thrusection/not_solids/J1
@@ -1,5 +1,5 @@
-restore C6 w1
-restore C1 w2
+restore [locate_data_file C6] w1
+restore [locate_data_file C1] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2196.82
diff --git a/tests/thrusection/not_solids/J2 b/tests/thrusection/not_solids/J2
old mode 100755
new mode 100644
index db41aea4b6..b2facc77be
--- a/tests/thrusection/not_solids/J2
+++ b/tests/thrusection/not_solids/J2
@@ -1,5 +1,5 @@
-restore C6 w1
-restore C2 w2
+restore [locate_data_file C6] w1
+restore [locate_data_file C2] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2196.82
diff --git a/tests/thrusection/not_solids/J3 b/tests/thrusection/not_solids/J3
old mode 100755
new mode 100644
index 02f74598f9..2a27939557
--- a/tests/thrusection/not_solids/J3
+++ b/tests/thrusection/not_solids/J3
@@ -1,5 +1,5 @@
-restore C6 w1
-restore C3 w2
+restore [locate_data_file C6] w1
+restore [locate_data_file C3] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1885.58
diff --git a/tests/thrusection/not_solids/J4 b/tests/thrusection/not_solids/J4
old mode 100755
new mode 100644
index cf1c144eca..9474aa39f7
--- a/tests/thrusection/not_solids/J4
+++ b/tests/thrusection/not_solids/J4
@@ -1,5 +1,5 @@
-restore C6 w1
-restore C4 w2
+restore [locate_data_file C6] w1
+restore [locate_data_file C4] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2196.82
diff --git a/tests/thrusection/not_solids/J5 b/tests/thrusection/not_solids/J5
old mode 100755
new mode 100644
index 18b8b5d424..8e8911f57a
--- a/tests/thrusection/not_solids/J5
+++ b/tests/thrusection/not_solids/J5
@@ -1,5 +1,5 @@
-restore C6 w1
-restore C5 w2
+restore [locate_data_file C6] w1
+restore [locate_data_file C5] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2196.82
diff --git a/tests/thrusection/not_solids/J6 b/tests/thrusection/not_solids/J6
old mode 100755
new mode 100644
index dc38eb9ea3..edcf3dd6db
--- a/tests/thrusection/not_solids/J6
+++ b/tests/thrusection/not_solids/J6
@@ -1,5 +1,5 @@
-restore C6 w1
-restore C6 w2
+restore [locate_data_file C6] w1
+restore [locate_data_file C6] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1885.58
diff --git a/tests/thrusection/not_solids/J7 b/tests/thrusection/not_solids/J7
old mode 100755
new mode 100644
index b5af1aafc5..ff634d4fd3
--- a/tests/thrusection/not_solids/J7
+++ b/tests/thrusection/not_solids/J7
@@ -1,5 +1,5 @@
-restore C6 w1
-restore C7 w2
+restore [locate_data_file C6] w1
+restore [locate_data_file C7] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1690.09
diff --git a/tests/thrusection/not_solids/J8 b/tests/thrusection/not_solids/J8
old mode 100755
new mode 100644
index b8dded7e16..4f98e9e91c
--- a/tests/thrusection/not_solids/J8
+++ b/tests/thrusection/not_solids/J8
@@ -1,5 +1,5 @@
-restore C6 w1
-restore C8 w2
+restore [locate_data_file C6] w1
+restore [locate_data_file C8] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1690.09
diff --git a/tests/thrusection/not_solids/J9 b/tests/thrusection/not_solids/J9
old mode 100755
new mode 100644
index 5b8ca32db5..74522a196b
--- a/tests/thrusection/not_solids/J9
+++ b/tests/thrusection/not_solids/J9
@@ -1,5 +1,5 @@
-restore C6 w1
-restore C9 w2
+restore [locate_data_file C6] w1
+restore [locate_data_file C9] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1516.01
diff --git a/tests/thrusection/not_solids/K1 b/tests/thrusection/not_solids/K1
old mode 100755
new mode 100644
index f6a7815d1c..2be0c73bdf
--- a/tests/thrusection/not_solids/K1
+++ b/tests/thrusection/not_solids/K1
@@ -1,5 +1,5 @@
-restore C7 w1
-restore C1 w2
+restore [locate_data_file C7] w1
+restore [locate_data_file C1] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/K2 b/tests/thrusection/not_solids/K2
old mode 100755
new mode 100644
index c7cacb4165..ccda2495c7
--- a/tests/thrusection/not_solids/K2
+++ b/tests/thrusection/not_solids/K2
@@ -1,5 +1,5 @@
-restore C7 w1
-restore C2 w2
+restore [locate_data_file C7] w1
+restore [locate_data_file C2] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/K3 b/tests/thrusection/not_solids/K3
old mode 100755
new mode 100644
index 142909de5c..729f452f3a
--- a/tests/thrusection/not_solids/K3
+++ b/tests/thrusection/not_solids/K3
@@ -1,5 +1,5 @@
-restore C7 w1
-restore C3 w2
+restore [locate_data_file C7] w1
+restore [locate_data_file C3] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1690.09
diff --git a/tests/thrusection/not_solids/K4 b/tests/thrusection/not_solids/K4
old mode 100755
new mode 100644
index 42e656f403..a7ba1a8ce5
--- a/tests/thrusection/not_solids/K4
+++ b/tests/thrusection/not_solids/K4
@@ -1,5 +1,5 @@
-restore C7 w1
-restore C4 w2
+restore [locate_data_file C7] w1
+restore [locate_data_file C4] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/K5 b/tests/thrusection/not_solids/K5
old mode 100755
new mode 100644
index 0425911b39..cb9a3a6264
--- a/tests/thrusection/not_solids/K5
+++ b/tests/thrusection/not_solids/K5
@@ -1,5 +1,5 @@
-restore C7 w1
-restore C5 w2
+restore [locate_data_file C7] w1
+restore [locate_data_file C5] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/K6 b/tests/thrusection/not_solids/K6
old mode 100755
new mode 100644
index 32d80c4c91..d53e7bf192
--- a/tests/thrusection/not_solids/K6
+++ b/tests/thrusection/not_solids/K6
@@ -1,5 +1,5 @@
-restore C7 w1
-restore C6 w2
+restore [locate_data_file C7] w1
+restore [locate_data_file C6] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1690.09
diff --git a/tests/thrusection/not_solids/K7 b/tests/thrusection/not_solids/K7
old mode 100755
new mode 100644
index 548773c55b..6e651deea5
--- a/tests/thrusection/not_solids/K7
+++ b/tests/thrusection/not_solids/K7
@@ -1,5 +1,5 @@
-restore C7 w1
-restore C7 w2
+restore [locate_data_file C7] w1
+restore [locate_data_file C7] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1507.96
diff --git a/tests/thrusection/not_solids/K8 b/tests/thrusection/not_solids/K8
old mode 100755
new mode 100644
index 55baeec6e8..84860aa838
--- a/tests/thrusection/not_solids/K8
+++ b/tests/thrusection/not_solids/K8
@@ -1,5 +1,5 @@
-restore C7 w1
-restore C8 w2
+restore [locate_data_file C7] w1
+restore [locate_data_file C8] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1507.96
diff --git a/tests/thrusection/not_solids/K9 b/tests/thrusection/not_solids/K9
old mode 100755
new mode 100644
index 194cf63b99..f22b7d4632
--- a/tests/thrusection/not_solids/K9
+++ b/tests/thrusection/not_solids/K9
@@ -1,5 +1,5 @@
-restore C7 w1
-restore C9 w2
+restore [locate_data_file C7] w1
+restore [locate_data_file C9] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1314
diff --git a/tests/thrusection/not_solids/L1 b/tests/thrusection/not_solids/L1
old mode 100755
new mode 100644
index a91218312f..402294bfdc
--- a/tests/thrusection/not_solids/L1
+++ b/tests/thrusection/not_solids/L1
@@ -1,5 +1,5 @@
-restore C8 w1
-restore C1 w2
+restore [locate_data_file C8] w1
+restore [locate_data_file C1] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/L2 b/tests/thrusection/not_solids/L2
old mode 100755
new mode 100644
index 38a4c4ceef..73cb492568
--- a/tests/thrusection/not_solids/L2
+++ b/tests/thrusection/not_solids/L2
@@ -1,5 +1,5 @@
-restore C8 w1
-restore C2 w2
+restore [locate_data_file C8] w1
+restore [locate_data_file C2] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/L3 b/tests/thrusection/not_solids/L3
old mode 100755
new mode 100644
index f5c7ffa8e5..4e4fde1801
--- a/tests/thrusection/not_solids/L3
+++ b/tests/thrusection/not_solids/L3
@@ -1,5 +1,5 @@
-restore C8 w1
-restore C3 w2
+restore [locate_data_file C8] w1
+restore [locate_data_file C3] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1690.09
diff --git a/tests/thrusection/not_solids/L4 b/tests/thrusection/not_solids/L4
old mode 100755
new mode 100644
index 1933ffceb6..ea022a152b
--- a/tests/thrusection/not_solids/L4
+++ b/tests/thrusection/not_solids/L4
@@ -1,5 +1,5 @@
-restore C8 w1
-restore C4 w2
+restore [locate_data_file C8] w1
+restore [locate_data_file C4] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/L5 b/tests/thrusection/not_solids/L5
old mode 100755
new mode 100644
index 3c76841357..98b8e52e7e
--- a/tests/thrusection/not_solids/L5
+++ b/tests/thrusection/not_solids/L5
@@ -1,5 +1,5 @@
-restore C8 w1
-restore C5 w2
+restore [locate_data_file C8] w1
+restore [locate_data_file C5] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/L6 b/tests/thrusection/not_solids/L6
old mode 100755
new mode 100644
index 9fdc971318..cefb316a17
--- a/tests/thrusection/not_solids/L6
+++ b/tests/thrusection/not_solids/L6
@@ -1,5 +1,5 @@
-restore C8 w1
-restore C6 w2
+restore [locate_data_file C8] w1
+restore [locate_data_file C6] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1690.09
diff --git a/tests/thrusection/not_solids/L7 b/tests/thrusection/not_solids/L7
old mode 100755
new mode 100644
index 11a53fcfb3..410fc760d4
--- a/tests/thrusection/not_solids/L7
+++ b/tests/thrusection/not_solids/L7
@@ -1,5 +1,5 @@
-restore C8 w1
-restore C7 w2
+restore [locate_data_file C8] w1
+restore [locate_data_file C7] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1507.96
diff --git a/tests/thrusection/not_solids/L8 b/tests/thrusection/not_solids/L8
old mode 100755
new mode 100644
index c9c37c2f6f..9e92badd2a
--- a/tests/thrusection/not_solids/L8
+++ b/tests/thrusection/not_solids/L8
@@ -1,5 +1,5 @@
-restore C8 w1
-restore C8 w2
+restore [locate_data_file C8] w1
+restore [locate_data_file C8] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1507.96
diff --git a/tests/thrusection/not_solids/L9 b/tests/thrusection/not_solids/L9
old mode 100755
new mode 100644
index 156ed0d727..f871fd54d6
--- a/tests/thrusection/not_solids/L9
+++ b/tests/thrusection/not_solids/L9
@@ -1,5 +1,5 @@
-restore C8 w1
-restore C9 w2
+restore [locate_data_file C8] w1
+restore [locate_data_file C9] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1314
diff --git a/tests/thrusection/not_solids/M1 b/tests/thrusection/not_solids/M1
old mode 100755
new mode 100644
index 8f524f59e5..dd5410b1a0
--- a/tests/thrusection/not_solids/M1
+++ b/tests/thrusection/not_solids/M1
@@ -1,5 +1,5 @@
-restore C9 w1
-restore C1 w2
+restore [locate_data_file C9] w1
+restore [locate_data_file C1] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1834.5
diff --git a/tests/thrusection/not_solids/M2 b/tests/thrusection/not_solids/M2
old mode 100755
new mode 100644
index 6d199fe270..752ecb2cc1
--- a/tests/thrusection/not_solids/M2
+++ b/tests/thrusection/not_solids/M2
@@ -1,5 +1,5 @@
-restore C9 w1
-restore C2 w2
+restore [locate_data_file C9] w1
+restore [locate_data_file C2] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1834.5
diff --git a/tests/thrusection/not_solids/M3 b/tests/thrusection/not_solids/M3
old mode 100755
new mode 100644
index feae499dc0..1fdabe7e30
--- a/tests/thrusection/not_solids/M3
+++ b/tests/thrusection/not_solids/M3
@@ -1,5 +1,5 @@
-restore C9 w1
-restore C3 w2
+restore [locate_data_file C9] w1
+restore [locate_data_file C3] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1516.02
diff --git a/tests/thrusection/not_solids/M4 b/tests/thrusection/not_solids/M4
old mode 100755
new mode 100644
index 742844505e..89f5541bd6
--- a/tests/thrusection/not_solids/M4
+++ b/tests/thrusection/not_solids/M4
@@ -1,5 +1,5 @@
-restore C9 w1
-restore C4 w2
+restore [locate_data_file C9] w1
+restore [locate_data_file C4] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1834.5
diff --git a/tests/thrusection/not_solids/M5 b/tests/thrusection/not_solids/M5
old mode 100755
new mode 100644
index 49202e15a6..35d37c2d3b
--- a/tests/thrusection/not_solids/M5
+++ b/tests/thrusection/not_solids/M5
@@ -1,5 +1,5 @@
-restore C9 w1
-restore C5 w2
+restore [locate_data_file C9] w1
+restore [locate_data_file C5] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1834.5
diff --git a/tests/thrusection/not_solids/M6 b/tests/thrusection/not_solids/M6
old mode 100755
new mode 100644
index 8ab2041d7b..5384a0d8f8
--- a/tests/thrusection/not_solids/M6
+++ b/tests/thrusection/not_solids/M6
@@ -1,5 +1,5 @@
-restore C9 w1
-restore C6 w2
+restore [locate_data_file C9] w1
+restore [locate_data_file C6] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1516.02
diff --git a/tests/thrusection/not_solids/M7 b/tests/thrusection/not_solids/M7
old mode 100755
new mode 100644
index cdeaa177f9..8a3aeae82f
--- a/tests/thrusection/not_solids/M7
+++ b/tests/thrusection/not_solids/M7
@@ -1,5 +1,5 @@
-restore C9 w1
-restore C7 w2
+restore [locate_data_file C9] w1
+restore [locate_data_file C7] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1314
diff --git a/tests/thrusection/not_solids/M8 b/tests/thrusection/not_solids/M8
old mode 100755
new mode 100644
index a687b99876..a4de2ce115
--- a/tests/thrusection/not_solids/M8
+++ b/tests/thrusection/not_solids/M8
@@ -1,5 +1,5 @@
-restore C9 w1
-restore C8 w2
+restore [locate_data_file C9] w1
+restore [locate_data_file C8] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1314
diff --git a/tests/thrusection/not_solids/M9 b/tests/thrusection/not_solids/M9
old mode 100755
new mode 100644
index 67dd1cad52..9544255ccd
--- a/tests/thrusection/not_solids/M9
+++ b/tests/thrusection/not_solids/M9
@@ -1,5 +1,5 @@
-restore C9 w1
-restore C9 w2
+restore [locate_data_file C9] w1
+restore [locate_data_file C9] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1131.35
diff --git a/tests/thrusection/not_solids/N1 b/tests/thrusection/not_solids/N1
old mode 100755
new mode 100644
index e53c7f105b..29c4b792fc
--- a/tests/thrusection/not_solids/N1
+++ b/tests/thrusection/not_solids/N1
@@ -1,5 +1,5 @@
-restore C10 w1
-restore C1 w2
+restore [locate_data_file C10] w1
+restore [locate_data_file C1] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/N2 b/tests/thrusection/not_solids/N2
old mode 100755
new mode 100644
index f81b340358..3ff4c4e774
--- a/tests/thrusection/not_solids/N2
+++ b/tests/thrusection/not_solids/N2
@@ -1,5 +1,5 @@
-restore C10 w1
-restore C2 w2
+restore [locate_data_file C10] w1
+restore [locate_data_file C2] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/N3 b/tests/thrusection/not_solids/N3
old mode 100755
new mode 100644
index eaef796362..0f06a8d871
--- a/tests/thrusection/not_solids/N3
+++ b/tests/thrusection/not_solids/N3
@@ -1,5 +1,5 @@
-restore C10 w1
-restore C3 w2
+restore [locate_data_file C10] w1
+restore [locate_data_file C3] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1690.09
diff --git a/tests/thrusection/not_solids/N4 b/tests/thrusection/not_solids/N4
old mode 100755
new mode 100644
index 9f9c651652..5cf9421d6a
--- a/tests/thrusection/not_solids/N4
+++ b/tests/thrusection/not_solids/N4
@@ -1,5 +1,5 @@
-restore C10 w1
-restore C4 w2
+restore [locate_data_file C10] w1
+restore [locate_data_file C4] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/N5 b/tests/thrusection/not_solids/N5
old mode 100755
new mode 100644
index 92a2400ad7..1e13c58eed
--- a/tests/thrusection/not_solids/N5
+++ b/tests/thrusection/not_solids/N5
@@ -1,5 +1,5 @@
-restore C10 w1
-restore C5 w2
+restore [locate_data_file C10] w1
+restore [locate_data_file C5] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/N6 b/tests/thrusection/not_solids/N6
old mode 100755
new mode 100644
index 2ff428c67d..f9020fa7f8
--- a/tests/thrusection/not_solids/N6
+++ b/tests/thrusection/not_solids/N6
@@ -1,5 +1,5 @@
-restore C10 w1
-restore C6 w2
+restore [locate_data_file C10] w1
+restore [locate_data_file C6] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1690.09
diff --git a/tests/thrusection/not_solids/N7 b/tests/thrusection/not_solids/N7
old mode 100755
new mode 100644
index ec3d8c481f..c7261419fe
--- a/tests/thrusection/not_solids/N7
+++ b/tests/thrusection/not_solids/N7
@@ -1,5 +1,5 @@
-restore C10 w1
-restore C7 w2
+restore [locate_data_file C10] w1
+restore [locate_data_file C7] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1507.96
diff --git a/tests/thrusection/not_solids/N8 b/tests/thrusection/not_solids/N8
old mode 100755
new mode 100644
index 86d69186f5..8ddcb6bc5e
--- a/tests/thrusection/not_solids/N8
+++ b/tests/thrusection/not_solids/N8
@@ -1,5 +1,5 @@
-restore C10 w1
-restore C8 w2
+restore [locate_data_file C10] w1
+restore [locate_data_file C8] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1507.96
diff --git a/tests/thrusection/not_solids/N9 b/tests/thrusection/not_solids/N9
old mode 100755
new mode 100644
index abab30fd29..1fa3136a31
--- a/tests/thrusection/not_solids/N9
+++ b/tests/thrusection/not_solids/N9
@@ -1,5 +1,5 @@
-restore C10 w1
-restore C9 w2
+restore [locate_data_file C10] w1
+restore [locate_data_file C9] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1314
diff --git a/tests/thrusection/not_solids/O1 b/tests/thrusection/not_solids/O1
old mode 100755
new mode 100644
index e3fedec849..f1eaf893a6
--- a/tests/thrusection/not_solids/O1
+++ b/tests/thrusection/not_solids/O1
@@ -1,5 +1,5 @@
-restore C11 w1
-restore C1 w2
+restore [locate_data_file C11] w1
+restore [locate_data_file C1] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/O2 b/tests/thrusection/not_solids/O2
old mode 100755
new mode 100644
index 538a05f8a1..8bd990bc23
--- a/tests/thrusection/not_solids/O2
+++ b/tests/thrusection/not_solids/O2
@@ -1,5 +1,5 @@
-restore C11 w1
-restore C2 w2
+restore [locate_data_file C11] w1
+restore [locate_data_file C2] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/O3 b/tests/thrusection/not_solids/O3
old mode 100755
new mode 100644
index d2bf9523c3..8ee578e124
--- a/tests/thrusection/not_solids/O3
+++ b/tests/thrusection/not_solids/O3
@@ -1,5 +1,5 @@
-restore C11 w1
-restore C3 w2
+restore [locate_data_file C11] w1
+restore [locate_data_file C3] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1690.09
diff --git a/tests/thrusection/not_solids/O4 b/tests/thrusection/not_solids/O4
old mode 100755
new mode 100644
index 61206962cd..9dc14d31e1
--- a/tests/thrusection/not_solids/O4
+++ b/tests/thrusection/not_solids/O4
@@ -1,5 +1,5 @@
-restore C11 w1
-restore C4 w2
+restore [locate_data_file C11] w1
+restore [locate_data_file C4] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/O5 b/tests/thrusection/not_solids/O5
old mode 100755
new mode 100644
index b31da578b6..3c1b0ac0a4
--- a/tests/thrusection/not_solids/O5
+++ b/tests/thrusection/not_solids/O5
@@ -1,5 +1,5 @@
-restore C11 w1
-restore C5 w2
+restore [locate_data_file C11] w1
+restore [locate_data_file C5] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/O6 b/tests/thrusection/not_solids/O6
old mode 100755
new mode 100644
index 03096923a9..88ac36d19f
--- a/tests/thrusection/not_solids/O6
+++ b/tests/thrusection/not_solids/O6
@@ -1,5 +1,5 @@
-restore C11 w1
-restore C6 w2
+restore [locate_data_file C11] w1
+restore [locate_data_file C6] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1690.09
diff --git a/tests/thrusection/not_solids/O7 b/tests/thrusection/not_solids/O7
old mode 100755
new mode 100644
index 0de3a00c7f..f25500e66c
--- a/tests/thrusection/not_solids/O7
+++ b/tests/thrusection/not_solids/O7
@@ -1,5 +1,5 @@
-restore C11 w1
-restore C7 w2
+restore [locate_data_file C11] w1
+restore [locate_data_file C7] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1507.96
diff --git a/tests/thrusection/not_solids/O8 b/tests/thrusection/not_solids/O8
old mode 100755
new mode 100644
index 8563cec246..04e051dea9
--- a/tests/thrusection/not_solids/O8
+++ b/tests/thrusection/not_solids/O8
@@ -1,5 +1,5 @@
-restore C11 w1
-restore C8 w2
+restore [locate_data_file C11] w1
+restore [locate_data_file C8] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1507.96
diff --git a/tests/thrusection/not_solids/O9 b/tests/thrusection/not_solids/O9
old mode 100755
new mode 100644
index 03bad7810c..65849fae1e
--- a/tests/thrusection/not_solids/O9
+++ b/tests/thrusection/not_solids/O9
@@ -1,5 +1,5 @@
-restore C11 w1
-restore C9 w2
+restore [locate_data_file C11] w1
+restore [locate_data_file C9] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1314
diff --git a/tests/thrusection/not_solids/P1 b/tests/thrusection/not_solids/P1
old mode 100755
new mode 100644
index e004be4f06..5ede721390
--- a/tests/thrusection/not_solids/P1
+++ b/tests/thrusection/not_solids/P1
@@ -1,5 +1,5 @@
-restore C12 w1
-restore C1 w2
+restore [locate_data_file C12] w1
+restore [locate_data_file C1] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1834.5
diff --git a/tests/thrusection/not_solids/P2 b/tests/thrusection/not_solids/P2
old mode 100755
new mode 100644
index 48131c4aa0..0cb228a3c6
--- a/tests/thrusection/not_solids/P2
+++ b/tests/thrusection/not_solids/P2
@@ -1,5 +1,5 @@
-restore C12 w1
-restore C2 w2
+restore [locate_data_file C12] w1
+restore [locate_data_file C2] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1834.5
diff --git a/tests/thrusection/not_solids/P3 b/tests/thrusection/not_solids/P3
old mode 100755
new mode 100644
index 3d154781dc..71c05aced5
--- a/tests/thrusection/not_solids/P3
+++ b/tests/thrusection/not_solids/P3
@@ -1,5 +1,5 @@
-restore C12 w1
-restore C3 w2
+restore [locate_data_file C12] w1
+restore [locate_data_file C3] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1516.02
diff --git a/tests/thrusection/not_solids/P4 b/tests/thrusection/not_solids/P4
old mode 100755
new mode 100644
index 60ffa0176f..0298a6a57d
--- a/tests/thrusection/not_solids/P4
+++ b/tests/thrusection/not_solids/P4
@@ -1,5 +1,5 @@
-restore C12 w1
-restore C4 w2
+restore [locate_data_file C12] w1
+restore [locate_data_file C4] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1834.5
diff --git a/tests/thrusection/not_solids/P5 b/tests/thrusection/not_solids/P5
old mode 100755
new mode 100644
index df10df7eeb..3c5f6e52f2
--- a/tests/thrusection/not_solids/P5
+++ b/tests/thrusection/not_solids/P5
@@ -1,5 +1,5 @@
-restore C12 w1
-restore C5 w2
+restore [locate_data_file C12] w1
+restore [locate_data_file C5] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1834.5
diff --git a/tests/thrusection/not_solids/P6 b/tests/thrusection/not_solids/P6
old mode 100755
new mode 100644
index 2b0c433604..c72c86201a
--- a/tests/thrusection/not_solids/P6
+++ b/tests/thrusection/not_solids/P6
@@ -1,5 +1,5 @@
-restore C12 w1
-restore C6 w2
+restore [locate_data_file C12] w1
+restore [locate_data_file C6] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1516.02
diff --git a/tests/thrusection/not_solids/P7 b/tests/thrusection/not_solids/P7
old mode 100755
new mode 100644
index 28b3cc34a5..df8e2a222b
--- a/tests/thrusection/not_solids/P7
+++ b/tests/thrusection/not_solids/P7
@@ -1,5 +1,5 @@
-restore C12 w1
-restore C7 w2
+restore [locate_data_file C12] w1
+restore [locate_data_file C7] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1314
diff --git a/tests/thrusection/not_solids/P8 b/tests/thrusection/not_solids/P8
old mode 100755
new mode 100644
index bf90355296..db95f10418
--- a/tests/thrusection/not_solids/P8
+++ b/tests/thrusection/not_solids/P8
@@ -1,5 +1,5 @@
-restore C12 w1
-restore C8 w2
+restore [locate_data_file C12] w1
+restore [locate_data_file C8] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1314
diff --git a/tests/thrusection/not_solids/P9 b/tests/thrusection/not_solids/P9
old mode 100755
new mode 100644
index 5f328e50a0..91f65c6388
--- a/tests/thrusection/not_solids/P9
+++ b/tests/thrusection/not_solids/P9
@@ -1,5 +1,5 @@
-restore C12 w1
-restore C9 w2
+restore [locate_data_file C12] w1
+restore [locate_data_file C9] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1131.35
diff --git a/tests/thrusection/not_solids/Q1 b/tests/thrusection/not_solids/Q1
old mode 100755
new mode 100644
index 4e4ae81721..6bfedda974
--- a/tests/thrusection/not_solids/Q1
+++ b/tests/thrusection/not_solids/Q1
@@ -1,4 +1,4 @@
-restore C13 w1
-restore C1 w2
+restore [locate_data_file C13] w1
+restore [locate_data_file C1] w2
 thrusections result 0 0 w1 w2
 set square 1295.31
diff --git a/tests/thrusection/not_solids/Q2 b/tests/thrusection/not_solids/Q2
old mode 100755
new mode 100644
index fb5b0f94dd..aff0e541f3
--- a/tests/thrusection/not_solids/Q2
+++ b/tests/thrusection/not_solids/Q2
@@ -1,4 +1,4 @@
-restore C13 w1
-restore C2 w2
+restore [locate_data_file C13] w1
+restore [locate_data_file C2] w2
 thrusections result 0 0 w1 w2
 set square 1295.31
diff --git a/tests/thrusection/not_solids/Q3 b/tests/thrusection/not_solids/Q3
old mode 100755
new mode 100644
index 2b9618f9c4..ef92cd0b24
--- a/tests/thrusection/not_solids/Q3
+++ b/tests/thrusection/not_solids/Q3
@@ -1,4 +1,4 @@
-restore C13 w1
-restore C3 w2
+restore [locate_data_file C13] w1
+restore [locate_data_file C3] w2
 thrusections result 0 0 w1 w2
 set square 972.397
diff --git a/tests/thrusection/not_solids/Q4 b/tests/thrusection/not_solids/Q4
old mode 100755
new mode 100644
index 2eb468d83f..33f013e362
--- a/tests/thrusection/not_solids/Q4
+++ b/tests/thrusection/not_solids/Q4
@@ -1,4 +1,4 @@
-restore C13 w1
-restore C4 w2
+restore [locate_data_file C13] w1
+restore [locate_data_file C4] w2
 thrusections result 0 0 w1 w2
 set square 1295.31
diff --git a/tests/thrusection/not_solids/Q5 b/tests/thrusection/not_solids/Q5
old mode 100755
new mode 100644
index 0e17d7af8f..98aee6f53d
--- a/tests/thrusection/not_solids/Q5
+++ b/tests/thrusection/not_solids/Q5
@@ -1,4 +1,4 @@
-restore C13 w1
-restore C5 w2
+restore [locate_data_file C13] w1
+restore [locate_data_file C5] w2
 thrusections result 0 0 w1 w2
 set square 1295.31
diff --git a/tests/thrusection/not_solids/Q6 b/tests/thrusection/not_solids/Q6
old mode 100755
new mode 100644
index 4934d44f43..dec53ad0c9
--- a/tests/thrusection/not_solids/Q6
+++ b/tests/thrusection/not_solids/Q6
@@ -1,4 +1,4 @@
-restore C13 w1
-restore C6 w2
+restore [locate_data_file C13] w1
+restore [locate_data_file C6] w2
 thrusections result 0 0 w1 w2
 set square 972.397
diff --git a/tests/thrusection/not_solids/Q7 b/tests/thrusection/not_solids/Q7
old mode 100755
new mode 100644
index 6230b94c34..7f74a64215
--- a/tests/thrusection/not_solids/Q7
+++ b/tests/thrusection/not_solids/Q7
@@ -1,4 +1,4 @@
-restore C13 w1
-restore C7 w2
+restore [locate_data_file C13] w1
+restore [locate_data_file C7] w2
 thrusections result 0 0 w1 w2
 set square 762.417
diff --git a/tests/thrusection/not_solids/Q8 b/tests/thrusection/not_solids/Q8
old mode 100755
new mode 100644
index 8588cc3772..1769fb8e93
--- a/tests/thrusection/not_solids/Q8
+++ b/tests/thrusection/not_solids/Q8
@@ -1,4 +1,4 @@
-restore C13 w1
-restore C8 w2
+restore [locate_data_file C13] w1
+restore [locate_data_file C8] w2
 thrusections result 0 0 w1 w2
 set square 762.417
diff --git a/tests/thrusection/not_solids/Q9 b/tests/thrusection/not_solids/Q9
old mode 100755
new mode 100644
index e81e6aac19..0cbbfe65d9
--- a/tests/thrusection/not_solids/Q9
+++ b/tests/thrusection/not_solids/Q9
@@ -1,4 +1,4 @@
-restore C13 w1
-restore C9 w2
+restore [locate_data_file C13] w1
+restore [locate_data_file C9] w2
 thrusections result 0 0 w1 w2
 set square 572.05
diff --git a/tests/thrusection/not_solids/R1 b/tests/thrusection/not_solids/R1
old mode 100755
new mode 100644
index ac07626524..8b25d71618
--- a/tests/thrusection/not_solids/R1
+++ b/tests/thrusection/not_solids/R1
@@ -1,5 +1,5 @@
-restore C1 w1
-restore C10 w2
+restore [locate_data_file C1] w1
+restore [locate_data_file C10] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/R2 b/tests/thrusection/not_solids/R2
old mode 100755
new mode 100644
index 8592633b1e..e782fbf79d
--- a/tests/thrusection/not_solids/R2
+++ b/tests/thrusection/not_solids/R2
@@ -1,5 +1,5 @@
-restore C1 w1
-restore C11 w2
+restore [locate_data_file C1] w1
+restore [locate_data_file C11] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/R3 b/tests/thrusection/not_solids/R3
old mode 100755
new mode 100644
index d90aed38cc..1f73b13fe8
--- a/tests/thrusection/not_solids/R3
+++ b/tests/thrusection/not_solids/R3
@@ -1,5 +1,5 @@
-restore C1 w1
-restore C12 w2
+restore [locate_data_file C1] w1
+restore [locate_data_file C12] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1834.5
diff --git a/tests/thrusection/not_solids/R4 b/tests/thrusection/not_solids/R4
old mode 100755
new mode 100644
index ef5d8678d6..8c9cac3836
--- a/tests/thrusection/not_solids/R4
+++ b/tests/thrusection/not_solids/R4
@@ -1,4 +1,4 @@
-restore C1 w1
-restore C13 w2
+restore [locate_data_file C1] w1
+restore [locate_data_file C13] w2
 thrusections result 0 0 w1 w2
 set square 1295.31
diff --git a/tests/thrusection/not_solids/R5 b/tests/thrusection/not_solids/R5
old mode 100755
new mode 100644
index 431196ff54..326e4dd1cc
--- a/tests/thrusection/not_solids/R5
+++ b/tests/thrusection/not_solids/R5
@@ -1,5 +1,5 @@
-restore C2 w1
-restore C10 w2
+restore [locate_data_file C2] w1
+restore [locate_data_file C10] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/R6 b/tests/thrusection/not_solids/R6
old mode 100755
new mode 100644
index b07a280e49..2c73366ecf
--- a/tests/thrusection/not_solids/R6
+++ b/tests/thrusection/not_solids/R6
@@ -1,5 +1,5 @@
-restore C2 w1
-restore C11 w2
+restore [locate_data_file C2] w1
+restore [locate_data_file C11] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/R7 b/tests/thrusection/not_solids/R7
old mode 100755
new mode 100644
index 5adfe2a10b..801791cd1e
--- a/tests/thrusection/not_solids/R7
+++ b/tests/thrusection/not_solids/R7
@@ -1,5 +1,5 @@
-restore C2 w1
-restore C12 w2
+restore [locate_data_file C2] w1
+restore [locate_data_file C12] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1834.5
diff --git a/tests/thrusection/not_solids/R8 b/tests/thrusection/not_solids/R8
old mode 100755
new mode 100644
index fe9a4fc74d..dc439bbccf
--- a/tests/thrusection/not_solids/R8
+++ b/tests/thrusection/not_solids/R8
@@ -1,4 +1,4 @@
-restore C2 w1
-restore C13 w2
+restore [locate_data_file C2] w1
+restore [locate_data_file C13] w2
 thrusections result 0 0 w1 w2
 set square 1295.31
diff --git a/tests/thrusection/not_solids/R9 b/tests/thrusection/not_solids/R9
old mode 100755
new mode 100644
index 2b7b4f0512..b50c177259
--- a/tests/thrusection/not_solids/R9
+++ b/tests/thrusection/not_solids/R9
@@ -1,5 +1,5 @@
-restore C3 w1
-restore C10 w2
+restore [locate_data_file C3] w1
+restore [locate_data_file C10] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1690.09
diff --git a/tests/thrusection/not_solids/S1 b/tests/thrusection/not_solids/S1
old mode 100755
new mode 100644
index fde1199c89..cb48b693cc
--- a/tests/thrusection/not_solids/S1
+++ b/tests/thrusection/not_solids/S1
@@ -1,5 +1,5 @@
-restore C3 w1
-restore C11 w2
+restore [locate_data_file C3] w1
+restore [locate_data_file C11] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1690.09
diff --git a/tests/thrusection/not_solids/S2 b/tests/thrusection/not_solids/S2
old mode 100755
new mode 100644
index e8f1796d02..f0075299bc
--- a/tests/thrusection/not_solids/S2
+++ b/tests/thrusection/not_solids/S2
@@ -1,5 +1,5 @@
-restore C3 w1
-restore C12 w2
+restore [locate_data_file C3] w1
+restore [locate_data_file C12] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1516.01
diff --git a/tests/thrusection/not_solids/S3 b/tests/thrusection/not_solids/S3
old mode 100755
new mode 100644
index 00505db1ac..d15ea2103a
--- a/tests/thrusection/not_solids/S3
+++ b/tests/thrusection/not_solids/S3
@@ -1,4 +1,4 @@
-restore C3 w1
-restore C13 w2
+restore [locate_data_file C3] w1
+restore [locate_data_file C13] w2
 thrusections result 0 0 w1 w2
 set square 972.397
diff --git a/tests/thrusection/not_solids/S4 b/tests/thrusection/not_solids/S4
old mode 100755
new mode 100644
index 45facb0e3f..eb5b7c8930
--- a/tests/thrusection/not_solids/S4
+++ b/tests/thrusection/not_solids/S4
@@ -1,5 +1,5 @@
-restore C4 w1
-restore C10 w2
+restore [locate_data_file C4] w1
+restore [locate_data_file C10] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/S5 b/tests/thrusection/not_solids/S5
old mode 100755
new mode 100644
index 9303aa0b2b..0cd2a3aa51
--- a/tests/thrusection/not_solids/S5
+++ b/tests/thrusection/not_solids/S5
@@ -1,5 +1,5 @@
-restore C4 w1
-restore C11 w2
+restore [locate_data_file C4] w1
+restore [locate_data_file C11] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/S6 b/tests/thrusection/not_solids/S6
old mode 100755
new mode 100644
index 6c5a5cf3b5..187f0862c7
--- a/tests/thrusection/not_solids/S6
+++ b/tests/thrusection/not_solids/S6
@@ -1,5 +1,5 @@
-restore C4 w1
-restore C12 w2
+restore [locate_data_file C4] w1
+restore [locate_data_file C12] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1834.5
diff --git a/tests/thrusection/not_solids/S7 b/tests/thrusection/not_solids/S7
old mode 100755
new mode 100644
index 6c0019d949..e50795016d
--- a/tests/thrusection/not_solids/S7
+++ b/tests/thrusection/not_solids/S7
@@ -1,4 +1,4 @@
-restore C4 w1
-restore C13 w2
+restore [locate_data_file C4] w1
+restore [locate_data_file C13] w2
 thrusections result 0 0 w1 w2
 set square 1295.31
diff --git a/tests/thrusection/not_solids/S8 b/tests/thrusection/not_solids/S8
old mode 100755
new mode 100644
index 38dc14b6b7..cb7e0fa0d7
--- a/tests/thrusection/not_solids/S8
+++ b/tests/thrusection/not_solids/S8
@@ -1,5 +1,5 @@
-restore C5 w1
-restore C10 w2
+restore [locate_data_file C5] w1
+restore [locate_data_file C10] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/S9 b/tests/thrusection/not_solids/S9
old mode 100755
new mode 100644
index de8ec6ee95..e20f73a96f
--- a/tests/thrusection/not_solids/S9
+++ b/tests/thrusection/not_solids/S9
@@ -1,5 +1,5 @@
-restore C5 w1
-restore C11 w2
+restore [locate_data_file C5] w1
+restore [locate_data_file C11] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 2020.65
diff --git a/tests/thrusection/not_solids/T1 b/tests/thrusection/not_solids/T1
old mode 100755
new mode 100644
index 9c60e8d6d4..3dff8ad41d
--- a/tests/thrusection/not_solids/T1
+++ b/tests/thrusection/not_solids/T1
@@ -1,5 +1,5 @@
-restore C5 w1
-restore C12 w2
+restore [locate_data_file C5] w1
+restore [locate_data_file C12] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1834.5
diff --git a/tests/thrusection/not_solids/T2 b/tests/thrusection/not_solids/T2
old mode 100755
new mode 100644
index 76bf708a16..71beb7f11b
--- a/tests/thrusection/not_solids/T2
+++ b/tests/thrusection/not_solids/T2
@@ -1,4 +1,4 @@
-restore C5 w1
-restore C13 w2
+restore [locate_data_file C5] w1
+restore [locate_data_file C13] w2
 thrusections result 0 0 w1 w2
 set square 1295.31
diff --git a/tests/thrusection/not_solids/T3 b/tests/thrusection/not_solids/T3
old mode 100755
new mode 100644
index edd69bfb8c..c5590feb8a
--- a/tests/thrusection/not_solids/T3
+++ b/tests/thrusection/not_solids/T3
@@ -1,5 +1,5 @@
-restore C6 w1
-restore C10 w2
+restore [locate_data_file C6] w1
+restore [locate_data_file C10] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1690.09
diff --git a/tests/thrusection/not_solids/T4 b/tests/thrusection/not_solids/T4
old mode 100755
new mode 100644
index f46e585f94..df48ea1ebc
--- a/tests/thrusection/not_solids/T4
+++ b/tests/thrusection/not_solids/T4
@@ -1,5 +1,5 @@
-restore C6 w1
-restore C11 w2
+restore [locate_data_file C6] w1
+restore [locate_data_file C11] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1690.09
diff --git a/tests/thrusection/not_solids/T5 b/tests/thrusection/not_solids/T5
old mode 100755
new mode 100644
index 402f6e1513..227dd66923
--- a/tests/thrusection/not_solids/T5
+++ b/tests/thrusection/not_solids/T5
@@ -1,5 +1,5 @@
-restore C6 w1
-restore C12 w2
+restore [locate_data_file C6] w1
+restore [locate_data_file C12] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1516.01
diff --git a/tests/thrusection/not_solids/T6 b/tests/thrusection/not_solids/T6
old mode 100755
new mode 100644
index ebe2c82b66..b5254f525b
--- a/tests/thrusection/not_solids/T6
+++ b/tests/thrusection/not_solids/T6
@@ -1,4 +1,4 @@
-restore C6 w1
-restore C13 w2
+restore [locate_data_file C6] w1
+restore [locate_data_file C13] w2
 thrusections result 0 0 w1 w2
 set square 972.397
diff --git a/tests/thrusection/not_solids/T7 b/tests/thrusection/not_solids/T7
old mode 100755
new mode 100644
index b0fbfcc327..1412c6c63a
--- a/tests/thrusection/not_solids/T7
+++ b/tests/thrusection/not_solids/T7
@@ -1,5 +1,5 @@
-restore C7 w1
-restore C10 w2
+restore [locate_data_file C7] w1
+restore [locate_data_file C10] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1507.96
diff --git a/tests/thrusection/not_solids/T8 b/tests/thrusection/not_solids/T8
old mode 100755
new mode 100644
index 25c9019cf2..342b92e5b2
--- a/tests/thrusection/not_solids/T8
+++ b/tests/thrusection/not_solids/T8
@@ -1,5 +1,5 @@
-restore C7 w1
-restore C11 w2
+restore [locate_data_file C7] w1
+restore [locate_data_file C11] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1507.96
diff --git a/tests/thrusection/not_solids/T9 b/tests/thrusection/not_solids/T9
old mode 100755
new mode 100644
index b744acb18f..097b4f4001
--- a/tests/thrusection/not_solids/T9
+++ b/tests/thrusection/not_solids/T9
@@ -1,5 +1,5 @@
-restore C7 w1
-restore C12 w2
+restore [locate_data_file C7] w1
+restore [locate_data_file C12] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1314
diff --git a/tests/thrusection/not_solids/U1 b/tests/thrusection/not_solids/U1
old mode 100755
new mode 100644
index f4006ca1a4..3aeb0a6cf2
--- a/tests/thrusection/not_solids/U1
+++ b/tests/thrusection/not_solids/U1
@@ -1,4 +1,4 @@
-restore C7 w1
-restore C13 w2
+restore [locate_data_file C7] w1
+restore [locate_data_file C13] w2
 thrusections result 0 0 w1 w2
 set square 762.417
diff --git a/tests/thrusection/not_solids/U2 b/tests/thrusection/not_solids/U2
old mode 100755
new mode 100644
index 877083b8c7..83871a22cc
--- a/tests/thrusection/not_solids/U2
+++ b/tests/thrusection/not_solids/U2
@@ -1,5 +1,5 @@
-restore C8 w1
-restore C10 w2
+restore [locate_data_file C8] w1
+restore [locate_data_file C10] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1507.96
diff --git a/tests/thrusection/not_solids/U3 b/tests/thrusection/not_solids/U3
old mode 100755
new mode 100644
index 1d8e53cc03..d411b688fb
--- a/tests/thrusection/not_solids/U3
+++ b/tests/thrusection/not_solids/U3
@@ -1,5 +1,5 @@
-restore C8 w1
-restore C11 w2
+restore [locate_data_file C8] w1
+restore [locate_data_file C11] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1507.96
diff --git a/tests/thrusection/not_solids/U4 b/tests/thrusection/not_solids/U4
old mode 100755
new mode 100644
index 8254d87db2..dcf604f7a2
--- a/tests/thrusection/not_solids/U4
+++ b/tests/thrusection/not_solids/U4
@@ -1,5 +1,5 @@
-restore C8 w1
-restore C12 w2
+restore [locate_data_file C8] w1
+restore [locate_data_file C12] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1314
diff --git a/tests/thrusection/not_solids/U5 b/tests/thrusection/not_solids/U5
old mode 100755
new mode 100644
index 43d3794127..47b9dcf441
--- a/tests/thrusection/not_solids/U5
+++ b/tests/thrusection/not_solids/U5
@@ -1,4 +1,4 @@
-restore C8 w1
-restore C13 w2
+restore [locate_data_file C8] w1
+restore [locate_data_file C13] w2
 thrusections result 0 0 w1 w2
 set square 762.417
diff --git a/tests/thrusection/not_solids/U6 b/tests/thrusection/not_solids/U6
old mode 100755
new mode 100644
index 54ad58153a..71a3b87c7e
--- a/tests/thrusection/not_solids/U6
+++ b/tests/thrusection/not_solids/U6
@@ -1,5 +1,5 @@
-restore C9 w1
-restore C10 w2
+restore [locate_data_file C9] w1
+restore [locate_data_file C10] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1314
diff --git a/tests/thrusection/not_solids/U7 b/tests/thrusection/not_solids/U7
old mode 100755
new mode 100644
index f2bd2d2a65..4c9fa0bceb
--- a/tests/thrusection/not_solids/U7
+++ b/tests/thrusection/not_solids/U7
@@ -1,5 +1,5 @@
-restore C9 w1
-restore C11 w2
+restore [locate_data_file C9] w1
+restore [locate_data_file C11] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1314
diff --git a/tests/thrusection/not_solids/U8 b/tests/thrusection/not_solids/U8
old mode 100755
new mode 100644
index 63b891e292..984c109b70
--- a/tests/thrusection/not_solids/U8
+++ b/tests/thrusection/not_solids/U8
@@ -1,5 +1,5 @@
-restore C9 w1
-restore C12 w2
+restore [locate_data_file C9] w1
+restore [locate_data_file C12] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1131.35
diff --git a/tests/thrusection/not_solids/U9 b/tests/thrusection/not_solids/U9
old mode 100755
new mode 100644
index 1784ecf38e..7500d03dd7
--- a/tests/thrusection/not_solids/U9
+++ b/tests/thrusection/not_solids/U9
@@ -1,4 +1,4 @@
-restore C9 w1
-restore C13 w2
+restore [locate_data_file C9] w1
+restore [locate_data_file C13] w2
 thrusections result 0 0 w1 w2
 set square 572.05
diff --git a/tests/thrusection/not_solids/V1 b/tests/thrusection/not_solids/V1
old mode 100755
new mode 100644
index ae24b035fb..19ad0d9b86
--- a/tests/thrusection/not_solids/V1
+++ b/tests/thrusection/not_solids/V1
@@ -1,5 +1,5 @@
-restore C10 w1
-restore C10 w2
+restore [locate_data_file C10] w1
+restore [locate_data_file C10] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1507.96
diff --git a/tests/thrusection/not_solids/V2 b/tests/thrusection/not_solids/V2
old mode 100755
new mode 100644
index cdb08c4a41..063183169d
--- a/tests/thrusection/not_solids/V2
+++ b/tests/thrusection/not_solids/V2
@@ -1,5 +1,5 @@
-restore C10 w1
-restore C11 w2
+restore [locate_data_file C10] w1
+restore [locate_data_file C11] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1507.96
diff --git a/tests/thrusection/not_solids/V3 b/tests/thrusection/not_solids/V3
old mode 100755
new mode 100644
index da497f1373..5ef6ac9885
--- a/tests/thrusection/not_solids/V3
+++ b/tests/thrusection/not_solids/V3
@@ -1,5 +1,5 @@
-restore C10 w1
-restore C12 w2
+restore [locate_data_file C10] w1
+restore [locate_data_file C12] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1314
diff --git a/tests/thrusection/not_solids/V4 b/tests/thrusection/not_solids/V4
old mode 100755
new mode 100644
index 29c6f71ee7..ea20049759
--- a/tests/thrusection/not_solids/V4
+++ b/tests/thrusection/not_solids/V4
@@ -1,4 +1,4 @@
-restore C10 w1
-restore C13 w2
+restore [locate_data_file C10] w1
+restore [locate_data_file C13] w2
 thrusections result 0 0 w1 w2
 set square 762.417
diff --git a/tests/thrusection/not_solids/V5 b/tests/thrusection/not_solids/V5
old mode 100755
new mode 100644
index ecae59ae12..1f880290be
--- a/tests/thrusection/not_solids/V5
+++ b/tests/thrusection/not_solids/V5
@@ -1,5 +1,5 @@
-restore C11 w1
-restore C10 w2
+restore [locate_data_file C11] w1
+restore [locate_data_file C10] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1507.96
diff --git a/tests/thrusection/not_solids/V6 b/tests/thrusection/not_solids/V6
old mode 100755
new mode 100644
index 5276a7b5d0..aed5dd7e91
--- a/tests/thrusection/not_solids/V6
+++ b/tests/thrusection/not_solids/V6
@@ -1,5 +1,5 @@
-restore C11 w1
-restore C11 w2
+restore [locate_data_file C11] w1
+restore [locate_data_file C11] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1507.96
diff --git a/tests/thrusection/not_solids/V7 b/tests/thrusection/not_solids/V7
old mode 100755
new mode 100644
index 50a731bdda..7fe531d577
--- a/tests/thrusection/not_solids/V7
+++ b/tests/thrusection/not_solids/V7
@@ -1,5 +1,5 @@
-restore C11 w1
-restore C12 w2
+restore [locate_data_file C11] w1
+restore [locate_data_file C12] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1314
diff --git a/tests/thrusection/not_solids/V8 b/tests/thrusection/not_solids/V8
old mode 100755
new mode 100644
index 2eb0c09168..1fbacad28f
--- a/tests/thrusection/not_solids/V8
+++ b/tests/thrusection/not_solids/V8
@@ -1,4 +1,4 @@
-restore C11 w1
-restore C13 w2
+restore [locate_data_file C11] w1
+restore [locate_data_file C13] w2
 thrusections result 0 0 w1 w2
 set square 762.417
diff --git a/tests/thrusection/not_solids/V9 b/tests/thrusection/not_solids/V9
old mode 100755
new mode 100644
index 1a8d498625..bce7eb420a
--- a/tests/thrusection/not_solids/V9
+++ b/tests/thrusection/not_solids/V9
@@ -1,5 +1,5 @@
-restore C12 w1
-restore C10 w2
+restore [locate_data_file C12] w1
+restore [locate_data_file C10] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1314
diff --git a/tests/thrusection/not_solids/W1 b/tests/thrusection/not_solids/W1
old mode 100755
new mode 100644
index 571085b0fc..a96526b920
--- a/tests/thrusection/not_solids/W1
+++ b/tests/thrusection/not_solids/W1
@@ -1,5 +1,5 @@
-restore C12 w1
-restore C11 w2
+restore [locate_data_file C12] w1
+restore [locate_data_file C11] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1314
diff --git a/tests/thrusection/not_solids/W2 b/tests/thrusection/not_solids/W2
old mode 100755
new mode 100644
index 02cc162f18..5ec0b30a24
--- a/tests/thrusection/not_solids/W2
+++ b/tests/thrusection/not_solids/W2
@@ -1,5 +1,5 @@
-restore C12 w1
-restore C12 w2
+restore [locate_data_file C12] w1
+restore [locate_data_file C12] w2
 ttranslate w2 0 0 40
 thrusections result 0 0 w1 w2
 set square 1131.35
diff --git a/tests/thrusection/not_solids/W3 b/tests/thrusection/not_solids/W3
old mode 100755
new mode 100644
index 25c21d4d0a..c598544f73
--- a/tests/thrusection/not_solids/W3
+++ b/tests/thrusection/not_solids/W3
@@ -1,4 +1,4 @@
-restore C12 w1
-restore C13 w2
+restore [locate_data_file C12] w1
+restore [locate_data_file C13] w2
 thrusections result 0 0 w1 w2
 set square 572.05
diff --git a/tests/thrusection/not_solids/W4 b/tests/thrusection/not_solids/W4
old mode 100755
new mode 100644
index 22c9f8153f..076cd416a1
--- a/tests/thrusection/not_solids/W4
+++ b/tests/thrusection/not_solids/W4
@@ -1,4 +1,4 @@
-restore C13 w1
-restore C10 w2
+restore [locate_data_file C13] w1
+restore [locate_data_file C10] w2
 thrusections result 0 0 w1 w2
 set square 762.417
diff --git a/tests/thrusection/not_solids/W5 b/tests/thrusection/not_solids/W5
old mode 100755
new mode 100644
index 1b1b11bf0b..eb9d473628
--- a/tests/thrusection/not_solids/W5
+++ b/tests/thrusection/not_solids/W5
@@ -1,4 +1,4 @@
-restore C13 w1
-restore C11 w2
+restore [locate_data_file C13] w1
+restore [locate_data_file C11] w2
 thrusections result 0 0 w1 w2
 set square 762.417
diff --git a/tests/thrusection/not_solids/W6 b/tests/thrusection/not_solids/W6
old mode 100755
new mode 100644
index 8f821dc6d7..e189ef579e
--- a/tests/thrusection/not_solids/W6
+++ b/tests/thrusection/not_solids/W6
@@ -1,4 +1,4 @@
-restore C13 w1
-restore C12 w2
+restore [locate_data_file C13] w1
+restore [locate_data_file C12] w2
 thrusections result 0 0 w1 w2
 set square 572.05
diff --git a/tests/thrusection/not_solids/W7 b/tests/thrusection/not_solids/W7
old mode 100755
new mode 100644
index 0df5a8a058..a189f46d32
--- a/tests/thrusection/not_solids/W7
+++ b/tests/thrusection/not_solids/W7
@@ -1,5 +1,5 @@
-restore buc60281_1.rle w1
-restore buc60281_2.rle w2
-restore buc60281_3.rle w3
+restore [locate_data_file buc60281_1.rle] w1
+restore [locate_data_file buc60281_2.rle] w2
+restore [locate_data_file buc60281_3.rle] w3
 thrusections result 0 0 w1 w2 w3
 set square 476995
diff --git a/tests/thrusection/not_solids/W8 b/tests/thrusection/not_solids/W8
old mode 100755
new mode 100644
index 918e5d66dd..73e023719b
--- a/tests/thrusection/not_solids/W8
+++ b/tests/thrusection/not_solids/W8
@@ -1,5 +1,5 @@
 dall
-restore buc60318.rle w 
+restore [locate_data_file buc60318.rle] w 
 explode w W 
 thrusections result 0 0 w_1 w_2 w_3 w_4 w_5 
 set square 254109
diff --git a/tests/thrusection/solids/A1 b/tests/thrusection/solids/A1
old mode 100755
new mode 100644
index 1ade23d6d7..91851d33a1
--- a/tests/thrusection/solids/A1
+++ b/tests/thrusection/solids/A1
@@ -1,6 +1,6 @@
-restore cts21295_1.brep f1
-restore cts21295_2.brep f2
-restore cts21295_3.brep f3
+restore [locate_data_file cts21295_1.brep] f1
+restore [locate_data_file cts21295_2.brep] f2
+restore [locate_data_file cts21295_3.brep] f3
 explode f1 w
 explode f2 w
 explode f3 w
diff --git a/tests/thrusection/solids/A2 b/tests/thrusection/solids/A2
old mode 100755
new mode 100644
index 978a2ea594..85908c720a
--- a/tests/thrusection/solids/A2
+++ b/tests/thrusection/solids/A2
@@ -1,5 +1,5 @@
 puts "TODO OCC23126 ALL: Faulty shapes in variables faulty_1 to faulty_3"
-restore cts21570_1.rle w1
-restore cts21570_2.rle w2
+restore [locate_data_file cts21570_1.rle] w1
+restore [locate_data_file cts21570_2.rle] w2
 thrusections result 1 0 w1 w2
 set square 29817.5
diff --git a/tests/thrusection/solids/A3 b/tests/thrusection/solids/A3
old mode 100755
new mode 100644
index 7e7347fecb..aecb56e4df
--- a/tests/thrusection/solids/A3
+++ b/tests/thrusection/solids/A3
@@ -1,5 +1,5 @@
 puts "TODO OCC23126 ALL: Faulty shapes in variables faulty_1 to faulty_3"
-restore cts21570_1.rle w1
-restore cts21570_2.rle w2
+restore [locate_data_file cts21570_1.rle] w1
+restore [locate_data_file cts21570_2.rle] w2
 thrusections result 1 0 w2 w1
 set square 29817.5
diff --git a/tests/thrusection/solids/A4 b/tests/thrusection/solids/A4
old mode 100755
new mode 100644
index aa6b6b7ce1..661023568f
--- a/tests/thrusection/solids/A4
+++ b/tests/thrusection/solids/A4
@@ -1,6 +1,6 @@
 puts "TODO OCC23126 ALL: Faulty shapes in variables faulty_1 to faulty_3"
-restore cts21570_1.rle w1
-restore cts21570_2.rle w2
+restore [locate_data_file cts21570_1.rle] w1
+restore [locate_data_file cts21570_2.rle] w2
 orientation w1 F
 thrusections result 1 0 w1 w2
 set square 29817.5
diff --git a/tests/thrusection/solids/A5 b/tests/thrusection/solids/A5
old mode 100755
new mode 100644
index b6f56d034f..844d958de3
--- a/tests/thrusection/solids/A5
+++ b/tests/thrusection/solids/A5
@@ -1,6 +1,6 @@
 puts "TODO OCC23126 ALL: Faulty shapes in variables faulty_1 to faulty_3"
-restore cts21570_1.rle w1
-restore cts21570_2.rle w2
+restore [locate_data_file cts21570_1.rle] w1
+restore [locate_data_file cts21570_2.rle] w2
 orientation w1 F
 thrusections result 1 0 w2 w1
 set square 29817.5
diff --git a/tests/thrusection/solids/A6 b/tests/thrusection/solids/A6
old mode 100755
new mode 100644
index 0e7c8c17c3..7ba6e89610
--- a/tests/thrusection/solids/A6
+++ b/tests/thrusection/solids/A6
@@ -1,6 +1,6 @@
 puts "TODO OCC23126 ALL: Faulty shapes in variables faulty_1 to faulty_3"
-restore cts21570_1.rle w1
-restore cts21570_2.rle w2
+restore [locate_data_file cts21570_1.rle] w1
+restore [locate_data_file cts21570_2.rle] w2
 orientation w1 F
 orientation w2 R
 thrusections result 1 0 w1 w2
diff --git a/tests/thrusection/solids/A7 b/tests/thrusection/solids/A7
old mode 100755
new mode 100644
index 296e332ba6..6361ca8d8b
--- a/tests/thrusection/solids/A7
+++ b/tests/thrusection/solids/A7
@@ -1,6 +1,6 @@
 puts "TODO OCC23126 ALL: Faulty shapes in variables faulty_1 to faulty_3"
-restore cts21570_1.rle w1
-restore cts21570_2.rle w2
+restore [locate_data_file cts21570_1.rle] w1
+restore [locate_data_file cts21570_2.rle] w2
 orientation w1 F
 orientation w2 R
 thrusections result 1 0 w2 w1
diff --git a/tests/thrusection/solids/A8 b/tests/thrusection/solids/A8
old mode 100755
new mode 100644
index ad267c0c9f..77bbe74864
--- a/tests/thrusection/solids/A8
+++ b/tests/thrusection/solids/A8
@@ -1,6 +1,6 @@
 puts "TODO OCC23126 ALL: Faulty shapes in variables faulty_1 to faulty_3"
-restore cts21570_1.rle w1
-restore cts21570_2.rle w2
+restore [locate_data_file cts21570_1.rle] w1
+restore [locate_data_file cts21570_2.rle] w2
 orientation w1 F
 orientation w2 R
 orientation w1 R
diff --git a/tests/thrusection/solids/A9 b/tests/thrusection/solids/A9
old mode 100755
new mode 100644
index ac08225d09..d6e67938a9
--- a/tests/thrusection/solids/A9
+++ b/tests/thrusection/solids/A9
@@ -1,6 +1,6 @@
 puts "TODO OCC23126 ALL: Faulty shapes in variables faulty_1 to faulty_3"
-restore cts21570_1.rle w1
-restore cts21570_2.rle w2
+restore [locate_data_file cts21570_1.rle] w1
+restore [locate_data_file cts21570_2.rle] w2
 orientation w1 F
 orientation w2 R
 orientation w1 R