--- tests/tests.sh.orig	2020-06-06 13:50:47.000000000 -0700
+++ tests/tests.sh	2020-06-06 13:36:22.000000000 -0700
@@ -12,6 +12,8 @@
 # STRUCTURES: molecules & crystals examples
 # ------------------------------------------------------------------------
 
+cd $XCRYSDEN_SCRATCH
+
 structures() {
     echo "1. Executing MOLECULES examples ..." >> $message_file
     xcrysden -s $here/molecules.tcl
@@ -76,15 +79,13 @@
 # Scripting examples
 # ------------------------------------------------------------------------
 scripting() {
-    cd $base/Scripting
-
     echo "
-5. Executing Scripting examples ..." >> $message_file
+6. Executing Scripting examples ..." >> $message_file
     
-    for file in *.tcl
+    for file in $base/Scripting/*.tcl
       do
-      echo "   5.x Executing Scripting example: $file ..." >> $message_file
-      
+      echo "   6.x Executing Scripting example: $file ..." >> $message_file
+
       xcrysden -s $file
     done
 }