diff --git a/testsuite/config/base-config.exp b/testsuite/config/base-config.exp
index 10d131f8..dceea74c 100644
--- a/testsuite/config/base-config.exp
+++ b/testsuite/config/base-config.exp
@@ -1224,7 +1224,17 @@ proc setenv_path_var {var args} {
             incr refcnt($arg)
         }
     }
-    setenv_var __MODULES_SHARE_$var [join [array get refcnt] ":"]
+    # remove elements only added once (not to register them in ref count var)
+    foreach elt [array names refcnt] {
+        if {$refcnt($elt) == 1 && $elt ne {}} {
+            unset refcnt($elt)
+        }
+    }
+    if {[array size refcnt] > 0} {
+        setenv_var __MODULES_SHARE_$var [join [array get refcnt] ":"]
+    } else {
+        unsetenv_var __MODULES_SHARE_$var
+    }
 }
 
 proc unsetenv_loaded_module {} {
diff --git a/testsuite/modules.00-init/120-siteconfig.exp b/testsuite/modules.00-init/120-siteconfig.exp
index 1022c1d1..02550044 100644
--- a/testsuite/modules.00-init/120-siteconfig.exp
+++ b/testsuite/modules.00-init/120-siteconfig.exp
@@ -321,15 +321,13 @@ if { $verbose > 0 } {
 set env(TESTSUITE_ENABLE_SITECONFIG_WINDOWS_PLATFORM) 1
 
 set env(PATH) "/path/to/dir1"
-set env(__MODULES_SHARE_PATH) "/path/to/dir1;1"
 set module "append/2.0"
 set modulefile "$modpath/$module"
 
 set ans [list]
-lappend ans [list setpath PATH "/path/to/dir1;/this/is/the/modules/testsuite"]
+lappend ans [list set PATH "/path/to/dir1;/this/is/the/modules/testsuite"]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
-lappend ans [list set __MODULES_SHARE_PATH "/path/to/dir1;1;/this/is/the/modules/testsuite;1"]
 testouterr_cmd "cmd" "load $module" $ans ""
 
 set env(PATH) $ORIG_PATH
diff --git a/testsuite/modules.10-use/030-use.exp b/testsuite/modules.10-use/030-use.exp
index 39e6926b..7f6f2af2 100644
--- a/testsuite/modules.10-use/030-use.exp
+++ b/testsuite/modules.10-use/030-use.exp
@@ -43,7 +43,7 @@ set use	"use"
 # The tests ...
 #
 
-lappend ans [list setpath MODULEPATH $mod_path]
+lappend ans [list set MODULEPATH $mod_path]
 test_cmd_re "ALL" "$use $path" $ans
 
 skip_if_quick_mode
@@ -66,7 +66,7 @@ test_cmd_re "sh" "$use $extravapath" $ans
 #
 
 set ans [list]
-lappend ans [list setpath MODULEPATH $badpath:$modpath]
+lappend ans [list set MODULEPATH $badpath:$modpath]
 testouterr_cmd_re "ALL" "$use $badpath" $ans {}
 
 #
@@ -76,7 +76,7 @@ testouterr_cmd_re "ALL" "$use $badpath" $ans {}
 unsetenv_path_var MODULEPATH
 
 set ans [list]
-lappend ans [list setpath MODULEPATH $path]
+lappend ans [list set MODULEPATH $path]
 test_cmd_re "ALL" "$use $path" $ans
 
 # list currently enabled paths
diff --git a/testsuite/modules.10-use/031-append.exp b/testsuite/modules.10-use/031-append.exp
index f4ef78ed..441e4de1 100644
--- a/testsuite/modules.10-use/031-append.exp
+++ b/testsuite/modules.10-use/031-append.exp
@@ -37,7 +37,7 @@ set use	"use --append"
 # The tests ...
 #
 
-lappend ans [list setpath MODULEPATH $mod_path]
+lappend ans [list set MODULEPATH $mod_path]
 test_cmd_re "ALL" "$use $path" $ans
 
 #
@@ -45,7 +45,7 @@ test_cmd_re "ALL" "$use $path" $ans
 #
 
 set ans [list]
-lappend ans [list setpath MODULEPATH $modpath:$badpath]
+lappend ans [list set MODULEPATH $modpath:$badpath]
 testouterr_cmd_re "ALL" "$use $badpath" $ans {}
 
 #
@@ -55,7 +55,7 @@ testouterr_cmd_re "ALL" "$use $badpath" $ans {}
 unsetenv_path_var MODULEPATH
 
 set ans [list]
-lappend ans [list setpath MODULEPATH $path]
+lappend ans [list set MODULEPATH $path]
 test_cmd_re "ALL" "$use $path" $ans
 
 setenv_path_var MODULEPATH $modpath
diff --git a/testsuite/modules.10-use/032-prepend.exp b/testsuite/modules.10-use/032-prepend.exp
index c51141fd..11f240b8 100644
--- a/testsuite/modules.10-use/032-prepend.exp
+++ b/testsuite/modules.10-use/032-prepend.exp
@@ -37,7 +37,7 @@ set use	"use --prepend"
 # The tests ...
 #
 
-lappend ans [list setpath MODULEPATH $mod_path]
+lappend ans [list set MODULEPATH $mod_path]
 test_cmd_re "ALL" "$use $path" $ans
 
 #
@@ -45,7 +45,7 @@ test_cmd_re "ALL" "$use $path" $ans
 #
 
 set ans [list]
-lappend ans [list setpath MODULEPATH $badpath:$modpath]
+lappend ans [list set MODULEPATH $badpath:$modpath]
 testouterr_cmd_re "ALL" "$use $badpath" $ans {}
 
 #
@@ -55,7 +55,7 @@ testouterr_cmd_re "ALL" "$use $badpath" $ans {}
 unsetenv_path_var MODULEPATH
 
 set ans [list]
-lappend ans [list setpath MODULEPATH $path]
+lappend ans [list set MODULEPATH $path]
 test_cmd_re "ALL" "$use $path" $ans
 
 setenv_path_var MODULEPATH $modpath
diff --git a/testsuite/modules.10-use/040-load-use.exp b/testsuite/modules.10-use/040-load-use.exp
index 90ee5868..c0e2fee7 100644
--- a/testsuite/modules.10-use/040-load-use.exp
+++ b/testsuite/modules.10-use/040-load-use.exp
@@ -38,11 +38,11 @@ if {[is_conf_enabled advversspec implicitdefault]} {
 } else {
     set autosym {}
 }
-lappend ans [list setpath MODULEPATH "$newpath:$oldpath"]
-lappend ans [list set LOADEDMODULES "use/1.0:1.1/version"]
-lappend ans [list set _LMFILES_ "$oldpath/use/1.0:$newpath/1.1/version"]
 lappend ans [list set __MODULES_LMALTNAME "use/1.0&use/default&use$autosym"]
 lappend ans [list set TESTSUITE "1.1"]
+lappend ans [list set _LMFILES_ "$oldpath/use/1.0:$newpath/1.1/version"]
+lappend ans [list set LOADEDMODULES "use/1.0:1.1/version"]
+lappend ans [list set MODULEPATH "$newpath:$oldpath"]
 test_cmd_re "ALL" "$use" $ans
 
 #
diff --git a/testsuite/modules.10-use/070-unuse.exp b/testsuite/modules.10-use/070-unuse.exp
index 27f12643..905cd928 100644
--- a/testsuite/modules.10-use/070-unuse.exp
+++ b/testsuite/modules.10-use/070-unuse.exp
@@ -54,7 +54,7 @@ testouterr_cmd_re "ALL" "$use $badpath" "OK" "$bad_use"
 #   do these last so the .modulesbeginenv is left in a good state for 070-Maint
 #
 
-lappend ans [list setpath MODULEPATH $modpath]
+lappend ans [list set MODULEPATH $modpath]
 test_cmd_re "ALL" "$use $path" $ans
 
 skip_if_quick_mode
@@ -67,7 +67,8 @@ setenv_path_var MODULEPATH $path {} $modpath
 
 set ans [list]
 # empty dir elements are ignored but stick to the variable, they should be removed
-lappend ans [list setpath MODULEPATH ":$modpath"]
+lappend ans [list set __MODULES_SHARE_MODULEPATH :1]
+lappend ans [list set MODULEPATH ":$modpath"]
 test_cmd_re "sh" "$use $path" $ans
 
 setenv_path_var MODULEPATH $path $modpath
@@ -78,7 +79,7 @@ setenv_path_var MODULEPATH $path $modpath
 #
 
 set ans [list]
-lappend ans [list setpath MODULEPATH $modpath]
+lappend ans [list set MODULEPATH $modpath]
 test_cmd_re "ALL" "$use $relpath" $ans
 
 #
@@ -98,12 +99,12 @@ testouterr_cmd "ALL" "$use" "OK" "$path_list_header\n  $path\n  $modpath"
 # test removing dir enabled multiple times
 #
 
-setenv_var __MODULES_SHARE_MODULEPATH "$path:2:$modpath:1"
+setenv_var __MODULES_SHARE_MODULEPATH "$path:2"
 
 # dir not removed if ref counter > 1, should be changed in next major version
 # as commands sends from the command-line should by-pass any ref counter
 set ans [list]
-lappend ans [list set __MODULES_SHARE_MODULEPATH "$path:1:$modpath:1"]
+lappend ans [list unset __MODULES_SHARE_MODULEPATH]
 lappend ans [list set MODULEPATH "$path:$modpath"]
 testouterr_cmd "sh" "$use $path" $ans "$warn_msgs: Did not unuse $path"
 
diff --git a/testsuite/modules.10-use/080-access-use.exp b/testsuite/modules.10-use/080-access-use.exp
index ee07ebfc..bc0a2806 100644
--- a/testsuite/modules.10-use/080-access-use.exp
+++ b/testsuite/modules.10-use/080-access-use.exp
@@ -46,7 +46,6 @@ unsetenv_path_var MODULEPATH
 change_file_perms $modpath $hide_perms
 
 # normal enabling, as no directory access
-lappend ans [list set __MODULES_SHARE_MODULEPATH "$modpath:1"]
 lappend ans [list set MODULEPATH $modpath]
 testouterr_cmd "sh" "use $modpath" $ans ""
 
@@ -110,7 +109,7 @@ if {$is_locked_dir_file_readable} {
 
 # normal disabling, as no directory access
 set ans [list]
-lappend ans [list unsetpath MODULEPATH]
+lappend ans [list unset MODULEPATH]
 testouterr_cmd "sh" "unuse $modpath" $ans ""
 
 restore_file_perms $modpath
diff --git a/testsuite/modules.10-use/090-bad.exp b/testsuite/modules.10-use/090-bad.exp
index 51e892e6..165f429c 100644
--- a/testsuite/modules.10-use/090-bad.exp
+++ b/testsuite/modules.10-use/090-bad.exp
@@ -58,7 +58,7 @@ testouterr_cmd "sh" "avail -t $module" "OK" ""
 #
 
 # normal disabling, as no directory access
-lappend ans [list unsetpath MODULEPATH]
+lappend ans [list unset MODULEPATH]
 testouterr_cmd "sh" "unuse $file_modpath" $ans ""
 
 
diff --git a/testsuite/modules.20-locate/100-wspace.exp b/testsuite/modules.20-locate/100-wspace.exp
index b4ccf9c4..bda5a2bc 100644
--- a/testsuite/modules.20-locate/100-wspace.exp
+++ b/testsuite/modules.20-locate/100-wspace.exp
@@ -637,10 +637,10 @@ testouterr_cmd sh {display un\ k} ERR "$err_path'{un k}'"
 
 # add another modulepath
 set ans [list]
-lappend ans [list setpath MODULEPATH "$modpath:$mp"]
+lappend ans [list set MODULEPATH "$modpath:$mp"]
 testouterr_cmd_re sh "use $modpath" $ans {}
 set ans [list]
-lappend ans [list unsetpath MODULEPATH]
+lappend ans [list unset MODULEPATH]
 testouterr_cmd sh "unuse $modpath\\ wspac\\ " $ans {}
 
 # module whose name and target finish with space character
diff --git a/testsuite/modules.20-locate/118-hidden-loaded.exp b/testsuite/modules.20-locate/118-hidden-loaded.exp
index 56453916..bf67d62b 100644
--- a/testsuite/modules.20-locate/118-hidden-loaded.exp
+++ b/testsuite/modules.20-locate/118-hidden-loaded.exp
@@ -203,11 +203,12 @@ testouterr_cmd_re sh {--verbose restore --verbose testsuite/home/coll-hide-once-
 # work on scriptfile located in current dir to cope with the relative path definition set in it
 file copy testsuite/home/coll-hide-once-loaded coll-hide-once-loaded
 set ans [list]
-lappend ans [list set LOADEDMODULES hide3/1.0:hidereq/4.1]
-lappend ans [list set _LMFILES_ $mp/hide3/1.0:$mp/hidereq/4.1]
-lappend ans [list setpath MODULEPATH $mp]
-lappend ans [list set __MODULES_LMTAG hide3/1.0&hidden-loaded]
 lappend ans [list set __MODULES_LMALTNAME hide3/1.0&as|hide3/default&as|hide3/latest]
+lappend ans [list set _LMFILES_ $mp/hide3/1.0:$mp/hidereq/4.1]
+lappend ans [list set LOADEDMODULES hide3/1.0:hidereq/4.1]
+lappend ans [list set __MODULES_LMTAG hide3/1.0&hidden-loaded]
+lappend ans [list set __MODULES_SHARE_MODULEPATH $mp:2]
+lappend ans [list set MODULEPATH $mp]
 testouterr_cmd_re sh {source coll-hide-once-loaded} $ans "Loading hide3/1.0\n$no_loaded\nLoading hidereq/4.1"
 testouterr_cmd_re sh {source -vv coll-hide-once-loaded} $ans "Loading hide3/1.0\n$no_loaded\nLoading hidereq/4.1"
 file delete coll-hide-once-loaded
diff --git a/testsuite/modules.50-cmds/015-use.exp b/testsuite/modules.50-cmds/015-use.exp
index 6cfff385..3592df36 100644
--- a/testsuite/modules.50-cmds/015-use.exp
+++ b/testsuite/modules.50-cmds/015-use.exp
@@ -56,10 +56,10 @@ set modulefile9 "$path1/$module9"
 #  The tests (use)
 #
 
-lappend ans [list setpath MODULEPATH "$path2:$path1"]
 lappend ans [list set __MODULES_LMALTNAME "$module1&use/default&use"]
-lappend ans [list set LOADEDMODULES $module1]
 lappend ans [list set _LMFILES_ $modulefile1]
+lappend ans [list set LOADEDMODULES $module1]
+lappend ans [list set MODULEPATH "$path2:$path1"]
 
 test_cmd_re "ALL" "load $module1" $ans
 
@@ -70,9 +70,9 @@ skip_if_quick_mode
 #
 
 set ans [list]
-lappend ans [list setpath MODULEPATH "$path1:$path2"]
-lappend ans [list set LOADEDMODULES $module2]
 lappend ans [list set _LMFILES_ $modulefile2]
+lappend ans [list set LOADEDMODULES $module2]
+lappend ans [list set MODULEPATH "$path1:$path2"]
 
 test_cmd_re "ALL" "load $module2" $ans
 
@@ -81,9 +81,9 @@ test_cmd_re "ALL" "load $module2" $ans
 #
 
 set ans [list]
-lappend ans [list setpath MODULEPATH "$path1:$path2"]
-lappend ans [list set LOADEDMODULES $module3]
 lappend ans [list set _LMFILES_ $modulefile3]
+lappend ans [list set LOADEDMODULES $module3]
+lappend ans [list set MODULEPATH "$path1:$path2"]
 
 test_cmd_re "ALL" "load $module3" $ans
 
@@ -93,9 +93,9 @@ test_cmd_re "ALL" "load $module3" $ans
 #
 
 set ans [list]
-lappend ans [list setpath MODULEPATH "$path1:$path2"]
-lappend ans [list set LOADEDMODULES $module4]
 lappend ans [list set _LMFILES_ $modulefile4]
+lappend ans [list set LOADEDMODULES $module4]
+lappend ans [list set MODULEPATH "$path1:$path2"]
 
 test_cmd_re "ALL" "load $module4" $ans
 
@@ -104,9 +104,9 @@ test_cmd_re "ALL" "load $module4" $ans
 #
 
 set ans [list]
-lappend ans [list setpath MODULEPATH "$path2:$path1"]
-lappend ans [list set LOADEDMODULES $module5]
 lappend ans [list set _LMFILES_ $modulefile5]
+lappend ans [list set LOADEDMODULES $module5]
+lappend ans [list set MODULEPATH "$path2:$path1"]
 
 test_cmd_re "ALL" "load $module5" $ans
 
@@ -115,9 +115,9 @@ test_cmd_re "ALL" "load $module5" $ans
 #
 
 set ans [list]
-lappend ans [list setpath MODULEPATH "$path2:$path1"]
-lappend ans [list set LOADEDMODULES $module6]
 lappend ans [list set _LMFILES_ $modulefile6]
+lappend ans [list set LOADEDMODULES $module6]
+lappend ans [list set MODULEPATH "$path2:$path1"]
 
 test_cmd_re "ALL" "load $module6" $ans
 
@@ -127,9 +127,9 @@ test_cmd_re "ALL" "load $module6" $ans
 #
 
 set ans [list]
-lappend ans [list setpath MODULEPATH "$path2:$path1"]
-lappend ans [list set LOADEDMODULES $module7]
 lappend ans [list set _LMFILES_ $modulefile7]
+lappend ans [list set LOADEDMODULES $module7]
+lappend ans [list set MODULEPATH "$path2:$path1"]
 
 test_cmd_re "ALL" "load $module7" $ans
 
@@ -151,9 +151,9 @@ testouterr_cmd_re "ALL" "load $module8" $ans [msg_load $module8 $err_msg]
 #
 
 set ans [list]
-lappend ans [list setpath MODULEPATH "$path2:$path1"]
-lappend ans [list set LOADEDMODULES $module9]
 lappend ans [list set _LMFILES_ $modulefile9]
+lappend ans [list set LOADEDMODULES $module9]
+lappend ans [list set MODULEPATH "$path2:$path1"]
 
 test_cmd_re "sh" "load $module9" $ans
 
diff --git a/testsuite/modules.50-cmds/017-use-undo.exp b/testsuite/modules.50-cmds/017-use-undo.exp
index 11d89028..82430445 100644
--- a/testsuite/modules.50-cmds/017-use-undo.exp
+++ b/testsuite/modules.50-cmds/017-use-undo.exp
@@ -61,9 +61,9 @@ setenv_path_var MODULEPATH $path1 $path2
 #  For the different shells ...
 #
 
-lappend ans [list setpath MODULEPATH $path1]
-lappend ans [list unset LOADEDMODULES]
 lappend ans [list unset _LMFILES_]
+lappend ans [list unset LOADEDMODULES]
+lappend ans [list set MODULEPATH $path1]
 
 
 #
diff --git a/testsuite/modules.50-cmds/028-setenv-refcount.exp b/testsuite/modules.50-cmds/028-setenv-refcount.exp
index 188f58fa..1d4a548e 100644
--- a/testsuite/modules.50-cmds/028-setenv-refcount.exp
+++ b/testsuite/modules.50-cmds/028-setenv-refcount.exp
@@ -43,7 +43,6 @@ set modulefile3 "$modpath/$module3"
 
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
-lappend ans [list unset __MODULES_SHARE_testsuite]
 lappend ans [list set testsuite yes]
 
 test_cmd "ALL" "load $module" $ans
@@ -52,7 +51,6 @@ test_cmd "ALL" "load $module" $ans
 setenv_var TS1 "no"
 
 set ans [list]
-lappend ans [list unset __MODULES_SHARE_TS1]
 lappend ans [list set TS1 maybe]
 lappend ans [list set _LMFILES_ $modulefile2]
 lappend ans [list set LOADEDMODULES $module2]
@@ -61,7 +59,6 @@ lappend ans [list set LOADEDMODULES $module2]
 test_cmd "sh" "load $module2" $ans
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_TS1 "yes:1:maybe:1"]
 lappend ans [list set TS1 "maybe:yes"]
 lappend ans [list set _LMFILES_ $modulefile3]
 lappend ans [list set LOADEDMODULES $module3]
@@ -78,9 +75,9 @@ setenv_var testsuite "yes"
 setenv_loaded_module $module $modulefile
 
 set ans [list]
-lappend ans [list unsetpath testsuite]
-lappend ans [list unset LOADEDMODULES]
 lappend ans [list unset _LMFILES_]
+lappend ans [list unset LOADEDMODULES]
+lappend ans [list unset testsuite]
 
 test_cmd "sh" "unload $module" $ans
 
@@ -89,9 +86,9 @@ setenv_var TS1 "no"
 setenv_loaded_module $module2 $modulefile2
 
 set ans [list]
-lappend ans [list unsetpath TS1]
-lappend ans [list unset LOADEDMODULES]
+lappend ans [list unset TS1]
 lappend ans [list unset _LMFILES_]
+lappend ans [list unset LOADEDMODULES]
 
 # setenv after append-path: an unset order for ref counter variable is produced
 # as ref counter variable is set right after append-path due to initial value of TS1
@@ -105,7 +102,7 @@ lappend ans [list unset _LMFILES_]
 lappend ans [list unset LOADEDMODULES]
 
 # append-path after setenv: no mention of ref counter variable as setenv order clears
-# initial value of TS1 
+# initial value of TS1
 test_cmd "sh" "unload $module3" $ans
 
 
diff --git a/testsuite/modules.50-cmds/038-unsetenv-refcount.exp b/testsuite/modules.50-cmds/038-unsetenv-refcount.exp
index cfc90e56..fcc703e5 100644
--- a/testsuite/modules.50-cmds/038-unsetenv-refcount.exp
+++ b/testsuite/modules.50-cmds/038-unsetenv-refcount.exp
@@ -45,7 +45,6 @@ set env(testsuite) "'yes'"
 
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
-lappend ans [list unset __MODULES_SHARE_testsuite]
 lappend ans [list unset testsuite]
 
 
diff --git a/testsuite/modules.50-cmds/040-append.exp b/testsuite/modules.50-cmds/040-append.exp
index 9fff2449..e5f1ab27 100644
--- a/testsuite/modules.50-cmds/040-append.exp
+++ b/testsuite/modules.50-cmds/040-append.exp
@@ -43,9 +43,9 @@ set new_path "$old_path:$ts_path"
 #  For the different shells ...
 #
 
-lappend ans [list setpath PATH $new_path]
-lappend ans [list set LOADEDMODULES $module]
+lappend ans [list set PATH $new_path]
 lappend ans [list set _LMFILES_ $modulefile]
+lappend ans [list set LOADEDMODULES $module]
 
 #
 #  The tests
@@ -68,9 +68,10 @@ set new_path "$old_path:$ts_path"
 #
 
 set ans [list]
-lappend ans [list setpath PATH $new_path]
-lappend ans [list set LOADEDMODULES $module]
+lappend ans [list set __MODULES_SHARE_PATH :1]
+lappend ans [list set PATH $new_path]
 lappend ans [list set _LMFILES_ $modulefile]
+lappend ans [list set LOADEDMODULES $module]
 
 #
 #  The tests
@@ -129,11 +130,11 @@ testouterr_cmd "sh" "load $module" "ERR" [msg_load $module $ts_err]
 set module "append/1.8"
 set modulefile "$modpath/$module"
 set ans [list]
-lappend ans [list setpath testsuite --delim=,:http://foobar.com]
-lappend ans [list setpath testsuite2 -d:,:http://foobar.com]
-lappend ans [list setpath testsuite3 -Lfoo:bar]
-lappend ans [list set LOADEDMODULES $module]
+lappend ans [list set testsuite2 -d:,:http://foobar.com]
+lappend ans [list set testsuite3 -Lfoo:bar]
 lappend ans [list set _LMFILES_ $modulefile]
+lappend ans [list set LOADEDMODULES $module]
+lappend ans [list set testsuite --delim=,:http://foobar.com]
 testouterr_cmd_re "sh" "load $module" $ans {}
 
 #
@@ -144,11 +145,10 @@ set module "append/2.3"
 set modulefile "$modpath/$module"
 set old_path "/path/to/dir1"
 
-set env(__MODULES_SHARE_FOO) "$old_path:1"
-set env(FOO) $old_path
+setenv_path_var FOO $old_path
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO ":1:/modules/testsuite2.2/2.2:1:$old_path:1:/modules/testsuite2.2:1"]
+lappend ans [list set __MODULES_SHARE_FOO ":1"]
 lappend ans [list set FOO "$old_path:/modules/testsuite2.2:/modules/testsuite2.2/2.2:"]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
@@ -163,7 +163,7 @@ set module "append/2.4"
 set modulefile "$modpath/$module"
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO ":1:/modules/testsuite2.2/2.2:1:$old_path:1:/modules/testsuite2.2:1"]
+lappend ans [list set __MODULES_SHARE_FOO ":1"]
 lappend ans [list set FOO "$old_path:/modules/testsuite2.2:/modules/testsuite2.2/2.2:"]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
@@ -177,15 +177,14 @@ testouterr_cmd "sh" "load $module" $ans ""
 set module "append/4.0"
 set modulefile "$modpath/$module"
 
-unset env(__MODULES_SHARE_FOO)
-unset env(FOO)
-set env(__MODULES_SHARE_BAR) "/path/to/dir1:2:/path/to/dir2:1"
+unsetenv_path_var FOO
+set env(__MODULES_SHARE_BAR) "/path/to/dir1:2"
 set env(BAR) "/path/to/dir1:/path/to/dir2:/path/to/dir1"
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:2:/path/to/dir2:1"]
+lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:2"]
 lappend ans [list set FOO "/path/to/dir1:/path/to/dir2:/path/to/dir1"]
-lappend ans [list set __MODULES_SHARE_BAR "/path/to/dir1:3:/path/to/dir2:1"]
+lappend ans [list set __MODULES_SHARE_BAR "/path/to/dir1:3"]
 lappend ans [list set BAR "/path/to/dir1:/path/to/dir2:/path/to/dir1"]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
@@ -195,9 +194,9 @@ testouterr_cmd "sh" "load $module" $ans ""
 set env(FOO) "/path/to/dir1"
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:3:/path/to/dir2:1"]
+lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:3"]
 lappend ans [list set FOO "/path/to/dir1:/path/to/dir1:/path/to/dir2:/path/to/dir1"]
-lappend ans [list set __MODULES_SHARE_BAR "/path/to/dir1:3:/path/to/dir2:1"]
+lappend ans [list set __MODULES_SHARE_BAR "/path/to/dir1:3"]
 lappend ans [list set BAR "/path/to/dir1:/path/to/dir2:/path/to/dir1"]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
@@ -208,9 +207,9 @@ set env(__MODULES_SHARE_FOO) "/path/to/dir1:2"
 set env(FOO) "/path/to/dir1"
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:4:/path/to/dir2:1"]
+lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:4"]
 lappend ans [list set FOO "/path/to/dir1:/path/to/dir1:/path/to/dir2:/path/to/dir1"]
-lappend ans [list set __MODULES_SHARE_BAR "/path/to/dir1:3:/path/to/dir2:1"]
+lappend ans [list set __MODULES_SHARE_BAR "/path/to/dir1:3"]
 lappend ans [list set BAR "/path/to/dir1:/path/to/dir2:/path/to/dir1"]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
@@ -221,9 +220,9 @@ set module "append/4.1"
 set modulefile "$modpath/$module"
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:4:/path/to/dir2:1"]
+lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:4"]
 lappend ans [list set FOO "/path/to/dir1:/path/to/dir1:/path/to/dir2:/path/to/dir1"]
-lappend ans [list set __MODULES_SHARE_BAR "/path/to/dir1:3:/path/to/dir2:1"]
+lappend ans [list set __MODULES_SHARE_BAR "/path/to/dir1:3"]
 lappend ans [list set BAR "/path/to/dir1:/path/to/dir2:/path/to/dir1"]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
@@ -252,24 +251,22 @@ unset env(__MODULES_SHARE_FOO)
 unset env(FOO)
 
 set ans [list]
-lappend ans [list setpath FOO $bigval]
-lappend ans [list setpath PATH $bigpathval]
-lappend ans [list set LOADEDMODULES $module]
+lappend ans [list set FOO $bigval]
+lappend ans [list set PATH $bigpathval]
 lappend ans [list set _LMFILES_ $modulefile]
+lappend ans [list set LOADEDMODULES $module]
 
 testouterr_cmd_re "sh" "load $module" $ans ""
 
 # limit is defined at 4000 characters, value is truncated, specific treatment
 # is done for PATH
 set ans [list]
-lappend ans [list setpath FOO [string range $bigval 0 3999]]
-lappend ans [list setpath PATH "[string range $bigpathval 0 $bigpathtrunclen]:/usr/bin:/bin"]
-lappend ans [list set LOADEDMODULES $module]
+lappend ans [list set FOO [string range $bigval 0 3999]]
+lappend ans [list set PATH "[string range $bigpathval 0 $bigpathtrunclen]:/usr/bin:/bin"]
 lappend ans [list set _LMFILES_ $modulefile]
+lappend ans [list set LOADEDMODULES $module]
 
-set ts_err "$warn_msgs: __MODULES_SHARE_FOO exceeds 4000 characters, truncating...
-$warn_msgs: FOO exceeds 4000 characters, truncating...
-$warn_msgs: __MODULES_SHARE_PATH exceeds 4000 characters, truncating...
+set ts_err "$warn_msgs: FOO exceeds 4000 characters, truncating...
 $warn_msgs: PATH exceeds 4000 characters, truncating and appending /usr/bin:/bin ..."
 
 testouterr_cmd_re "csh" "load $module" $ans $ts_err
@@ -282,11 +279,11 @@ testouterr_cmd_re "csh" "load $module" $ans $ts_err
 set module "append/6.0"
 set modulefile "$modpath/$module"
 
-set env(__MODULES_SHARE_FOO) "/path/to/dir2:1:/path/to/dir3:2:/path/to/dir4:1"
+set env(__MODULES_SHARE_FOO) "/path/to/dir3:2"
 set env(FOO) "/path/to/dir1:/path/to/dir4"
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir4:1:/path/to/dir1:2:/path/to/dir2:1"]
+lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:2"]
 lappend ans [list set FOO "/path/to/dir1:/path/to/dir4:/path/to/dir2"]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
@@ -297,7 +294,7 @@ testouterr_cmd "sh" "load $module" $ans {}
 # test incoherent state on unload mode
 setenv_loaded_module $module $modulefile
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir4:1"]
+lappend ans [list unset __MODULES_SHARE_FOO]
 lappend ans [list set FOO "/path/to/dir4"]
 lappend ans [list unset _LMFILES_]
 lappend ans [list unset LOADEDMODULES]
@@ -309,11 +306,12 @@ testouterr_cmd "sh" "unload $module" $ans {}
 #
 
 unsetenv_loaded_module
-set env(__MODULES_SHARE_FOO) "/path/to/dir2:1:/path/to/dir3:2:/path/to/dir4:1"
+set env(__MODULES_SHARE_FOO) "/path/to/dir3:2"
 unset env(FOO)
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:1:/path/to/dir2:1"]
+#FIXME: ref counter variable should be unset to ajust
+#lappend ans [list unset __MODULES_SHARE_FOO]
 lappend ans [list set FOO "/path/to/dir1:/path/to/dir2"]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
@@ -340,7 +338,7 @@ set env(__MODULES_SHARE_FOO) "/path/to/dir1:2:/path/to/dir3"
 set env(FOO) "/path/to/dir1"
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:2:/path/to/dir2:1"]
+lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:2"]
 lappend ans [list set FOO "/path/to/dir1:/path/to/dir2"]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
@@ -367,7 +365,8 @@ set env(__MODULES_SHARE_FOO) "/path/to/dir1:2:/path/to/dir3"
 unset env(FOO)
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:1:/path/to/dir2:1"]
+#FIXME: ref counter variable should be unset to ajust
+#lappend ans [list unset __MODULES_SHARE_FOO]
 lappend ans [list set FOO "/path/to/dir1:/path/to/dir2"]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
diff --git a/testsuite/modules.50-cmds/042-append-delim.exp b/testsuite/modules.50-cmds/042-append-delim.exp
index 501031fc..912e5e8e 100644
--- a/testsuite/modules.50-cmds/042-append-delim.exp
+++ b/testsuite/modules.50-cmds/042-append-delim.exp
@@ -36,7 +36,6 @@ set ts_new "$ts_1 $ts_2 $ts_3"
 # test colon char is correctly escaped in __MODULES_SHARE_ var
 set tsmod_new "http\\://foobar.com:1:http\\://foobar.net:1:http\\://foobar.org:1"
 set env(testsuite)	"$ts_1 $ts_2"
-set env(__MODULES_SHARE_testsuite)	"http\\://foobar.org:1:http\\://foobar.net:1"
 set module "append/1.0"
 set modulefile "$modpath/$module"
 
@@ -46,7 +45,6 @@ set modulefile "$modpath/$module"
 
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
-lappend ans [list set __MODULES_SHARE_testsuite $tsmod_new]
 lappend ans [list set testsuite $ts_new]
 
 #
@@ -94,7 +92,7 @@ set tsmod_new ":1:http\\://foobar.com:1:http\\://foobar.net:1:http\\://foobar.io
 set ans [list]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
-lappend ans [list set __MODULES_SHARE_testsuite $tsmod_new]
+lappend ans [list set __MODULES_SHARE_testsuite :1]
 lappend ans [list set testsuite $ts_new]
 
 testouterr_cmd_re "sh" "load $module" $ans ""
@@ -109,7 +107,7 @@ set modulefile "$modpath/$module"
 set ans [list]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
-lappend ans [list set __MODULES_SHARE_testsuite $tsmod_new]
+lappend ans [list set __MODULES_SHARE_testsuite :1]
 lappend ans [list set testsuite $ts_new]
 
 testouterr_cmd_re "sh" "load $module" $ans ""
diff --git a/testsuite/modules.50-cmds/045-append-undo.exp b/testsuite/modules.50-cmds/045-append-undo.exp
index da1132cd..5ed0d69c 100644
--- a/testsuite/modules.50-cmds/045-append-undo.exp
+++ b/testsuite/modules.50-cmds/045-append-undo.exp
@@ -47,9 +47,9 @@ setenv_loaded_module $module $modulefile
 #  For the different shells ...
 #
 
-lappend ans [list setpath PATH $old_path]
-lappend ans [list unset LOADEDMODULES]
+lappend ans [list set PATH $old_path]
 lappend ans [list unset _LMFILES_]
+lappend ans [list unset LOADEDMODULES]
 
 #
 #  The tests
@@ -70,14 +70,19 @@ set new_path "$old_path:$ts_path"
 #  Set up the environment for reversal ...
 #
 
-set env(PATH) "$new_path"
+setenv_path_var PATH $old_path $ts_path
 setenv_loaded_module $module $modulefile
 
 #
 #  For the different shells ...
 #
 
-# same result content as above
+set ans [list]
+lappend ans [list unset __MODULES_SHARE_PATH]
+lappend ans [list set PATH $old_path]
+lappend ans [list unset _LMFILES_]
+lappend ans [list unset LOADEDMODULES]
+
 
 #
 #  The tests
@@ -107,7 +112,7 @@ set new_path "$old_path:$ts_path"
 # as adding bare colon leads to error, this module can never be loaded
 # but anyway here we test that the unloading part of "append-path" also
 # leads to error
-set env(PATH) "$new_path"
+setenv_path_var PATH $old_path {} {}
 setenv_loaded_module $module $modulefile
 
 #
@@ -156,11 +161,11 @@ setenv_loaded_module $module $modulefile
 setenv_path_var testsuite --delim=,
 setenv_path_var testsuite2 , foo
 set ans [list]
-lappend ans [list unsetpath testsuite]
-lappend ans [list setpath testsuite2 foo]
+lappend ans [list set testsuite2 foo]
 lappend ans [list unset testsuite3]
-lappend ans [list unset LOADEDMODULES]
 lappend ans [list unset _LMFILES_]
+lappend ans [list unset LOADEDMODULES]
+lappend ans [list unset testsuite]
 testouterr_cmd_re "sh" "unload $module" $ans {}
 unsetenv_path_var testsuite
 unsetenv_path_var testsuite2
@@ -172,12 +177,12 @@ unsetenv_path_var testsuite2
 set module "append/2.3"
 set modulefile "$modpath/$module"
 
-set env(__MODULES_SHARE_FOO) ":1:/modules/testsuite2.2/2.2:1:/path/to/dir1:1:/modules/testsuite2.2:1"
+set env(__MODULES_SHARE_FOO) ":1"
 set env(FOO) "/path/to/dir1:/modules/testsuite2.2:/modules/testsuite2.2/2.2:"
 setenv_loaded_module $module $modulefile
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:1"]
+lappend ans [list unset __MODULES_SHARE_FOO]
 lappend ans [list set FOO "/path/to/dir1"]
 lappend ans [list unset _LMFILES_]
 lappend ans [list unset LOADEDMODULES]
diff --git a/testsuite/modules.50-cmds/047-app-del-undo.exp b/testsuite/modules.50-cmds/047-app-del-undo.exp
index e384861f..40be5dd5 100644
--- a/testsuite/modules.50-cmds/047-app-del-undo.exp
+++ b/testsuite/modules.50-cmds/047-app-del-undo.exp
@@ -43,7 +43,6 @@ set modulefile "$modpath/$module"
 #
 
 set env(testsuite) "$ts_1 $ts_2 $ts_3"
-set env(__MODULES_SHARE_testsuite)	"http\\://foobar.com:1:http\\://foobar.org:1:http\\://foobar.net:1"
 setenv_loaded_module $module $modulefile
 
 #
@@ -52,7 +51,6 @@ setenv_loaded_module $module $modulefile
 
 lappend ans [list unset _LMFILES_]
 lappend ans [list unset LOADEDMODULES]
-lappend ans [list set __MODULES_SHARE_testsuite $tsmod_new]
 lappend ans [list set testsuite $ts_new]
 
 #
@@ -99,13 +97,13 @@ set module "append/1.6"
 set modulefile "$modpath/$module"
 
 set env(testsuite) "$ts_1 $ts_2 $ts_3 http://foobar.io "
-set env(__MODULES_SHARE_testsuite) ":1:http\\://foobar.com:1:http\\://foobar.net:1:http\\://foobar.io:1:http\\://foobar.org:1"
+set env(__MODULES_SHARE_testsuite) ":1"
 setenv_loaded_module $module $modulefile
 
 set ans [list]
 lappend ans [list unset _LMFILES_]
 lappend ans [list unset LOADEDMODULES]
-lappend ans [list set __MODULES_SHARE_testsuite $tsmod_new]
+lappend ans [list unset __MODULES_SHARE_testsuite]
 lappend ans [list set testsuite $ts_new]
 
 testouterr_cmd_re "sh" "unload $module" $ans ""
diff --git a/testsuite/modules.50-cmds/049-append-env.exp b/testsuite/modules.50-cmds/049-append-env.exp
index aee373ca..a0237931 100644
--- a/testsuite/modules.50-cmds/049-append-env.exp
+++ b/testsuite/modules.50-cmds/049-append-env.exp
@@ -32,19 +32,19 @@ set modulefilere "$modpathre/$module"
 #
 
 set ans [list]
-lappend ans [list setpath TS1 yes]
+lappend ans [list set TS1 yes]
 lappend ans [list set TS2 yes]
-lappend ans [list set LOADEDMODULES $module]
 lappend ans [list set _LMFILES_ $modulefile]
+lappend ans [list set LOADEDMODULES $module]
 testouterr_cmd "sh" "load $module" $ans ""
 
 # test with value set to variable prior to load
 setenv_var TS1 "no"
 set ans [list]
-lappend ans [list setpath TS1 "no:yes"]
+lappend ans [list set TS1 "no:yes"]
 lappend ans [list set TS2 "no:yes"]
-lappend ans [list set LOADEDMODULES $module]
 lappend ans [list set _LMFILES_ $modulefile]
+lappend ans [list set LOADEDMODULES $module]
 testouterr_cmd_re "sh" "load $module" $ans ""
 
 
@@ -58,10 +58,10 @@ setenv_var TS2 "yes"
 setenv_loaded_module $module $modulefile
 
 set ans [list]
-lappend ans [list unsetpath TS1]
+lappend ans [list unset TS1]
 lappend ans [list unset TS2]
-lappend ans [list unset LOADEDMODULES]
 lappend ans [list unset _LMFILES_]
+lappend ans [list unset LOADEDMODULES]
 testouterr_cmd "sh" "unload $module" $ans ""
 
 # test with module loaded but vanished env vars
@@ -80,10 +80,10 @@ testouterr_cmd "sh" "unload $module" $ans ""
 setenv_var TS1 "no"
 
 set ans [list]
-lappend ans [list setpath TS1 "no"]
+lappend ans [list set TS1 "no"]
 lappend ans [list unset TS2]
-lappend ans [list unset LOADEDMODULES]
 lappend ans [list unset _LMFILES_]
+lappend ans [list unset LOADEDMODULES]
 testouterr_cmd "sh" "unload $module" $ans ""
 
 # restore environment
diff --git a/testsuite/modules.50-cmds/050-prepend.exp b/testsuite/modules.50-cmds/050-prepend.exp
index 8a93afd3..cf5aeb4e 100644
--- a/testsuite/modules.50-cmds/050-prepend.exp
+++ b/testsuite/modules.50-cmds/050-prepend.exp
@@ -40,9 +40,9 @@ set new_path "$ts_path:$old_path"
 #  For the different shells ...
 #
 
-lappend ans [list setpath PATH $new_path]
-lappend ans [list set LOADEDMODULES $module]
+lappend ans [list set PATH $new_path]
 lappend ans [list set _LMFILES_ $modulefile]
+lappend ans [list set LOADEDMODULES $module]
 
 #
 #  The tests
@@ -66,9 +66,10 @@ set new_path "$ts_path:$old_path"
 #
 
 set ans [list]
-lappend ans [list setpath PATH $new_path]
-lappend ans [list set LOADEDMODULES $module]
+lappend ans [list set __MODULES_SHARE_PATH :1]
+lappend ans [list set PATH $new_path]
 lappend ans [list set _LMFILES_ $modulefile]
+lappend ans [list set LOADEDMODULES $module]
 
 #
 #  The tests
@@ -106,15 +107,13 @@ set ts_path "/this/is/the/modules/testsuite"
 set new_path "$ts_path:$old_path"
 
 # set PATH with prefixing colon
-if { $verbose > 0 } {
-    send_user "\tSetup PATH = $old_path\n"
-}
-set env(PATH) "$old_path"
+setenv_path_var PATH {} $env(PATH)
 
 set ans [list]
-lappend ans [list setpath PATH $new_path]
-lappend ans [list set LOADEDMODULES $module]
+lappend ans [list set __MODULES_SHARE_PATH :1]
+lappend ans [list set PATH $new_path]
 lappend ans [list set _LMFILES_ $modulefile]
+lappend ans [list set LOADEDMODULES $module]
 
 #
 #  The tests
@@ -157,11 +156,11 @@ testouterr_cmd "sh" "load $module" "ERR" [msg_load $module $ts_err]
 set module "prepend/1.10"
 set modulefile "$modpath/$module"
 set ans [list]
-lappend ans [list setpath testsuite --delim=,:http://foobar.com]
-lappend ans [list setpath testsuite2 -d:,:http://foobar.com]
-lappend ans [list setpath testsuite3 -Lfoo:bar]
-lappend ans [list set LOADEDMODULES $module]
+lappend ans [list set testsuite2 -d:,:http://foobar.com]
+lappend ans [list set testsuite3 -Lfoo:bar]
 lappend ans [list set _LMFILES_ $modulefile]
+lappend ans [list set LOADEDMODULES $module]
+lappend ans [list set testsuite --delim=,:http://foobar.com]
 testouterr_cmd_re "sh" "load $module" $ans {}
 
 
@@ -190,7 +189,7 @@ set module2 "prepend/3.1"
 set modulefile2 "$modpath/$module2"
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir:1::2"]
+lappend ans [list set __MODULES_SHARE_FOO ":2"]
 lappend ans [list set FOO "/path/to/dir:"]
 lappend ans [list set _LMFILES_ "$modulefile:$modulefile2"]
 lappend ans [list set LOADEDMODULES "$module:$module2"]
@@ -198,7 +197,7 @@ lappend ans [list set LOADEDMODULES "$module:$module2"]
 testouterr_cmd_re "sh" "load $module $module2" $ans ""
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir:1::2"]
+lappend ans [list set __MODULES_SHARE_FOO ":2"]
 lappend ans [list set FOO "/path/to/dir:"]
 lappend ans [list set _LMFILES_ "$modulefile2:$modulefile"]
 lappend ans [list set LOADEDMODULES "$module2:$module"]
@@ -214,11 +213,10 @@ set module "prepend/2.3"
 set modulefile "$modpath/$module"
 set old_path "/path/to/dir1"
 
-set env(__MODULES_SHARE_FOO) "$old_path:1"
-set env(FOO) $old_path
+setenv_path_var FOO $old_path
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO ":1:/modules/testsuite2.2/2.2:1:$old_path:1:/modules/testsuite2.2:1"]
+lappend ans [list set __MODULES_SHARE_FOO ":1"]
 lappend ans [list set FOO ":/modules/testsuite2.2:/modules/testsuite2.2/2.2:$old_path"]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
@@ -234,7 +232,7 @@ set module "prepend/2.4"
 set modulefile "$modpath/$module"
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO ":1:/modules/testsuite2.2/2.2:1:$old_path:1:/modules/testsuite2.2:1"]
+lappend ans [list set __MODULES_SHARE_FOO ":1"]
 lappend ans [list set FOO ":/modules/testsuite2.2:/modules/testsuite2.2/2.2:$old_path"]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
diff --git a/testsuite/modules.50-cmds/052-prepend-delim.exp b/testsuite/modules.50-cmds/052-prepend-delim.exp
index 4ff49773..b3529803 100644
--- a/testsuite/modules.50-cmds/052-prepend-delim.exp
+++ b/testsuite/modules.50-cmds/052-prepend-delim.exp
@@ -36,7 +36,6 @@ set ts_new "$ts_3 $ts_1 $ts_2"
 # test colon char is correctly escaped in __MODULES_SHARE_ var
 set tsmod_new "http\\://foobar.com:1:http\\://foobar.net:1:http\\://foobar.org:1"
 set env(testsuite)	"$ts_1 $ts_2"
-set env(__MODULES_SHARE_testsuite)	"http\\://foobar.org:1:http\\://foobar.net:1"
 set module "prepend/1.0"
 set modulefile "$modpath/$module"
 
@@ -46,7 +45,6 @@ set modulefile "$modpath/$module"
 
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
-lappend ans [list set __MODULES_SHARE_testsuite $tsmod_new]
 lappend ans [list set testsuite $ts_new]
 
 #
@@ -67,7 +65,6 @@ set modulefile "$modpath/$module"
 set ans [list]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
-lappend ans [list set __MODULES_SHARE_testsuite $tsmod_new]
 lappend ans [list set testsuite $ts_new]
 
 test_cmd_re "sh" "load $module" $ans
@@ -118,12 +115,11 @@ set ts_new " http://foobar.io $ts_3 $ts_1 $ts_2"
 set tsmod_new ":1:http\\://foobar.com:1:http\\://foobar.net:1:http\\://foobar.io:1:http\\://foobar.org:1"
 
 set env(testsuite) "$ts_1 $ts_2"
-set env(__MODULES_SHARE_testsuite) "http\\://foobar.org:1:http\\://foobar.net:1"
 
 set ans [list]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
-lappend ans [list set __MODULES_SHARE_testsuite $tsmod_new]
+lappend ans [list set __MODULES_SHARE_testsuite :1]
 lappend ans [list set testsuite $ts_new]
 
 testouterr_cmd_re "sh" "load $module" $ans ""
@@ -138,7 +134,7 @@ set modulefile "$modpath/$module"
 set ans [list]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
-lappend ans [list set __MODULES_SHARE_testsuite $tsmod_new]
+lappend ans [list set __MODULES_SHARE_testsuite :1]
 lappend ans [list set testsuite $ts_new]
 
 testouterr_cmd_re "sh" "load $module" $ans ""
diff --git a/testsuite/modules.50-cmds/055-prepend-undo.exp b/testsuite/modules.50-cmds/055-prepend-undo.exp
index f09ef7a9..14c3c30b 100644
--- a/testsuite/modules.50-cmds/055-prepend-undo.exp
+++ b/testsuite/modules.50-cmds/055-prepend-undo.exp
@@ -47,9 +47,9 @@ setenv_loaded_module $module $modulefile
 #  For the different shells ...
 #
 
-lappend ans [list setpath PATH $old_path]
-lappend ans [list unset LOADEDMODULES]
+lappend ans [list set PATH $old_path]
 lappend ans [list unset _LMFILES_]
+lappend ans [list unset LOADEDMODULES]
 
 #
 #  The tests
@@ -71,14 +71,19 @@ set new_path "$ts_path:$old_path"
 #  Set up the environment for reversal ...
 #
 
-set env(PATH) "$new_path"
+setenv_path_var PATH $ts_path $old_path
 setenv_loaded_module $module $modulefile
 
 #
 #  For the different shells ...
 #
 
-# same result content as above
+set ans [list]
+lappend ans [list unset __MODULES_SHARE_PATH]
+lappend ans [list set PATH $old_path]
+lappend ans [list unset _LMFILES_]
+lappend ans [list unset LOADEDMODULES]
+
 
 #
 #  The tests
@@ -108,7 +113,7 @@ set new_path "$ts_path:$old_path"
 # as adding bare colon leads to error, this module can never be loaded
 # but anyway here we test that the unloading part of "append-path" also
 # leads to error
-set env(PATH) "$new_path"
+setenv_path_var PATH {} {} $old_path
 setenv_loaded_module $module $modulefile
 
 #
@@ -128,16 +133,14 @@ set modulefile "$modpath/$module"
 set ts_path "/this/is/the/modules/testsuite::$old_path"
 set new_path ":$old_path"
 
-if { $verbose > 0 } {
-    send_user "\tSetup PATH = $ts_path\n"
-}
-set env(PATH) "$ts_path"
+setenv_path_var PATH /this/is/the/modules/testsuite {} $old_path
 setenv_loaded_module $module $modulefile
 
 set ans [list]
-lappend ans [list setpath PATH $new_path]
-lappend ans [list unset LOADEDMODULES]
+lappend ans [list set __MODULES_SHARE_PATH :1]
+lappend ans [list set PATH $new_path]
 lappend ans [list unset _LMFILES_]
+lappend ans [list unset LOADEDMODULES]
 
 #
 #  The tests
@@ -186,11 +189,11 @@ setenv_loaded_module $module $modulefile
 setenv_path_var testsuite --delim=,
 setenv_path_var testsuite2 , foo
 set ans [list]
-lappend ans [list unsetpath testsuite]
-lappend ans [list setpath testsuite2 foo]
+lappend ans [list set testsuite2 foo]
 lappend ans [list unset testsuite3]
-lappend ans [list unset LOADEDMODULES]
 lappend ans [list unset _LMFILES_]
+lappend ans [list unset LOADEDMODULES]
+lappend ans [list unset testsuite]
 testouterr_cmd_re "sh" "unload $module" $ans {}
 unsetenv_path_var testsuite
 unsetenv_path_var testsuite2
@@ -219,7 +222,7 @@ set module2 "prepend/3.1"
 set modulefile2 "$modpath/$module2"
 
 
-set env(__MODULES_SHARE_FOO) "/path/to/dir:1::2"
+set env(__MODULES_SHARE_FOO) ":2"
 set env(FOO) "/path/to/dir:"
 setenv_loaded_module [list $module $module2] [list $modulefile $modulefile2]
 
@@ -240,7 +243,7 @@ lappend ans [list set LOADEDMODULES $module]
 testouterr_cmd "sh" "unload $module2" $ans ""
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir:1::1"]
+lappend ans [list set __MODULES_SHARE_FOO ":1"]
 lappend ans [list set FOO "/path/to/dir:"]
 lappend ans [list set _LMFILES_ $modulefile2]
 lappend ans [list set LOADEDMODULES $module2]
@@ -248,7 +251,7 @@ lappend ans [list set LOADEDMODULES $module2]
 testouterr_cmd "sh" "unload $module" $ans ""
 
 
-set env(__MODULES_SHARE_FOO) "/path/to/dir:1::2"
+set env(__MODULES_SHARE_FOO) ":2"
 set env(FOO) "/path/to/dir:"
 setenv_loaded_module [list $module2 $module] [list $modulefile2 $modulefile]
 
@@ -269,7 +272,7 @@ lappend ans [list set LOADEDMODULES $module]
 testouterr_cmd "sh" "unload $module2" $ans ""
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir:1::1"]
+lappend ans [list set __MODULES_SHARE_FOO ":1"]
 lappend ans [list set FOO "/path/to/dir:"]
 lappend ans [list set _LMFILES_ $modulefile2]
 lappend ans [list set LOADEDMODULES $module2]
@@ -284,12 +287,12 @@ testouterr_cmd "sh" "unload $module" $ans ""
 set module "prepend/2.3"
 set modulefile "$modpath/$module"
 
-set env(__MODULES_SHARE_FOO) ":1:/modules/testsuite2.2/2.2:1:/path/to/dir1:1:/modules/testsuite2.2:1"
+set env(__MODULES_SHARE_FOO) ":1"
 set env(FOO) ":/modules/testsuite2.2:/modules/testsuite2.2/2.2:/path/to/dir1"
 setenv_loaded_module [list $module] [list $modulefile]
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:1"]
+lappend ans [list unset __MODULES_SHARE_FOO]
 lappend ans [list set FOO "/path/to/dir1"]
 lappend ans [list unset _LMFILES_]
 lappend ans [list unset LOADEDMODULES]
diff --git a/testsuite/modules.50-cmds/057-pre-del-undo.exp b/testsuite/modules.50-cmds/057-pre-del-undo.exp
index a7963fe8..c701ed48 100644
--- a/testsuite/modules.50-cmds/057-pre-del-undo.exp
+++ b/testsuite/modules.50-cmds/057-pre-del-undo.exp
@@ -43,7 +43,6 @@ set modulefile "$modpath/$module"
 #
 
 set env(testsuite) "$ts_3 $ts_1 $ts_2"
-set env(__MODULES_SHARE_testsuite)	"http\\://foobar.com:1:http\\://foobar.org:1:http\\://foobar.net:1"
 setenv_loaded_module $module $modulefile
 
 #
@@ -52,7 +51,6 @@ setenv_loaded_module $module $modulefile
 
 lappend ans [list unset _LMFILES_]
 lappend ans [list unset LOADEDMODULES]
-lappend ans [list set __MODULES_SHARE_testsuite $tsmod_new]
 lappend ans [list set testsuite $ts_new]
 
 #
@@ -109,13 +107,11 @@ set module "prepend/1.8"
 set modulefile "$modpath/$module"
 
 set env(testsuite) " http://foobar.io $ts_3 $ts_1 $ts_2"
-set env(__MODULES_SHARE_testsuite) ":1:http\\://foobar.com:1:http\\://foobar.net:1:http\\://foobar.io:1:http\\://foobar.org:1"
 setenv_loaded_module $module $modulefile
 
 set ans [list]
 lappend ans [list unset _LMFILES_]
 lappend ans [list unset LOADEDMODULES]
-lappend ans [list set __MODULES_SHARE_testsuite $tsmod_new]
 lappend ans [list set testsuite $ts_new]
 
 testouterr_cmd_re "sh" "unload $module" $ans ""
diff --git a/testsuite/modules.50-cmds/059-prepend-env.exp b/testsuite/modules.50-cmds/059-prepend-env.exp
index 2ab46803..5666b0ab 100644
--- a/testsuite/modules.50-cmds/059-prepend-env.exp
+++ b/testsuite/modules.50-cmds/059-prepend-env.exp
@@ -32,19 +32,19 @@ set modulefilere "$modpathre/$module"
 #
 
 set ans [list]
-lappend ans [list setpath TS1 yes]
+lappend ans [list set TS1 yes]
 lappend ans [list set TS2 yes]
-lappend ans [list set LOADEDMODULES $module]
 lappend ans [list set _LMFILES_ $modulefile]
+lappend ans [list set LOADEDMODULES $module]
 testouterr_cmd "sh" "load $module" $ans ""
 
 # test with value set to variable prior to load
 setenv_var TS1 "no"
 set ans [list]
-lappend ans [list setpath TS1 "yes:no"]
+lappend ans [list set TS1 "yes:no"]
 lappend ans [list set TS2 "yes:no"]
-lappend ans [list set LOADEDMODULES $module]
 lappend ans [list set _LMFILES_ $modulefile]
+lappend ans [list set LOADEDMODULES $module]
 testouterr_cmd_re "sh" "load $module" $ans ""
 
 
@@ -58,10 +58,10 @@ setenv_var TS2 "yes"
 setenv_loaded_module $module $modulefile
 
 set ans [list]
-lappend ans [list unsetpath TS1]
+lappend ans [list unset TS1]
 lappend ans [list unset TS2]
-lappend ans [list unset LOADEDMODULES]
 lappend ans [list unset _LMFILES_]
+lappend ans [list unset LOADEDMODULES]
 testouterr_cmd "sh" "unload $module" $ans ""
 
 # test with module loaded but vanished env vars
diff --git a/testsuite/modules.50-cmds/060-remove.exp b/testsuite/modules.50-cmds/060-remove.exp
index c802fb9a..7c36b0af 100644
--- a/testsuite/modules.50-cmds/060-remove.exp
+++ b/testsuite/modules.50-cmds/060-remove.exp
@@ -46,9 +46,9 @@ set env(PATH) "$new_path"
 #  For the different shells ...
 #
 
-lappend ans [list setpath PATH $old_path]
-lappend ans [list set LOADEDMODULES $module]
+lappend ans [list set PATH $old_path]
 lappend ans [list set _LMFILES_ $modulefile]
+lappend ans [list set LOADEDMODULES $module]
 
 #
 #  The tests
@@ -92,11 +92,11 @@ setenv_path_var testsuite2 , foo
 set module "remove/1.8"
 set modulefile "$modpath/$module"
 set ans [list]
-lappend ans [list unsetpath testsuite]
-lappend ans [list setpath testsuite2 foo]
+lappend ans [list set testsuite2 foo]
 lappend ans [list unset testsuite3]
-lappend ans [list set LOADEDMODULES $module]
 lappend ans [list set _LMFILES_ $modulefile]
+lappend ans [list set LOADEDMODULES $module]
+lappend ans [list unset testsuite]
 testouterr_cmd_re "sh" "load $module" $ans {}
 unsetenv_path_var testsuite
 unsetenv_path_var testsuite2
@@ -109,11 +109,11 @@ unsetenv_path_var testsuite2
 set module "remove/2.3"
 set modulefile "$modpath/$module"
 
-set env(__MODULES_SHARE_FOO) ":1:/modules/testsuite2.2/2.2:1:/path/to/dir1:1:/modules/testsuite2.2:1"
+set env(__MODULES_SHARE_FOO) ":1"
 set env(FOO) "/path/to/dir1:/modules/testsuite2.2:/modules/testsuite2.2/2.2:"
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:1"]
+lappend ans [list unset __MODULES_SHARE_FOO]
 lappend ans [list set FOO "/path/to/dir1"]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
@@ -128,7 +128,7 @@ set module "remove/2.4"
 set modulefile "$modpath/$module"
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:1"]
+lappend ans [list unset __MODULES_SHARE_FOO]
 lappend ans [list set FOO "/path/to/dir1"]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
@@ -166,37 +166,33 @@ unset env(__MODULES_SHARE_FOO)
 set env(FOO) "/path/to/dir1:/path/to/dir2:/path/to/dir1"
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir2:1"]
 lappend ans [list set FOO "/path/to/dir2"]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
 
 testouterr_cmd "sh" "load $module" $ans ""
 
-set env(__MODULES_SHARE_FOO) "/path/to/dir1:1:/path/to/dir2:1"
-
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir2:1"]
 lappend ans [list set FOO "/path/to/dir2"]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
 
 testouterr_cmd "sh" "load $module" $ans ""
 
-set env(__MODULES_SHARE_FOO) "/path/to/dir1:2:/path/to/dir2:1"
+set env(__MODULES_SHARE_FOO) "/path/to/dir1:2"
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:1:/path/to/dir2:1"]
+lappend ans [list unset __MODULES_SHARE_FOO]
 lappend ans [list set FOO "/path/to/dir1:/path/to/dir2"]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
 
 testouterr_cmd "sh" "load $module" $ans ""
 
-set env(__MODULES_SHARE_FOO) "/path/to/dir1:3:/path/to/dir2:1"
+set env(__MODULES_SHARE_FOO) "/path/to/dir1:3"
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:2:/path/to/dir2:1"]
+lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:2"]
 lappend ans [list set FOO "/path/to/dir1:/path/to/dir2:/path/to/dir1"]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
@@ -206,11 +202,11 @@ testouterr_cmd "sh" "load $module" $ans ""
 set module "remove/3.1"
 set modulefile "$modpath/$module"
 
-set env(__MODULES_SHARE_FOO) "/path/to/dir1:2:/path/to/dir2:1"
+set env(__MODULES_SHARE_FOO) "/path/to/dir1:2"
 set env(FOO) "/path/to/dir1:/path/to/dir2:/path/to/dir1:/path/to/dir1"
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:1:/path/to/dir2:1"]
+lappend ans [list unset __MODULES_SHARE_FOO]
 lappend ans [list set FOO "/path/to/dir1:/path/to/dir2"]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
@@ -243,7 +239,7 @@ lappend ans [list set LOADEDMODULES $module]
 # out of bound
 testouterr_cmd "sh" "load $module" $ans ""
 
-set env(__MODULES_SHARE_FOO) "/path/to/dir1:2:/path/to/dir2:1"
+set env(__MODULES_SHARE_FOO) "/path/to/dir1:2"
 set env(FOO) "/path/to/dir1:/path/to/dir2:/path/to/dir1:/path/to/dir1"
 
 set ans [list]
@@ -258,7 +254,7 @@ set env(__MODULES_SHARE_FOO) "/path/to/dir1:2:/path/to/dir2:2"
 set env(FOO) "/path/to/dir1:/path/to/dir2:/path/to/dir1:/path/to/dir1"
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:2:/path/to/dir2:1"]
+lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:2"]
 lappend ans [list set FOO "/path/to/dir1:/path/to/dir2:/path/to/dir1:/path/to/dir1"]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
@@ -272,18 +268,17 @@ set env(__MODULES_SHARE_FOO) "/path/to/dir1:2:/path/to/dir2:2"
 set env(FOO) "/path/to/dir1:/path/to/dir2:/path/to/dir1:/path/to/dir1"
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:1:/path/to/dir2:1"]
+lappend ans [list unset __MODULES_SHARE_FOO]
 lappend ans [list set FOO "/path/to/dir1:/path/to/dir2:/path/to/dir1"]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
 
 testouterr_cmd "sh" "load $module" $ans ""
 
-set env(__MODULES_SHARE_FOO) "/path/to/dir1:1"
+unset env(__MODULES_SHARE_FOO)
 set env(FOO) "/path/to/dir1:/path/to/dir2:/path/to/dir1:/path/to/dir1"
 
 set ans [list]
-lappend ans [list unset __MODULES_SHARE_FOO]
 lappend ans [list set FOO "/path/to/dir1:/path/to/dir1"]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
@@ -296,7 +291,6 @@ testouterr_cmd "sh" "load $module" $ans ""
 #
 
 set env(PATH) "$old_path"
-unset env(__MODULES_SHARE_FOO)
 unset env(FOO)
 
 #
diff --git a/testsuite/modules.50-cmds/062-remove-delim.exp b/testsuite/modules.50-cmds/062-remove-delim.exp
index b2400307..f4803292 100644
--- a/testsuite/modules.50-cmds/062-remove-delim.exp
+++ b/testsuite/modules.50-cmds/062-remove-delim.exp
@@ -36,7 +36,6 @@ set ts_new "$ts_1 $ts_2"
 # test colon char is correctly escaped in __MODULES_SHARE_ var
 set tsmod_new "http\\://foobar.net:1:http\\://foobar.org:1"
 set env(testsuite)	"$ts_1 $ts_2 $ts_3"
-set env(__MODULES_SHARE_testsuite)	"http\\://foobar.org:1:http\\://foobar.net:1:http\\://foobar.com:1"
 set module "remove/1.0"
 set modulefile "$modpath/$module"
 
@@ -46,7 +45,6 @@ set modulefile "$modpath/$module"
 
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
-lappend ans [list set __MODULES_SHARE_testsuite $tsmod_new]
 lappend ans [list set testsuite $ts_new]
 
 #
@@ -90,12 +88,12 @@ set module "remove/1.6"
 set modulefile "$modpath/$module"
 
 set env(testsuite) "$ts_1 $ts_2 $ts_3 http://foobar.io "
-set env(__MODULES_SHARE_testsuite) ":1:http\\://foobar.com:1:http\\://foobar.net:1:http\\://foobar.io:1:http\\://foobar.org:1"
+set env(__MODULES_SHARE_testsuite) ":1"
 
 set ans [list]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
-lappend ans [list set __MODULES_SHARE_testsuite $tsmod_new]
+lappend ans [list unset __MODULES_SHARE_testsuite]
 lappend ans [list set testsuite $ts_new]
 
 testouterr_cmd_re "sh" "load $module" $ans ""
@@ -110,7 +108,7 @@ set modulefile "$modpath/$module"
 set ans [list]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
-lappend ans [list set __MODULES_SHARE_testsuite $tsmod_new]
+lappend ans [list unset __MODULES_SHARE_testsuite]
 lappend ans [list set testsuite $ts_new]
 
 testouterr_cmd_re "sh" "load $module" $ans ""
diff --git a/testsuite/modules.50-cmds/069-remove-env.exp b/testsuite/modules.50-cmds/069-remove-env.exp
index 9b1e276a..017abffb 100644
--- a/testsuite/modules.50-cmds/069-remove-env.exp
+++ b/testsuite/modules.50-cmds/069-remove-env.exp
@@ -42,10 +42,10 @@ testouterr_cmd_re "sh" "load $module" $ans ""
 # test with value set to variable prior to load (diff value than removed one)
 setenv_var TS1 "no"
 set ans [list]
-lappend ans [list setpath TS1 "no"]
+lappend ans [list set TS1 "no"]
 lappend ans [list set TS2 "no"]
-lappend ans [list set LOADEDMODULES $module]
 lappend ans [list set _LMFILES_ $modulefile]
+lappend ans [list set LOADEDMODULES $module]
 testouterr_cmd_re "sh" "load $module" $ans ""
 
 # test with value set to variable prior to load (value is removed one)
@@ -60,10 +60,10 @@ testouterr_cmd_re "sh" "load $module" $ans ""
 # test with value set to variable (as path var) prior to load (value is removed one)
 setenv_path_var TS1 "yes"
 set ans [list]
-lappend ans [list unsetpath TS1]
+lappend ans [list unset TS1]
 lappend ans [list set TS2 ""]
-lappend ans [list set LOADEDMODULES $module]
 lappend ans [list set _LMFILES_ $modulefile]
+lappend ans [list set LOADEDMODULES $module]
 testouterr_cmd_re "sh" "load $module" $ans ""
 
 
@@ -100,7 +100,7 @@ lappend ans [list unset LOADEDMODULES]
 # test with value set to variable (as path var) prior to load (value is removed one)
 setenv_path_var TS1 "yes"
 set ans [list]
-lappend ans [list unsetpath TS1]
+lappend ans [list unset TS1]
 lappend ans [list unset TS2]
 lappend ans [list unset _LMFILES_]
 lappend ans [list unset LOADEDMODULES]
diff --git a/testsuite/modules.50-cmds/172-swap-app-delim.exp b/testsuite/modules.50-cmds/172-swap-app-delim.exp
index 51953ca7..99edf518 100644
--- a/testsuite/modules.50-cmds/172-swap-app-delim.exp
+++ b/testsuite/modules.50-cmds/172-swap-app-delim.exp
@@ -46,9 +46,9 @@ setenv_loaded_module $module $modulefile
 #  For the different shells ...
 #
 
-lappend ans [list setpath testsuite $ts_space]
-lappend ans [list set LOADEDMODULES $module_new]
 lappend ans [list set _LMFILES_ $modulefile_new]
+lappend ans [list set LOADEDMODULES $module_new]
+lappend ans [list set testsuite $ts_space]
 
 #
 #  The tests
diff --git a/testsuite/modules.50-cmds/173-swap-app-delim.exp b/testsuite/modules.50-cmds/173-swap-app-delim.exp
index 0353fe3e..7a03a901 100644
--- a/testsuite/modules.50-cmds/173-swap-app-delim.exp
+++ b/testsuite/modules.50-cmds/173-swap-app-delim.exp
@@ -52,9 +52,9 @@ setenv_loaded_module $module $modulefile
 #  For the different shells ...
 #
 
-lappend ans [list setpath testsuite $ts_space]
-lappend ans [list set LOADEDMODULES $module_new]
 lappend ans [list set _LMFILES_ $modulefile_new]
+lappend ans [list set LOADEDMODULES $module_new]
+lappend ans [list set testsuite $ts_space]
 
 #
 #  The tests
diff --git a/testsuite/modules.50-cmds/175-swap2.exp b/testsuite/modules.50-cmds/175-swap2.exp
index 89c22f1d..3e69a6ce 100644
--- a/testsuite/modules.50-cmds/175-swap2.exp
+++ b/testsuite/modules.50-cmds/175-swap2.exp
@@ -58,9 +58,9 @@ set modulefile "$mod22p"
 # module but through the whole space of the variable. So prepended stuff
 # will go at the beginning of the variable and appended stuff will go
 # at the end.
-lappend ans [list setpath PATH "$path22:$path2222:$pathpre:$pathpost"]
-lappend ans [list set LOADEDMODULES $module]
+lappend ans [list set PATH "$path22:$path2222:$pathpre:$pathpost"]
 lappend ans [list set _LMFILES_ $modulefile]
+lappend ans [list set LOADEDMODULES $module]
 
 #
 #  The tests
@@ -96,9 +96,9 @@ set modulefile "$mod22p"
 
 # different behavior than C-version: same remark than above
 set ans [list]
-lappend ans [list setpath PATH "$pathpre:$pathpost:$path22:$path2222"]
-lappend ans [list set LOADEDMODULES $module]
+lappend ans [list set PATH "$pathpre:$pathpost:$path22:$path2222"]
 lappend ans [list set _LMFILES_ $modulefile]
+lappend ans [list set LOADEDMODULES $module]
 
 #
 #  The tests
diff --git a/testsuite/modules.50-cmds/177-swap-prep-delim.exp b/testsuite/modules.50-cmds/177-swap-prep-delim.exp
index 16c022f2..e44db188 100644
--- a/testsuite/modules.50-cmds/177-swap-prep-delim.exp
+++ b/testsuite/modules.50-cmds/177-swap-prep-delim.exp
@@ -46,9 +46,9 @@ setenv_loaded_module $module $modulefile
 #  For the different shells ...
 #
 
-lappend ans [list setpath testsuite $ts_space]
-lappend ans [list set LOADEDMODULES $module_new]
 lappend ans [list set _LMFILES_ $modulefile_new]
+lappend ans [list set LOADEDMODULES $module_new]
+lappend ans [list set testsuite $ts_space]
 
 #
 #  The tests
diff --git a/testsuite/modules.50-cmds/178-swap-prep-delim.exp b/testsuite/modules.50-cmds/178-swap-prep-delim.exp
index 27c161c8..586f3c46 100644
--- a/testsuite/modules.50-cmds/178-swap-prep-delim.exp
+++ b/testsuite/modules.50-cmds/178-swap-prep-delim.exp
@@ -52,9 +52,9 @@ setenv_loaded_module $module $modulefile
 #  For the different shells ...
 #
 
-lappend ans [list setpath testsuite $ts_space]
-lappend ans [list set LOADEDMODULES $module_new]
 lappend ans [list set _LMFILES_ $modulefile_new]
+lappend ans [list set LOADEDMODULES $module_new]
+lappend ans [list set testsuite $ts_space]
 
 #
 #  The tests
diff --git a/testsuite/modules.50-cmds/180-unload.exp b/testsuite/modules.50-cmds/180-unload.exp
index 742b492f..5985178b 100644
--- a/testsuite/modules.50-cmds/180-unload.exp
+++ b/testsuite/modules.50-cmds/180-unload.exp
@@ -32,9 +32,9 @@ set modulefile_3 $module_3
 set module_3_reld "$reldmodpath/loc_rc3/1.0"
 set module_3_reldd "$relddmodpath/loc_rc3/1.0"
 
-lappend ans [list unsetpath testsuite]
-lappend ans [list unset LOADEDMODULES]
 lappend ans [list unset _LMFILES_]
+lappend ans [list unset LOADEDMODULES]
+lappend ans [list unset testsuite]
 
 set module_0 "bad2/body"
 set modulefile_0 "$modpath/$module_0"
@@ -89,9 +89,9 @@ skip_if_quick_mode
 setenv_loaded_module [list $module_2 $module_1] [list $modulefile_2 $modulefile_1]
 
 set anslast [list]
-lappend anslast [list unsetpath testsuite]
-lappend anslast [list set LOADEDMODULES $module_2]
 lappend anslast [list set _LMFILES_ $modulefile_2]
+lappend anslast [list set LOADEDMODULES $module_2]
+lappend anslast [list unset testsuite]
 set ansfirst [list]
 lappend ansfirst [list set _LMFILES_ $modulefile_1]
 lappend ansfirst [list set LOADEDMODULES $module_1]
@@ -120,10 +120,10 @@ testouterr_cmd "sh" "unload $modulefile_1" $anslast ""
 setenv_loaded_module [list {} $module_2 $module_1] [list {} $modulefile_2 $modulefile_1]
 
 set ans [list]
-lappend ans [list unsetpath testsuite]
 # empty elements are ignored but stick to the variable, they should be removed
-lappend ans [list set LOADEDMODULES ":$module_2"]
 lappend ans [list set _LMFILES_ ":$modulefile_2"]
+lappend ans [list set LOADEDMODULES ":$module_2"]
+lappend ans [list unset testsuite]
 
 testouterr_cmd_re "sh" "unload $modulefile_1" $ans ""
 
@@ -132,9 +132,9 @@ testouterr_cmd_re "sh" "unload $modulefile_1" $ans ""
 unsetenv_path_var MODULEPATH
 
 set ans [list]
-lappend ans [list unsetpath testsuite]
-lappend ans [list unset LOADEDMODULES]
 lappend ans [list unset _LMFILES_]
+lappend ans [list unset LOADEDMODULES]
+lappend ans [list unset testsuite]
 
 # set up the environment
 setenv_loaded_module $module_1 $modulefile_1
@@ -155,9 +155,9 @@ testouterr_cmd "sh" "unload $modulename_1" $ans ""
 setenv_loaded_module [list $module_2 $module_1] [list $modulefile_2 $modulefile_1]
 
 set anslast [list]
-lappend anslast [list unsetpath testsuite]
-lappend anslast [list set LOADEDMODULES $module_2]
 lappend anslast [list set _LMFILES_ $modulefile_2]
+lappend anslast [list set LOADEDMODULES $module_2]
+lappend anslast [list unset testsuite]
 set ansfirst [list]
 lappend ansfirst [list set _LMFILES_ $modulefile_1]
 lappend ansfirst [list set LOADEDMODULES $module_1]
diff --git a/testsuite/modules.50-cmds/321-is-used.exp b/testsuite/modules.50-cmds/321-is-used.exp
index 3031cc85..ca06d012 100644
--- a/testsuite/modules.50-cmds/321-is-used.exp
+++ b/testsuite/modules.50-cmds/321-is-used.exp
@@ -30,15 +30,15 @@ set modulefile "$modpath/$module"
 #  The tests
 #
 
-lappend ans [list set testsuite1 1]
+lappend ans [list set testsuite6 1]
 lappend ans [list set testsuite2 0]
 lappend ans [list set testsuite3 0]
-lappend ans [list set testsuite4 1]
-lappend ans [list set testsuite6 1]
-lappend ans [list setpath MODULEPATH $modpath]
-lappend ans [list set LOADEDMODULES $module]
 lappend ans [list set _LMFILES_ $modulefile]
+lappend ans [list set LOADEDMODULES $module]
+lappend ans [list set testsuite4 1]
 lappend ans [list set testsuite5 1]
+lappend ans [list set MODULEPATH $modpath]
+lappend ans [list set testsuite1 1]
 
 testouterr_cmd "ALL" "load $module" $ans ""
 
@@ -46,15 +46,15 @@ testouterr_cmd "ALL" "load $module" $ans ""
 unsetenv_path_var MODULEPATH
 
 set ans [list]
-lappend ans [list set testsuite1 0]
+lappend ans [list set testsuite6 1]
 lappend ans [list set testsuite2 0]
 lappend ans [list set testsuite3 0]
-lappend ans [list set testsuite4 0]
-lappend ans [list set testsuite6 1]
-lappend ans [list unsetpath MODULEPATH]
-lappend ans [list set LOADEDMODULES $modulefile]
 lappend ans [list set _LMFILES_ $modulefile]
+lappend ans [list set LOADEDMODULES $modulefile]
+lappend ans [list set testsuite4 0]
 lappend ans [list set testsuite5 0]
+lappend ans [list unset MODULEPATH]
+lappend ans [list set testsuite1 0]
 
 if {$plus_in_modpath && $install_advversspec eq {y}} {
     setenv_var MODULES_ADVANCED_VERSION_SPEC 0
diff --git a/testsuite/modules.50-cmds/330-source.exp b/testsuite/modules.50-cmds/330-source.exp
index cee90395..92ba207b 100644
--- a/testsuite/modules.50-cmds/330-source.exp
+++ b/testsuite/modules.50-cmds/330-source.exp
@@ -40,10 +40,10 @@ set modulefile4 "$modpath/$module4"
 #
 
 # load test
-lappend ans [list set testsuite "yes"]
-lappend ans [list setpath PATH $pathnew]
-lappend ans [list set LOADEDMODULES $module]
+lappend ans [list set PATH $pathnew]
 lappend ans [list set _LMFILES_ $modulefile]
+lappend ans [list set LOADEDMODULES $module]
+lappend ans [list set testsuite "yes"]
 
 testouterr_cmd_re "ALL" "load $module" $ans ""
 
@@ -51,10 +51,10 @@ skip_if_quick_mode
 
 # test with relative path source
 set ans [list]
-lappend ans [list set testsuite "yes"]
-lappend ans [list setpath PATH $pathnew]
-lappend ans [list set LOADEDMODULES $module3]
+lappend ans [list set PATH $pathnew]
 lappend ans [list set _LMFILES_ $modulefile3]
+lappend ans [list set LOADEDMODULES $module3]
+lappend ans [list set testsuite "yes"]
 
 testouterr_cmd_re "sh" "load $module3" $ans ""
 
@@ -80,10 +80,10 @@ set env(testsuite) "yes"
 setenv_loaded_module $module $modulefile
 
 set ans [list]
-lappend ans [list unset testsuite]
-lappend ans [list setpath PATH $path]
-lappend ans [list unset LOADEDMODULES]
+lappend ans [list set PATH $path]
 lappend ans [list unset _LMFILES_]
+lappend ans [list unset LOADEDMODULES]
+lappend ans [list unset testsuite]
 
 testouterr_cmd_re "ALL" "unload $module" $ans ""
 
@@ -96,10 +96,10 @@ set env(testsuite) "yes"
 setenv_loaded_module $module3 $modulefile3
 
 set ans [list]
-lappend ans [list unset testsuite]
-lappend ans [list setpath PATH $path]
-lappend ans [list unset LOADEDMODULES]
+lappend ans [list set PATH $path]
 lappend ans [list unset _LMFILES_]
+lappend ans [list unset LOADEDMODULES]
+lappend ans [list unset testsuite]
 
 testouterr_cmd_re "sh" "unload $module3" $ans ""
 
diff --git a/testsuite/modules.50-cmds/350-allin.exp b/testsuite/modules.50-cmds/350-allin.exp
index 2089517b..506233b2 100644
--- a/testsuite/modules.50-cmds/350-allin.exp
+++ b/testsuite/modules.50-cmds/350-allin.exp
@@ -101,7 +101,7 @@ setenv_path_var MODULEPATH $modulepath
 set ans [list]
 lappend ans [list set ts1 ok]
 lappend ans [list set tsu ""]
-lappend ans [list setpath TSPATH "dir3 dir2"]
+lappend ans [list set TSPATH "dir3 dir2"]
 lappend ans [list set tsp "dir3 dir2"]
 lappend ans [list unset ts2]
 lappend ans [list unset tsc]
@@ -114,7 +114,7 @@ lappend ans [list set __MODULES_LMPREREQ $module/1&$module/5]
 lappend ans [list set LOADEDMODULES $module/5:$module/1]
 lappend ans [list set _LMFILES_ $modulepath/$module/5:$modulepath/$module/1]
 lappend ans [list set __MODULES_LMTAG $module/5&auto-loaded]
-lappend ans [list setpath MODULEPATH $modulepath]
+lappend ans [list set MODULEPATH $modulepath]
 lappend ans [list set __MODULES_LMCONFLICT $module/1&$module/4]
 set tserr1 "$modulepathre:
 $module/1
@@ -177,13 +177,13 @@ setenv_var __MODULES_LMCONFLICT $module/1&$module/4
 setenv_var ts1 "ok"
 setenv_var tsu ""
 setenv_var TSPATH "dir3 dir2"
-setenv_var __MODULES_SHARE_TSPATH "dir3:1:dir2:1"
+unsetenv_var __MODULES_SHARE_TSPATH
 setenv_var tsp "dir3 dir2"
 set ans [list]
 lappend ans [list unset ts1]
 lappend ans [list unset tsc]
 lappend ans [list unset tsu]
-lappend ans [list unsetpath TSPATH]
+lappend ans [list unset TSPATH]
 lappend ans [list unset tsp]
 lappend ans [list set ts2 ok]
 lappend ans [list unset ts3]
@@ -192,8 +192,8 @@ lappend ans [list unxres Ileaf.popup.saveUnder]
 lappend ans [list unset __MODULES_LMPREREQ]
 lappend ans [list unset LOADEDMODULES]
 lappend ans [list unset _LMFILES_]
-lappend ans [list unset __MODULES_LMCONFLICT]
 lappend ans [list unset __MODULES_LMALTNAME]
+lappend ans [list unset __MODULES_LMCONFLICT]
 lappend ans [list unset __MODULES_LMTAG]
 set tserr1 "$modulepathre:
 $module/1 <L>
diff --git a/testsuite/modules.50-cmds/359-allin-env.exp b/testsuite/modules.50-cmds/359-allin-env.exp
index cead838b..21e5a2f5 100644
--- a/testsuite/modules.50-cmds/359-allin-env.exp
+++ b/testsuite/modules.50-cmds/359-allin-env.exp
@@ -99,19 +99,19 @@ set tsall ",dir2,dir2:dir1,,altered,dir2,altered,ok8,ok9"
 set ans [list]
 lappend ans [list unset ts1]
 lappend ans [list set ts2 "dir2"]
+lappend ans [list set _LMFILES_ "$modulefile/1:$modulefile/2"]
+lappend ans [list set LOADEDMODULES "$module/1:$module/2"]
 lappend ans [list set ts3 "dir2:dir1"]
 lappend ans [list set ts4 ""]
-lappend ans [list setpath TSPATH dir2]
+lappend ans [list set TSPATH dir2]
 lappend ans [list set ts5 "altered"]
 lappend ans [list set ts6 "dir2"]
 lappend ans [list set ts7 "altered"]
+lappend ans [list set TSPATH2 ok8]
 lappend ans [list set ts8 "ok8"]
-lappend ans [list set ts9 "ok9"]
-lappend ans [list setpath TSPATH2 ok8]
-lappend ans [list setpath TSPATH3 "ok8:ok9"]
-lappend ans [list set LOADEDMODULES "$module/1:$module/2"]
-lappend ans [list set _LMFILES_ "$modulefile/1:$modulefile/2"]
+lappend ans [list set TSPATH3 "ok8:ok9"]
 lappend ans [list set tsall $tsall]
+lappend ans [list set ts9 "ok9"]
 # env changes spread to next loaded modulefiles
 testouterr_cmd_re "sh" "load $module/1 $module/2" $ans ""
 
@@ -129,6 +129,25 @@ setenv_path_var TSPATH2 "ok8"
 setenv_path_var TSPATH3 "ok8:ok9"
 setenv_var tsall $tsall
 
+set ans [list]
+lappend ans [list unset ts1]
+lappend ans [list set ts2 "dir2"]
+lappend ans [list set _LMFILES_ "$modulefile/1:$modulefile/2"]
+lappend ans [list set LOADEDMODULES "$module/1:$module/2"]
+lappend ans [list set ts3 "dir2:dir1"]
+lappend ans [list set ts4 ""]
+lappend ans [list set TSPATH dir2]
+lappend ans [list set ts5 "altered"]
+lappend ans [list set ts6 "dir2"]
+lappend ans [list set ts7 "altered"]
+lappend ans [list set TSPATH2 ok8]
+lappend ans [list set TSPATH3 "ok8:ok9"]
+lappend ans [list set ts8 "ok8"]
+lappend ans [list set tsall $tsall]
+lappend ans [list set ts9 "ok9"]
+lappend ans [list set __MODULES_SHARE_TSPATH dir2:2]
+lappend ans [list set __MODULES_SHARE_TSPATH2 ok8:2]
+lappend ans [list set __MODULES_SHARE_TSPATH3 ok8:2:ok9:2]
 testouterr_cmd_re "sh" "load $module/1 $module/2" $ans ""
 
 
@@ -149,19 +168,16 @@ lappend ans [list unset ts4]
 lappend ans [list unset TSPATH]
 lappend ans [list unset ts5]
 lappend ans [list unset ts6]
-lappend ans [list unset TSPATH2]
 lappend ans [list unset ts7]
+lappend ans [list unset TSPATH2]
 lappend ans [list set TSPATH3 ok8]
 lappend ans [list unset ts8]
 lappend ans [list unset tsall]
 lappend ans [list unset ts9]
-lappend ans [list unset __MODULES_SHARE_TSPATH]
-lappend ans [list unset __MODULES_SHARE_TSPATH2]
-lappend ans [list set __MODULES_SHARE_TSPATH3 "ok8:1"]
 testouterr_cmd "sh" "unload $module/1 $module/2" $ans ""
 
 # test with module loaded but vanished env vars
-unsetenv_var ts2 
+unsetenv_var ts2
 unsetenv_var ts3
 unsetenv_var ts4
 unsetenv_path_var TSPATH
@@ -243,7 +259,7 @@ testouterr_cmd_re "sh" "display $module/1 $module/2" "" $tserr
 
 # restore environment
 unsetenv_loaded_module
-unsetenv_var ts2 
+unsetenv_var ts2
 unsetenv_var ts3
 unsetenv_var ts4
 unsetenv_path_var TSPATH
@@ -285,7 +301,7 @@ testouterr_cmd_re "sh" "help $module/1 $module/2" "" $tserr
 
 # restore environment
 unsetenv_loaded_module
-unsetenv_var ts2 
+unsetenv_var ts2
 unsetenv_var ts3
 unsetenv_var ts4
 unsetenv_path_var TSPATH
@@ -327,7 +343,7 @@ testouterr_cmd_re "sh" "test $module/1 $module/2" "" $tserr
 
 # restore environment
 unsetenv_loaded_module
-unsetenv_var ts2 
+unsetenv_var ts2
 unsetenv_var ts3
 unsetenv_var ts4
 unsetenv_path_var TSPATH
@@ -373,7 +389,7 @@ testouterr_cmd_re "sh" "whatis $module" "" $whatis
 
 # restore environment
 unsetenv_loaded_module
-unsetenv_var ts2 
+unsetenv_var ts2
 unsetenv_var ts3
 unsetenv_var ts4
 unsetenv_path_var TSPATH
diff --git a/testsuite/modules.50-cmds/373-deps4.exp b/testsuite/modules.50-cmds/373-deps4.exp
index 8fc55b92..b35bfddc 100644
--- a/testsuite/modules.50-cmds/373-deps4.exp
+++ b/testsuite/modules.50-cmds/373-deps4.exp
@@ -229,17 +229,17 @@ unsetenv_var __MODULES_LMCONFLICT
 setenv_path_var FOO "/path/to/g4-g1"
 
 set ans [list]
-lappend ans [list setpath FOO "/path/to/g4-g1-g2"]
-lappend ans [list set LOADEDMODULES "g1:g2:g4"]
-lappend ans [list set _LMFILES_ "$mp/g1:$mp/g2:$mp/g4"]
+lappend ans [list set FOO "/path/to/g4-g1-g2"]
 lappend ans [list set __MODULES_LMPREREQ "g4&g1|g2|g3"]
+lappend ans [list set _LMFILES_ "$mp/g1:$mp/g2:$mp/g4"]
+lappend ans [list set LOADEDMODULES "g1:g2:g4"]
 testouterr_cmd_re "sh" "load g2" $ans [msg_top_load g2 {} {} g4]
 
 set ans [list]
-lappend ans [list setpath FOO "/path/to/g4-g2"]
-lappend ans [list set LOADEDMODULES "g2:g4"]
-lappend ans [list set _LMFILES_ "$mp/g2:$mp/g4"]
+lappend ans [list set FOO "/path/to/g4-g2"]
 lappend ans [list set __MODULES_LMPREREQ "g4&g1|g2|g3"]
+lappend ans [list set _LMFILES_ "$mp/g2:$mp/g4"]
+lappend ans [list set LOADEDMODULES "g2:g4"]
 testouterr_cmd_re "sh" "switch g1 g2" $ans [msg_top_switch g1 g2 {} {} {} {} g4]
 
 # unload test that creates a prereq violation
@@ -262,10 +262,10 @@ lappend ans [list set LOADEDMODULES "g1:g4"]
 testouterr_cmd_re "sh" "load g1" $ans [msg_top_load g1 {} {} g4]
 
 set ans [list]
-lappend ans [list setpath FOO "/path/to/g4-g2:/path/to/g4-g1"]
-lappend ans [list set LOADEDMODULES "g2:g4"]
-lappend ans [list set _LMFILES_ "$mp/g2:$mp/g4"]
+lappend ans [list set FOO "/path/to/g4-g2:/path/to/g4-g1"]
 lappend ans [list set __MODULES_LMPREREQ "g4&g1|g2|g3"]
+lappend ans [list set _LMFILES_ "$mp/g2:$mp/g4"]
+lappend ans [list set LOADEDMODULES "g2:g4"]
 # g4 unload phase did not correctly unset path in FOO (still reference to g1 path)
 testouterr_cmd_re "sh" "load g2" $ans [msg_top_load g2 {} {} g4]
 
@@ -274,19 +274,19 @@ setenv_loaded_module [list g1 g2 g4] [list "$mp/g1" "$mp/g2" "$mp/g4"]
 setenv_path_var FOO "/path/to/g4-g1-g2"
 
 set ans [list]
-lappend ans [list setpath FOO "/path/to/g4-g2"]
-lappend ans [list set LOADEDMODULES "g2:g4"]
-lappend ans [list set _LMFILES_ "$mp/g2:$mp/g4"]
+lappend ans [list set FOO "/path/to/g4-g2"]
 lappend ans [list set __MODULES_LMPREREQ "g4&g1|g2|g3"]
+lappend ans [list set _LMFILES_ "$mp/g2:$mp/g4"]
+lappend ans [list set LOADEDMODULES "g2:g4"]
 testouterr_cmd_re "sh" "unload g1" $ans [msg_top_unload g1 {} {} g4]
 
 # load test that creates a conflict violation
 set ans [list]
-lappend ans [list setpath FOO "/path/to/g4-g1-g2-g3"]
-lappend ans [list set LOADEDMODULES "g1:g2:g3:g4"]
-lappend ans [list set _LMFILES_ "$mp/g1:$mp/g2:$mp/g3:$mp/g4"]
-lappend ans [list set __MODULES_LMPREREQ "g4&g1|g2|g3"]
+lappend ans [list set FOO "/path/to/g4-g1-g2-g3"]
 lappend ans [list set __MODULES_LMCONFLICT "g3&g2"]
+lappend ans [list set __MODULES_LMPREREQ "g4&g1|g2|g3"]
+lappend ans [list set _LMFILES_ "$mp/g1:$mp/g2:$mp/g3:$mp/g4"]
+lappend ans [list set LOADEDMODULES "g1:g2:g3:g4"]
 testouterr_cmd_re "sh" "load --force g3" $ans [msg_top_load g3 {} {} g4 [err_conlof g2]]
 
 # set loaded situation where a conflict violation exists
@@ -296,11 +296,11 @@ setenv_path_var FOO "/path/to/g4-g1-g2-g3"
 
 # unload test that solves a conflict violation
 set ans [list]
-lappend ans [list setpath FOO "/path/to/g4-g1-g2"]
-lappend ans [list set LOADEDMODULES "g1:g2:g4"]
-lappend ans [list set _LMFILES_ "$mp/g1:$mp/g2:$mp/g4"]
-lappend ans [list set __MODULES_LMPREREQ "g4&g1|g2|g3"]
+lappend ans [list set FOO "/path/to/g4-g1-g2"]
 lappend ans [list unset __MODULES_LMCONFLICT]
+lappend ans [list set __MODULES_LMPREREQ "g4&g1|g2|g3"]
+lappend ans [list set _LMFILES_ "$mp/g1:$mp/g2:$mp/g4"]
+lappend ans [list set LOADEDMODULES "g1:g2:g4"]
 testouterr_cmd_re "sh" "unload g3" $ans [msg_top_unload g3 {} {} [list g2 g4]]
 
 # set loaded situation where a conflict violation exists on main module
@@ -320,11 +320,11 @@ setenv_loaded_module [list g1 g4 g5] [list "$mp/g1" "$mp/g4" "$mp/g5"]
 # although conflict is solved g4 is not able to correctly unset previous FOO value as it was not
 # updated when conflict violation was there
 set ans [list]
-lappend ans [list setpath FOO "/path/to/g4-g1:/path/to/g4-g1-g2"]
-lappend ans [list set LOADEDMODULES "g1:g4"]
-lappend ans [list set _LMFILES_ "$mp/g1:$mp/g4"]
-lappend ans [list set __MODULES_LMPREREQ "g4&g1|g2|g3"]
+lappend ans [list set FOO "/path/to/g4-g1:/path/to/g4-g1-g2"]
 lappend ans [list unset __MODULES_LMCONFLICT]
+lappend ans [list set __MODULES_LMPREREQ "g4&g1|g2|g3"]
+lappend ans [list set _LMFILES_ "$mp/g1:$mp/g4"]
+lappend ans [list set LOADEDMODULES "g1:g4"]
 testouterr_cmd_re "sh" "unload g5" $ans [msg_top_unload g5 {} {} g4]
 
 
diff --git a/testsuite/modules.50-cmds/400-source-sh.exp b/testsuite/modules.50-cmds/400-source-sh.exp
index 78f16077..bfbe78e5 100644
--- a/testsuite/modules.50-cmds/400-source-sh.exp
+++ b/testsuite/modules.50-cmds/400-source-sh.exp
@@ -35,30 +35,26 @@ setenv_var TESTSUITE_SHTOMOD_PATHDUP 1
 
 # basic load
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOOPATHDUPMIX ":1:/path/to/dir1 /path/to/dir2 /path/to/dir1:1:/path/to/dir1:1:/path/to/dir3:1"]
-lappend ans [list set __MODULES_SHARE_FOOPATH /path/to/dir1:1:/path/to/dir2:1:/path/to/dir3:1]
+lappend ans [list set __MODULES_SHARE_FOOPATHDUPMIX ":1"]
 lappend ans [list set _LMFILES_ $mp/source-sh/1]
 lappend ans [list set LOADEDMODULES source-sh/1]
 lappend ans [list set FOOPATHDUP "/path/to/dir1:/path/to/dir2:/path/to/dir3:/path/to dir4"]
 lappend ans [list set __MODULES_LMSOURCESH source-sh/1\&bash\ testsuite/example/sh-to-mod.sh\|chdir\ $mp\|prepend-path\ FOOPATH\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\|prepend-path\ FOOPATHCB\ /path/to/dir1\ /path/to/d\\\{r2\ /path/to/dir3\|prepend-path\ FOOPATHDUP\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\ \{/path/to\ dir4\}\|prepend-path\ FOOPATHDUPEM\ \{\}\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\|prepend-path\ FOOPATHDUPMIX\ \{\}\ /path/to/dir1\ \{/path/to/dir1\ /path/to/dir2\ /path/to/dir1\}\ /path/to/dir3\|prepend-path\ FOOPATHDUPSP\ \{/path/to/dir1\ /path/to/dir1\ /path/to/dir2\ /path/to/dir1\ /path/to/dir3\ /path/to\}\ \{dir4\ /path/to/dir3\}\|prepend-path\ FOOPATHEM\ \{\}\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\|set-alias\ alcb\ \{\}\|set-alias\ alem\ \{\}\|set-alias\ alfoo\ \{\}\|set-alias\ alsp\ \{\}\|set-function\ funccb\ \{\}\|set-function\ funcfoo\ \{\}\|set-function\ funcnl\ \{\}\|set-function\ funcsp\ \{\}\|setenv\ FOO\ value\|setenv\ FOOCB\ va\\\{ue\|setenv\ FOOEM\ \{\}\|setenv\ FOOPATHDUPSPEM\ \{/path/to/dir1\ /path/to/dir1\ /path/to/dir2\ /path/to/dir1\ /path/to/dir3\ /path/to/dir3\ \}\|setenv\ FOOPATHSP\ \{/path/to/dir1\ /path/to/dir2\ /path/to/dir3\}\|setenv\ FOOPATHSPEM\ \{/path/to/dir1\ /path/to/dir2\ /path/to/dir3\ \}\|setenv\ FOOSP\ \{value\ \}]
 lappend ans [list set FOOPATHEM :/path/to/dir1:/path/to/dir2:/path/to/dir3]
 lappend ans [list set FOOPATHSP {/path/to/dir1 /path/to/dir2 /path/to/dir3}]
-lappend ans [list set __MODULES_SHARE_FOOPATHDUPEM :1:/path/to/dir1:1:/path/to/dir2:1:/path/to/dir3:1]
-lappend ans [list set __MODULES_SHARE_FOOPATHDUPSP "/path/to/dir1 /path/to/dir1 /path/to/dir2 /path/to/dir1 /path/to/dir3 /path/to:1:dir4 /path/to/dir3:1"]
+lappend ans [list set __MODULES_SHARE_FOOPATHDUPEM :1]
 lappend ans [list set FOOEM {}]
 lappend ans [list set FOOPATHCB /path/to/dir1:/path/to/d\{r2:/path/to/dir3]
 lappend ans [list set FOOSP {value }]
 lappend ans [list set FOOPATHDUPSPEM {/path/to/dir1 /path/to/dir1 /path/to/dir2 /path/to/dir1 /path/to/dir3 /path/to/dir3 }]
 lappend ans [list set FOOPATHDUPMIX ":/path/to/dir1:/path/to/dir1 /path/to/dir2 /path/to/dir1:/path/to/dir3"]
-lappend ans [list set FOOCB va\{ue]
 lappend ans [list set FOOPATH /path/to/dir1:/path/to/dir2:/path/to/dir3]
-lappend ans [list set __MODULES_SHARE_FOOPATHDUP "/path/to/dir1:1:/path/to dir4:1:/path/to/dir2:1:/path/to/dir3:1"]
-lappend ans [list set __MODULES_SHARE_FOOPATHEM :1:/path/to/dir1:1:/path/to/dir2:1:/path/to/dir3:1]
-lappend ans [list set FOO value]
+lappend ans [list set FOOCB va\{ue]
+lappend ans [list set __MODULES_SHARE_FOOPATHEM :1]
 lappend ans [list set FOOPATHDUPEM :/path/to/dir1:/path/to/dir2:/path/to/dir3]
+lappend ans [list set FOO value]
 lappend ans [list set FOOPATHDUPSP "/path/to/dir1 /path/to/dir1 /path/to/dir2 /path/to/dir1 /path/to/dir3 /path/to:dir4 /path/to/dir3"]
 lappend ans [list set FOOPATHSPEM {/path/to/dir1 /path/to/dir2 /path/to/dir3 }]
-lappend ans [list set __MODULES_SHARE_FOOPATHCB /path/to/d\{r2:1:/path/to/dir1:1:/path/to/dir3:1]
 lappend ans [list alias alsp {echo f\"o; echo b\\\"r; echo f\'o}]
 lappend ans [list alias alfoo {echo $(grep "report .Modules " ../../modulecmd.tcl | tr -d \\ 2>/dev/null | awk '{print $3}')}]
 lappend ans [list alias alcb echo\ f\{o]
@@ -78,11 +74,11 @@ testouterr_cmd sh {load source-sh/1} $ans {}
 setenv_loaded_module [list source-sh/1] [list $mp/source-sh/1]
 setenv_var __MODULES_LMSOURCESH source-sh/1\&bash\ testsuite/example/sh-to-mod.sh\|chdir\ $mp\|prepend-path\ FOOPATH\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\|prepend-path\ FOOPATHCB\ /path/to/dir1\ /path/to/d\\\{r2\ /path/to/dir3\|prepend-path\ FOOPATHDUP\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\ \{/path/to\ dir4\}\|prepend-path\ FOOPATHDUPEM\ \{\}\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\|prepend-path\ FOOPATHDUPMIX\ \{\}\ /path/to/dir1\ \{/path/to/dir1\ /path/to/dir2\ /path/to/dir1\}\ /path/to/dir3\|prepend-path\ FOOPATHDUPSP\ \{/path/to/dir1\ /path/to/dir1\ /path/to/dir2\ /path/to/dir1\ /path/to/dir3\ /path/to\}\ \{dir4\ /path/to/dir3\}\|prepend-path\ FOOPATHEM\ \{\}\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\|set-alias\ alcb\ \{\}\|set-alias\ alem\ \{\}\|set-alias\ alfoo\ \{\}\|set-alias\ alsp\ \{\}\|set-function\ funccb\ \{\}\|set-function\ funcfoo\ \{\}\|set-function\ funcnl\ \{\}\|set-function\ funcsp\ \{\}\|setenv\ FOO\ value\|setenv\ FOOCB\ va\\\{ue\|setenv\ FOOEM\ \{\}\|setenv\ FOOPATHDUPSPEM\ \{/path/to/dir1\ /path/to/dir1\ /path/to/dir2\ /path/to/dir1\ /path/to/dir3\ /path/to/dir3\ \}\|setenv\ FOOPATHSP\ \{/path/to/dir1\ /path/to/dir2\ /path/to/dir3\}\|setenv\ FOOPATHSPEM\ \{/path/to/dir1\ /path/to/dir2\ /path/to/dir3\ \}\|setenv\ FOOSP\ \{value\ \}
 setenv_path_var FOOPATHDUP "/path/to/dir1:/path/to/dir2:/path/to/dir3:/path/to dir4"
-setenv_path_var FOOPATHEM :/path/to/dir1:/path/to/dir2:/path/to/dir3
+setenv_path_var FOOPATHEM {} /path/to/dir1 /path/to/dir2 /path/to/dir3
 setenv_path_var FOOPATHCB /path/to/dir1:/path/to/d\{r2:/path/to/dir3
-setenv_path_var FOOPATHDUPMIX ":/path/to/dir1:/path/to/dir1 /path/to/dir2 /path/to/dir1:/path/to/dir3"
+setenv_path_var FOOPATHDUPMIX {} "/path/to/dir1:/path/to/dir1 /path/to/dir2 /path/to/dir1:/path/to/dir3"
 setenv_path_var FOOPATH /path/to/dir1:/path/to/dir2:/path/to/dir3
-setenv_path_var FOOPATHDUPEM :/path/to/dir1:/path/to/dir2:/path/to/dir3
+setenv_path_var FOOPATHDUPEM {} /path/to/dir1:/path/to/dir2:/path/to/dir3
 setenv_path_var FOOPATHDUPSP "/path/to/dir1 /path/to/dir1 /path/to/dir2 /path/to/dir1 /path/to/dir3 /path/to:dir4 /path/to/dir3"
 setenv_var FOOPATHSP {/path/to/dir1 /path/to/dir2 /path/to/dir3}
 setenv_var FOOEM {}
@@ -94,7 +90,6 @@ setenv_var FOOPATHSPEM {/path/to/dir1 /path/to/dir2 /path/to/dir3 }
 
 set ans [list]
 lappend ans [list unset __MODULES_SHARE_FOOPATHDUPMIX]
-lappend ans [list unset __MODULES_SHARE_FOOPATH]
 lappend ans [list unset _LMFILES_]
 lappend ans [list unset LOADEDMODULES]
 lappend ans [list unset FOOPATHDUP]
@@ -102,21 +97,18 @@ lappend ans [list unset __MODULES_LMSOURCESH]
 lappend ans [list unset FOOPATHEM]
 lappend ans [list unset FOOPATHSP]
 lappend ans [list unset __MODULES_SHARE_FOOPATHDUPEM]
-lappend ans [list unset __MODULES_SHARE_FOOPATHDUPSP]
 lappend ans [list unset FOOEM]
 lappend ans [list unset FOOPATHCB]
 lappend ans [list unset FOOSP]
 lappend ans [list unset FOOPATHDUPSPEM]
 lappend ans [list unset FOOPATHDUPMIX]
-lappend ans [list unset FOOCB]
 lappend ans [list unset FOOPATH]
-lappend ans [list unset __MODULES_SHARE_FOOPATHDUP]
+lappend ans [list unset FOOCB]
 lappend ans [list unset __MODULES_SHARE_FOOPATHEM]
-lappend ans [list unset FOO]
 lappend ans [list unset FOOPATHDUPEM]
+lappend ans [list unset FOO]
 lappend ans [list unset FOOPATHDUPSP]
 lappend ans [list unset FOOPATHSPEM]
-lappend ans [list unset __MODULES_SHARE_FOOPATHCB]
 lappend ans [list unalias alsp]
 lappend ans [list unalias alfoo]
 lappend ans [list unalias alcb]
@@ -131,10 +123,10 @@ skip_if_quick_mode
 
 # load other modulefiles using source-sh
 set ans [list]
-lappend ans [list set LOADEDMODULES source-sh/1:source-sh/2]
-lappend ans [list set _LMFILES_ $mp/source-sh/1:$mp/source-sh/2]
-lappend ans [list setpath FOOPATH /path/to/mini:/path/to/dir1:/path/to/dir2:/path/to/dir3]
 lappend ans [list set FOOMINI value]
+lappend ans [list set FOOPATH /path/to/mini:/path/to/dir1:/path/to/dir2:/path/to/dir3]
+lappend ans [list set _LMFILES_ $mp/source-sh/1:$mp/source-sh/2]
+lappend ans [list set LOADEDMODULES source-sh/1:source-sh/2]
 lappend ans [list set __MODULES_LMSOURCESH source-sh/1\&bash\ testsuite/example/sh-to-mod.sh\|chdir\ $mp\|prepend-path\ FOOPATH\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\|prepend-path\ FOOPATHCB\ /path/to/dir1\ /path/to/d\\\{r2\ /path/to/dir3\|prepend-path\ FOOPATHDUP\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\ \{/path/to\ dir4\}\|prepend-path\ FOOPATHDUPEM\ \{\}\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\|prepend-path\ FOOPATHDUPMIX\ \{\}\ /path/to/dir1\ \{/path/to/dir1\ /path/to/dir2\ /path/to/dir1\}\ /path/to/dir3\|prepend-path\ FOOPATHDUPSP\ \{/path/to/dir1\ /path/to/dir1\ /path/to/dir2\ /path/to/dir1\ /path/to/dir3\ /path/to\}\ \{dir4\ /path/to/dir3\}\|prepend-path\ FOOPATHEM\ \{\}\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\|set-alias\ alcb\ \{\}\|set-alias\ alem\ \{\}\|set-alias\ alfoo\ \{\}\|set-alias\ alsp\ \{\}\|set-function\ funccb\ \{\}\|set-function\ funcfoo\ \{\}\|set-function\ funcnl\ \{\}\|set-function\ funcsp\ \{\}\|setenv\ FOO\ value\|setenv\ FOOCB\ va\\\{ue\|setenv\ FOOEM\ \{\}\|setenv\ FOOPATHDUPSPEM\ \{/path/to/dir1\ /path/to/dir1\ /path/to/dir2\ /path/to/dir1\ /path/to/dir3\ /path/to/dir3\ \}\|setenv\ FOOPATHSP\ \{/path/to/dir1\ /path/to/dir2\ /path/to/dir3\}\|setenv\ FOOPATHSPEM\ \{/path/to/dir1\ /path/to/dir2\ /path/to/dir3\ \}\|setenv\ FOOSP\ \{value\ \}:source-sh/2\&sh\ testsuite/example/mini-sh-to-mod.sh\|prepend-path\ FOOPATH\ /path/to/mini\|set-alias\ almini\ \{\}\|setenv\ FOOMINI\ value]
 lappend ans [list alias almini echo\ mini]
 testouterr_cmd_re sh {load source-sh/2} $ans {}
@@ -147,7 +139,6 @@ setenv_var __MODULES_LMSOURCESH source-sh/1\&bash\ testsuite/example/sh-to-mod.s
 
 set ans [list]
 lappend ans [list unset FOOMINI]
-lappend ans [list set __MODULES_SHARE_FOOPATH /path/to/dir1:1:/path/to/dir2:1:/path/to/dir3:1]
 lappend ans [list set FOOPATH /path/to/dir1:/path/to/dir2:/path/to/dir3]
 lappend ans [list set _LMFILES_ $mp/source-sh/1]
 lappend ans [list set LOADEDMODULES source-sh/1]
@@ -157,7 +148,6 @@ testouterr_cmd sh {unload source-sh/2} $ans {}
 
 set ans [list]
 lappend ans [list unset __MODULES_SHARE_FOOPATHDUPMIX]
-lappend ans [list set __MODULES_SHARE_FOOPATH /path/to/mini:1]
 lappend ans [list set _LMFILES_ $mp/source-sh/2]
 lappend ans [list set LOADEDMODULES source-sh/2]
 lappend ans [list unset FOOPATHDUP]
@@ -165,21 +155,18 @@ lappend ans [list set __MODULES_LMSOURCESH source-sh/2\&sh\ testsuite/example/mi
 lappend ans [list unset FOOPATHEM]
 lappend ans [list unset FOOPATHSP]
 lappend ans [list unset __MODULES_SHARE_FOOPATHDUPEM]
-lappend ans [list unset __MODULES_SHARE_FOOPATHDUPSP]
 lappend ans [list unset FOOEM]
 lappend ans [list unset FOOPATHCB]
 lappend ans [list unset FOOSP]
 lappend ans [list unset FOOPATHDUPSPEM]
 lappend ans [list unset FOOPATHDUPMIX]
-lappend ans [list unset FOOCB]
 lappend ans [list set FOOPATH /path/to/mini]
-lappend ans [list unset __MODULES_SHARE_FOOPATHDUP]
+lappend ans [list unset FOOCB]
 lappend ans [list unset __MODULES_SHARE_FOOPATHEM]
-lappend ans [list unset FOO]
 lappend ans [list unset FOOPATHDUPEM]
+lappend ans [list unset FOO]
 lappend ans [list unset FOOPATHDUPSP]
 lappend ans [list unset FOOPATHSPEM]
-lappend ans [list unset __MODULES_SHARE_FOOPATHCB]
 lappend ans [list unalias alsp]
 lappend ans [list unalias alfoo]
 lappend ans [list unalias alcb]
@@ -194,14 +181,12 @@ testouterr_cmd sh {unload source-sh/1} $ans {}
 set ans [list]
 lappend ans [list set FOOPATHDUPEM :/path/to/dir1:/path/to/dir1:/path/to/dir2:/path/to/dir1:/path/to/dir3::/path/to/dir3]
 lappend ans [list unset __MODULES_SHARE_FOOPATHDUPEM]
-lappend ans [list set __MODULES_SHARE_FOOPATHDUPMIX ":2:/path/to/dir1 /path/to/dir2 /path/to/dir1:1:/path/to/dir1:1:/path/to/dir3:2"]
+lappend ans [list set __MODULES_SHARE_FOOPATHDUPMIX ":2:/path/to/dir3:2"]
 lappend ans [list set FOOPATHDUPMIX :/path/to/dir1:/path/to/dir1\ /path/to/dir2\ /path/to/dir1:/path/to/dir3]
 lappend ans [list set FOOPATH /path/to/dir1:/path/to/dir2:/path/to/dir3]
-lappend ans [list unset __MODULES_SHARE_FOOPATH]
 lappend ans [list set _LMFILES_ $mp/source-sh/1:$mp/source-sh/2:$mp/source-sh/3]
 lappend ans [list set LOADEDMODULES source-sh/1:source-sh/2:source-sh/3]
 lappend ans [list set FOOPATHDUP "/path/to/dir1:/path/to/dir1:/path/to/dir2:/path/to/dir1:/path/to/dir3:/path/to dir4:/path/to/dir3"]
-lappend ans [list unset __MODULES_SHARE_FOOPATHDUP]
 lappend ans [list set __MODULES_LMSOURCESH source-sh/1\&bash\ testsuite/example/sh-to-mod.sh\|chdir\ $mp\|prepend-path\ FOOPATH\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\|prepend-path\ FOOPATHCB\ /path/to/dir1\ /path/to/d\\\{r2\ /path/to/dir3\|prepend-path\ FOOPATHDUP\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\ \{/path/to\ dir4\}\|prepend-path\ FOOPATHDUPEM\ \{\}\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\|prepend-path\ FOOPATHDUPMIX\ \{\}\ /path/to/dir1\ \{/path/to/dir1\ /path/to/dir2\ /path/to/dir1\}\ /path/to/dir3\|prepend-path\ FOOPATHDUPSP\ \{/path/to/dir1\ /path/to/dir1\ /path/to/dir2\ /path/to/dir1\ /path/to/dir3\ /path/to\}\ \{dir4\ /path/to/dir3\}\|prepend-path\ FOOPATHEM\ \{\}\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\|set-alias\ alcb\ \{\}\|set-alias\ alem\ \{\}\|set-alias\ alfoo\ \{\}\|set-alias\ alsp\ \{\}\|set-function\ funccb\ \{\}\|set-function\ funcfoo\ \{\}\|set-function\ funcnl\ \{\}\|set-function\ funcsp\ \{\}\|setenv\ FOO\ value\|setenv\ FOOCB\ va\\\{ue\|setenv\ FOOEM\ \{\}\|setenv\ FOOPATHDUPSPEM\ \{/path/to/dir1\ /path/to/dir1\ /path/to/dir2\ /path/to/dir1\ /path/to/dir3\ /path/to/dir3\ \}\|setenv\ FOOPATHSP\ \{/path/to/dir1\ /path/to/dir2\ /path/to/dir3\}\|setenv\ FOOPATHSPEM\ \{/path/to/dir1\ /path/to/dir2\ /path/to/dir3\ \}\|setenv\ FOOSP\ \{value\ \}:source-sh/2\&sh\ testsuite/example/mini-sh-to-mod.sh\|prepend-path\ FOOPATH\ /path/to/mini\|set-alias\ almini\ \{\}\|setenv\ FOOMINI\ value:source-sh/3\&bash\ testsuite/example/sh-to-mod.sh\|append-path\ FOOPATHDUPMIX\ /path/to/dir3\ \{\}\|chdir\ $mp\|set-alias\ alcb\ \{\}\|set-alias\ alem\ \{\}\|set-alias\ alfoo\ \{\}\|set-alias\ alsp\ \{\}\|set-function\ funccb\ \{\}\|set-function\ funcfoo\ \{\}\|set-function\ funcnl\ \{\}\|set-function\ funcsp\ \{\}\|setenv\ FOOPATH\ /path/to/dir1\<EnvModEscPS\>/path/to/dir2\<EnvModEscPS\>/path/to/dir3\|setenv\ FOOPATHDUP\ \{/path/to/dir1\<EnvModEscPS\>/path/to/dir1\<EnvModEscPS\>/path/to/dir2\<EnvModEscPS\>/path/to/dir1\<EnvModEscPS\>/path/to/dir3\<EnvModEscPS\>/path/to\ dir4\<EnvModEscPS\>/path/to/dir3\}\|setenv\ FOOPATHDUPEM\ \<EnvModEscPS\>/path/to/dir1\<EnvModEscPS\>/path/to/dir1\<EnvModEscPS\>/path/to/dir2\<EnvModEscPS\>/path/to/dir1\<EnvModEscPS\>/path/to/dir3\<EnvModEscPS\>\<EnvModEscPS\>/path/to/dir3]
 lappend ans [list alias alsp {echo f\"o; echo b\\\"r; echo f\'o}]
 lappend ans [list alias alfoo {echo $(grep "report .Modules " ../../modulecmd.tcl | tr -d \\ 2>/dev/null | awk '{print $3}')}]
@@ -230,23 +215,24 @@ setenv_var FOOPATHDUPEM :/path/to/dir1:/path/to/dir1:/path/to/dir2:/path/to/dir1
 setenv_var __MODULES_LMSOURCESH source-sh/1\&bash\ testsuite/example/sh-to-mod.sh\|chdir\ $mp\|prepend-path\ FOOPATH\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\|prepend-path\ FOOPATHCB\ /path/to/dir1\ /path/to/d\\\{r2\ /path/to/dir3\|prepend-path\ FOOPATHDUP\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\ \{/path/to\ dir4\}\|prepend-path\ FOOPATHDUPEM\ \{\}\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\|prepend-path\ FOOPATHDUPMIX\ \{\}\ /path/to/dir1\ \{/path/to/dir1\ /path/to/dir2\ /path/to/dir1\}\ /path/to/dir3\|prepend-path\ FOOPATHDUPSP\ \{/path/to/dir1\ /path/to/dir1\ /path/to/dir2\ /path/to/dir1\ /path/to/dir3\ /path/to\}\ \{dir4\ /path/to/dir3\}\|prepend-path\ FOOPATHEM\ \{\}\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\|set-alias\ alcb\ \{\}\|set-alias\ alem\ \{\}\|set-alias\ alfoo\ \{\}\|set-alias\ alsp\ \{\}\|set-function\ funccb\ \{\}\|set-function\ funcfoo\ \{\}\|set-function\ funcnl\ \{\}\|set-function\ funcsp\ \{\}\|setenv\ FOO\ value\|setenv\ FOOCB\ va\\\{ue\|setenv\ FOOEM\ \{\}\|setenv\ FOOPATHDUPSPEM\ \{/path/to/dir1\ /path/to/dir1\ /path/to/dir2\ /path/to/dir1\ /path/to/dir3\ /path/to/dir3\ \}\|setenv\ FOOPATHSP\ \{/path/to/dir1\ /path/to/dir2\ /path/to/dir3\}\|setenv\ FOOPATHSPEM\ \{/path/to/dir1\ /path/to/dir2\ /path/to/dir3\ \}\|setenv\ FOOSP\ \{value\ \}:source-sh/2\&sh\ testsuite/example/mini-sh-to-mod.sh\|prepend-path\ FOOPATH\ /path/to/mini\|set-alias\ almini\ \{\}\|setenv\ FOOMINI\ value:source-sh/3\&bash\ testsuite/example/sh-to-mod.sh\|append-path\ FOOPATHDUPMIX\ /path/to/dir3\ \{\}\|chdir\ $mp\|set-alias\ alcb\ \{\}\|set-alias\ alem\ \{\}\|set-alias\ alfoo\ \{\}\|set-alias\ alsp\ \{\}\|set-function\ funccb\ \{\}\|set-function\ funcfoo\ \{\}\|set-function\ funcnl\ \{\}\|set-function\ funcsp\ \{\}\|setenv\ FOOPATH\ /path/to/dir1\<EnvModEscPS\>/path/to/dir2\<EnvModEscPS\>/path/to/dir3\|setenv\ FOOPATHDUP\ \{/path/to/dir1\<EnvModEscPS\>/path/to/dir1\<EnvModEscPS\>/path/to/dir2\<EnvModEscPS\>/path/to/dir1\<EnvModEscPS\>/path/to/dir3\<EnvModEscPS\>/path/to\ dir4\<EnvModEscPS\>/path/to/dir3\}\|setenv\ FOOPATHDUPEM\ \<EnvModEscPS\>/path/to/dir1\<EnvModEscPS\>/path/to/dir1\<EnvModEscPS\>/path/to/dir2\<EnvModEscPS\>/path/to/dir1\<EnvModEscPS\>/path/to/dir3\<EnvModEscPS\>\<EnvModEscPS\>/path/to/dir3
 
 set ans [list]
+lappend ans [list set _LMFILES_ $mp/source-sh/2:$mp/source-sh/3]
+lappend ans [list set LOADEDMODULES source-sh/2:source-sh/3]
 lappend ans [list unset FOOPATHDUP]
+lappend ans [list set __MODULES_LMSOURCESH source-sh/2\&sh\ testsuite/example/mini-sh-to-mod.sh\|prepend-path\ FOOPATH\ /path/to/mini\|set-alias\ almini\ \{\}\|setenv\ FOOMINI\ value:source-sh/3\&bash\ testsuite/example/sh-to-mod.sh\|append-path\ FOOPATHDUPMIX\ /path/to/dir3\ \{\}\|chdir\ $mp\|set-alias\ alcb\ \{\}\|set-alias\ alem\ \{\}\|set-alias\ alfoo\ \{\}\|set-alias\ alsp\ \{\}\|set-function\ funccb\ \{\}\|set-function\ funcfoo\ \{\}\|set-function\ funcnl\ \{\}\|set-function\ funcsp\ \{\}\|setenv\ FOOPATH\ /path/to/dir1\<EnvModEscPS\>/path/to/dir2\<EnvModEscPS\>/path/to/dir3\|setenv\ FOOPATHDUP\ \{/path/to/dir1\<EnvModEscPS\>/path/to/dir1\<EnvModEscPS\>/path/to/dir2\<EnvModEscPS\>/path/to/dir1\<EnvModEscPS\>/path/to/dir3\<EnvModEscPS\>/path/to\ dir4\<EnvModEscPS\>/path/to/dir3\}\|setenv\ FOOPATHDUPEM\ \<EnvModEscPS\>/path/to/dir1\<EnvModEscPS\>/path/to/dir1\<EnvModEscPS\>/path/to/dir2\<EnvModEscPS\>/path/to/dir1\<EnvModEscPS\>/path/to/dir3\<EnvModEscPS\>\<EnvModEscPS\>/path/to/dir3]
+lappend ans [list unset FOOPATHEM]
 lappend ans [list unset FOOPATHSP]
+lappend ans [list unset FOOPATHCB]
+lappend ans [list unset FOOEM]
 lappend ans [list unset FOOSP]
 lappend ans [list unset FOOPATHDUPSPEM]
-lappend ans [list unset FOOCB]
+lappend ans [list unset FOOPATHDUPMIX]
 lappend ans [list unset FOOPATH]
+lappend ans [list unset FOOCB]
+lappend ans [list unset __MODULES_SHARE_FOOPATHEM]
 lappend ans [list unset FOOPATHDUPEM]
 lappend ans [list unset FOO]
-lappend ans [list unsetpath FOOPATHDUPMIX]
-lappend ans [list unsetpath FOOPATHEM]
-lappend ans [list unsetpath FOOPATHCB]
-lappend ans [list unsetpath FOOPATHDUPSP]
+lappend ans [list unset FOOPATHDUPSP]
 lappend ans [list unset FOOPATHSPEM]
-lappend ans [list unset FOOEM]
-lappend ans [list set LOADEDMODULES source-sh/2:source-sh/3]
-lappend ans [list set _LMFILES_ $mp/source-sh/2:$mp/source-sh/3]
-lappend ans [list set __MODULES_LMSOURCESH source-sh/2\&sh\ testsuite/example/mini-sh-to-mod.sh\|prepend-path\ FOOPATH\ /path/to/mini\|set-alias\ almini\ \{\}\|setenv\ FOOMINI\ value:source-sh/3\&bash\ testsuite/example/sh-to-mod.sh\|append-path\ FOOPATHDUPMIX\ /path/to/dir3\ \{\}\|chdir\ $mp\|set-alias\ alcb\ \{\}\|set-alias\ alem\ \{\}\|set-alias\ alfoo\ \{\}\|set-alias\ alsp\ \{\}\|set-function\ funccb\ \{\}\|set-function\ funcfoo\ \{\}\|set-function\ funcnl\ \{\}\|set-function\ funcsp\ \{\}\|setenv\ FOOPATH\ /path/to/dir1\<EnvModEscPS\>/path/to/dir2\<EnvModEscPS\>/path/to/dir3\|setenv\ FOOPATHDUP\ \{/path/to/dir1\<EnvModEscPS\>/path/to/dir1\<EnvModEscPS\>/path/to/dir2\<EnvModEscPS\>/path/to/dir1\<EnvModEscPS\>/path/to/dir3\<EnvModEscPS\>/path/to\ dir4\<EnvModEscPS\>/path/to/dir3\}\|setenv\ FOOPATHDUPEM\ \<EnvModEscPS\>/path/to/dir1\<EnvModEscPS\>/path/to/dir1\<EnvModEscPS\>/path/to/dir2\<EnvModEscPS\>/path/to/dir1\<EnvModEscPS\>/path/to/dir3\<EnvModEscPS\>\<EnvModEscPS\>/path/to/dir3]
 lappend ans [list unalias alsp]
 lappend ans [list unalias alfoo]
 lappend ans [list unalias alcb]
@@ -681,7 +667,7 @@ unsetenv_var TESTSUITE_SHTOMOD_NOVAR
 set ans [list]
 lappend ans [list set FOO value]
 lappend ans [list set FOOMINI value]
-lappend ans [list set __MODULES_SHARE_FOOPATH :1:/path/to/mini:1]
+lappend ans [list set __MODULES_SHARE_FOOPATH :1]
 lappend ans [list set FOOPATH /path/to/mini:]
 lappend ans [list set FOOCB va\{ue]
 lappend ans [list set _LMFILES_ $mp/source-sh/5.0]
@@ -694,7 +680,7 @@ lappend ans [list alias almini echo\ mini]
 testouterr_cmd sh {load source-sh/5.0} $ans {}
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOOPATH :1:/path/to/mini:1]
+lappend ans [list set __MODULES_SHARE_FOOPATH :1]
 lappend ans [list set FOOMINI value]
 lappend ans [list set LOADEDMODULES source-sh/5.1]
 lappend ans [list set _LMFILES_ $mp/source-sh/5.1]
@@ -788,11 +774,11 @@ unsetenv_var FOOMINI
 # module loaded, but no __MODULES_LMSOURCESH
 setenv_loaded_module [list source-sh/1] [list $mp/source-sh/1]
 setenv_path_var FOOPATHDUP "/path/to/dir1:/path/to/dir2:/path/to/dir3:/path/to dir4"
-setenv_path_var FOOPATHEM :/path/to/dir1:/path/to/dir2:/path/to/dir3
+setenv_path_var FOOPATHEM {} /path/to/dir1 /path/to/dir2 /path/to/dir3
 setenv_path_var FOOPATHCB /path/to/dir1:/path/to/d\{r2:/path/to/dir3
-setenv_path_var FOOPATHDUPMIX ":/path/to/dir1:/path/to/dir1 /path/to/dir2 /path/to/dir1:/path/to/dir3"
+setenv_path_var FOOPATHDUPMIX {} /path/to/dir1 "/path/to/dir1 /path/to/dir2 /path/to/dir1" /path/to/dir3
 setenv_path_var FOOPATH /path/to/dir1:/path/to/dir2:/path/to/dir3
-setenv_path_var FOOPATHDUPEM :/path/to/dir1:/path/to/dir2:/path/to/dir3
+setenv_path_var FOOPATHDUPEM {} /path/to/dir1 /path/to/dir2 /path/to/dir3
 setenv_path_var FOOPATHDUPSP "/path/to/dir1 /path/to/dir1 /path/to/dir2 /path/to/dir1 /path/to/dir3 /path/to:dir4 /path/to/dir3"
 setenv_var FOOPATHSP {/path/to/dir1 /path/to/dir2 /path/to/dir3}
 setenv_var FOOEM {}
@@ -811,7 +797,6 @@ testouterr_cmd sh {unload source-sh/1} $ans {}
 setenv_var __MODULES_LMSOURCESH source-sh/1\&bash\ testsuite/example/sh-to-mod.sh\|chdir\ $mp\|prepend-path\ FOOPATH\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\|prepend-path\ FOOPATHCB\ /path/to/dir1\ /path/to/d\\\{r2\ /path/to/dir3\|prepend-path\ FOOPATHDUP\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\ \{/path/to\ dir4\}\|prepend-path\ FOOPATHDUPEM\ \{\}\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\|prepend-path\ FOOPATHDUPMIX\ \{\}\ /path/to/dir1\ \{/path/to/dir1\ /path/to/dir2\ /path/to/dir1\}\ /path/to/dir3\|prepend-path\ FOOPATHDUPSP\ \{/path/to/dir1\ /path/to/dir1\ /path/to/dir2\ /path/to/dir1\ /path/to/dir3\ /path/to\}\ \{dir4\ /path/to/dir3\}\|prepend-path\ FOOPATHEM\ \{\}\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\|set-alias\ alcb\ \{\}\|set-alias\ alem\ \{\}\|set-alias\ alsp\ \{\}\|set-function\ funccb\ \{\}\|set-function\ funcnl\ \{\}\|set-function\ funcsp\ \{\}\|setenv\ FOO\ value\|setenv\ FOOCB\ va\\\{ue\|setenv\ FOOEM\ \{\}\|setenv\ FOOPATHDUPSPEM\ \{/path/to/dir1\ /path/to/dir1\ /path/to/dir2\ /path/to/dir1\ /path/to/dir3\ /path/to/dir3\ \}\|setenv\ FOOPATHSP\ \{/path/to/dir1\ /path/to/dir2\ /path/to/dir3\}\|setenv\ FOOPATHSPEM\ \{/path/to/dir1\ /path/to/dir2\ /path/to/dir3\ \}
 set ans [list]
 lappend ans [list unset __MODULES_SHARE_FOOPATHDUPMIX]
-lappend ans [list unset __MODULES_SHARE_FOOPATH]
 lappend ans [list unset _LMFILES_]
 lappend ans [list unset LOADEDMODULES]
 lappend ans [list unset FOOPATHDUP]
@@ -819,20 +804,17 @@ lappend ans [list unset __MODULES_LMSOURCESH]
 lappend ans [list unset FOOPATHEM]
 lappend ans [list unset FOOPATHSP]
 lappend ans [list unset __MODULES_SHARE_FOOPATHDUPEM]
-lappend ans [list unset __MODULES_SHARE_FOOPATHDUPSP]
 lappend ans [list unset FOOEM]
 lappend ans [list unset FOOPATHCB]
 lappend ans [list unset FOOPATHDUPSPEM]
 lappend ans [list unset FOOPATHDUPMIX]
-lappend ans [list unset FOOCB]
 lappend ans [list unset FOOPATH]
-lappend ans [list unset __MODULES_SHARE_FOOPATHDUP]
+lappend ans [list unset FOOCB]
 lappend ans [list unset __MODULES_SHARE_FOOPATHEM]
-lappend ans [list unset FOO]
 lappend ans [list unset FOOPATHDUPEM]
+lappend ans [list unset FOO]
 lappend ans [list unset FOOPATHDUPSP]
 lappend ans [list unset FOOPATHSPEM]
-lappend ans [list unset __MODULES_SHARE_FOOPATHCB]
 lappend ans [list unalias alsp]
 lappend ans [list unalias alcb]
 lappend ans [list unalias alem]
@@ -856,7 +838,7 @@ unsetenv_var FOOPATHSPEM
 setenv_loaded_module [list source-sh/5.0] [list $mp/source-sh/5.0]
 setenv_var FOOMINI value
 setenv_var FOOARG1 arg1
-setenv_path_var FOOPATH /path/to/mini:
+setenv_path_var FOOPATH /path/to/mini {}
 setenv_var __MODULES_LMSOURCESH source-sh/5.0\&bash\ testsuite/example/sh-to-mod.sh\&sh\ testsuite/example/mini-sh-to-mod.sh\|prepend-path\ FOOPATH\ /path/to/mini\ \{\}\|set-alias\ almini\ \{\}\|setenv\ FOOMINI\ value\&bash\ testsuite/example/sh-to-mod.sh\ arg1\|setenv\ FOOARG1\ arg1
 
 set ans [list]
@@ -983,7 +965,7 @@ unsetenv_var FOOCB
 setenv_var TESTSUITE_SOURCESH_ESCCHAR 1
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOOPATH :1:/path/\{\|:1:/path/to/mini:1:/path/\}\&:1]
+lappend ans [list set __MODULES_SHARE_FOOPATH :1]
 lappend ans [list set FOOMINI value]
 lappend ans [list set LOADEDMODULES source-sh/5.0]
 lappend ans [list set _LMFILES_ $mp/source-sh/5.0]
@@ -1005,7 +987,7 @@ setenv_var FOOEM {}
 setenv_var FOOSP {value }
 setenv_var FOOARG1 arg1
 setenv_var FOOCB va\{ue
-setenv_path_var FOOPATH /path/\{\|:/path/to/mini::/path/\}\&
+setenv_path_var FOOPATH /path/\{\| /path/to/mini {} /path/\}\&
 setenv_var FOO value
 setenv_var __MODULES_LMSOURCESH source-sh/5.0\&bash\ testsuite/example/sh-to-mod.sh\|setenv\ FOO\ value\|setenv\ FOOCB\ va\\\{ue\|setenv\ FOOEM\ \{\}\|setenv\ FOOSP\ \{value\ \}\&sh\ testsuite/example/mini-sh-to-mod.sh\|prepend-path\ FOOESC\ \{\}\|prepend-path\ FOOPATH\ /path/\\\{\<EnvModEscS2\>\ /path/to/mini\ \{\}\ /path/\\\}\<EnvModEscS1\>\|set-alias\ almini\ \{\}\|setenv\ FOOMINI\ value\&bash\ testsuite/example/sh-to-mod.sh\ arg1\|setenv\ FOOARG1\ arg1
 setenv_path_var FOOESC {}
diff --git a/testsuite/modules.50-cmds/431-not-req.exp b/testsuite/modules.50-cmds/431-not-req.exp
index 868760f3..a5ac6245 100644
--- a/testsuite/modules.50-cmds/431-not-req.exp
+++ b/testsuite/modules.50-cmds/431-not-req.exp
@@ -50,7 +50,7 @@ testouterr_cmd_re sh {ml --not-req foo} ERR $tserr
 set ans0 [list]
 lappend ans0 [list set _LMFILES_ $mp/notreq/use]
 lappend ans0 [list set LOADEDMODULES notreq/use]
-lappend ans0 [list setpath MODULEPATH $env(TESTSUITEDIR):$mp]
+lappend ans0 [list set MODULEPATH $env(TESTSUITEDIR):$mp]
 set tserr [msg_load notreq/use [msg_moderr {Unsupported option '--not-req' on use sub-command} {module use --not-req $env(TESTSUITEDIR)} $mp/notreq/use 2]]
 testouterr_cmd sh {load notreq/use} ERR $tserr
 
diff --git a/testsuite/modules.50-cmds/471-variant-unload.exp b/testsuite/modules.50-cmds/471-variant-unload.exp
index e7ae390e..2fdea989 100644
--- a/testsuite/modules.50-cmds/471-variant-unload.exp
+++ b/testsuite/modules.50-cmds/471-variant-unload.exp
@@ -40,12 +40,12 @@ setenv_path_var TS2 bar-foo
 
 # unload module specifying it fully or partially
 set ans [list]
-lappend ans [list unset TS0]
-lappend ans [list unsetpath TS1]
-lappend ans [list unsetpath TS2]
-lappend ans [list unset LOADEDMODULES]
-lappend ans [list unset _LMFILES_]
 lappend ans [list unset __MODULES_LMVARIANT]
+lappend ans [list unset TS1]
+lappend ans [list unset TS2]
+lappend ans [list unset _LMFILES_]
+lappend ans [list unset LOADEDMODULES]
+lappend ans [list unset TS0]
 testouterr_cmd sh {unload variant} $ans {}
 testouterr_cmd sh {unload variant bar=2} $ans {}
 testouterr_cmd sh {unload variant bar=2 foo=val1} $ans {}
@@ -175,13 +175,13 @@ testouterr_cmd sh {unload variant/4.0 foo=val1 bar=2} OK {}
 # with default value for variant
 setenv_var TESTSUITE_VARIANT 2
 set ans [list]
-lappend ans [list unset TS0]
-lappend ans [list unsetpath TS1]
-# TS2 is kept set as value computed on unload evaluation differs from loaded value
-lappend ans [list setpath TS2 bar]
-lappend ans [list unset LOADEDMODULES]
-lappend ans [list unset _LMFILES_]
 lappend ans [list unset __MODULES_LMVARIANT]
+lappend ans [list unset TS1]
+# TS2 is kept set as value computed on unload evaluation differs from loaded value
+lappend ans [list set TS2 bar]
+lappend ans [list unset _LMFILES_]
+lappend ans [list unset LOADEDMODULES]
+lappend ans [list unset TS0]
 testouterr_cmd sh {unload variant} $ans {variant}
 testouterr_cmd sh {unload variant bar=2} $ans {variant bar=2}
 testouterr_cmd sh {unload variant/4.0 foo=val1 bar=2} OK {}
@@ -237,21 +237,19 @@ setenv_path_var TS2 {bar-foo}
 
 # switch to same modulefile but different variant value
 set ans [list]
-lappend ans [list set TS0 {bar foo}]
-lappend ans [list setpath TS1 {bar=1:foo=val2}]
-lappend ans [list setpath TS2 bar-foo]
 lappend ans [list set __MODULES_LMVARIANT variant/4.0&foo|val2|0|0&bar|1|0|0]
-lappend ans [list set LOADEDMODULES variant/4.0]
+lappend ans [list set TS1 {bar=1:foo=val2}]
+lappend ans [list set TS2 bar-foo]
 lappend ans [list set _LMFILES_ $mp/variant/4.0]
+lappend ans [list set LOADEDMODULES variant/4.0]
+lappend ans [list set TS0 {bar foo}]
 testouterr_cmd_re sh {switch variant/4.0 bar=1 foo=val2} $ans {}
 
 # unknown variant on switched-on module
 set ans [list]
 lappend ans [list unset TS1]
-lappend ans [list unset __MODULES_SHARE_TS1]
 lappend ans [list unset __MODULES_LMVARIANT]
 lappend ans [list unset TS2]
-lappend ans [list unset __MODULES_SHARE_TS2]
 lappend ans [list unset LOADEDMODULES]
 lappend ans [list unset _LMFILES_]
 lappend ans [list unset TS0]
@@ -287,30 +285,30 @@ setenv_var TS0 {bar foo}
 setenv_path_var TS1 {bar=2:foo=val1}
 setenv_path_var TS2 {bar-foo}
 set ans [list]
-lappend ans [list unset TS0]
-lappend ans [list unsetpath TS1]
-lappend ans [list unsetpath TS2]
 lappend ans [list set __MODULES_LMVARIANT variant/6.0&foo|val1|0|0&bar|2|0|0]
-lappend ans [list set LOADEDMODULES variant/6.0]
+lappend ans [list unset TS1]
+lappend ans [list unset TS2]
 lappend ans [list set _LMFILES_ $mp/variant/6.0]
+lappend ans [list set LOADEDMODULES variant/6.0]
+lappend ans [list unset TS0]
 testouterr_cmd sh {switch variant/6.0 bar=2 foo=val1} $ans {}
 set ans [list]
-lappend ans [list unset TS0]
-lappend ans [list unsetpath TS1]
-lappend ans [list unsetpath TS2]
 lappend ans [list set __MODULES_LMVARIANT variant/6.0&foo|val2|0|0&bar|1|0|0]
-lappend ans [list set LOADEDMODULES variant/6.0]
+lappend ans [list unset TS1]
+lappend ans [list unset TS2]
 lappend ans [list set _LMFILES_ $mp/variant/6.0]
+lappend ans [list set LOADEDMODULES variant/6.0]
+lappend ans [list unset TS0]
 testouterr_cmd sh {switch variant/6.0 bar=1 foo=val2} $ans {}
 
 setenv_var TESTSUITE_VARIANT 10
 set ans [list]
-lappend ans [list unset TS0]
-lappend ans [list unsetpath TS1]
-lappend ans [list unsetpath TS2]
 lappend ans [list set __MODULES_LMVARIANT variant/6.0&baz|val3|0|0]
-lappend ans [list set LOADEDMODULES variant/6.0]
+lappend ans [list unset TS1]
+lappend ans [list unset TS2]
 lappend ans [list set _LMFILES_ $mp/variant/6.0]
+lappend ans [list set LOADEDMODULES variant/6.0]
+lappend ans [list unset TS0]
 testouterr_cmd sh {switch variant/6.0 baz=val3} $ans {}
 
 
diff --git a/testsuite/modules.50-cmds/472-getvariant.exp b/testsuite/modules.50-cmds/472-getvariant.exp
index 777be196..e832d3f1 100644
--- a/testsuite/modules.50-cmds/472-getvariant.exp
+++ b/testsuite/modules.50-cmds/472-getvariant.exp
@@ -33,21 +33,21 @@ setenv_var MODULES_ADVANCED_VERSION_SPEC 1
 
 setenv_var TESTSUITE_VARIANT 1
 set ans [list]
-lappend ans [list setpath TS0 {foo=val 4:bar=2:b?r =:f* o=}]
-lappend ans [list setpath TS1 {foo=val 4:bar=2:b?r =:f* o= ef*ult}]
 lappend ans [list set __MODULES_LMVARIANT {variant/5.0&foo|val 4|0|0&bar|2|0|2&b?r ||0|0}]
-lappend ans [list set LOADEDMODULES variant/5.0]
+lappend ans [list set TS1 {foo=val 4:bar=2:b?r =:f* o= ef*ult}]
 lappend ans [list set _LMFILES_ $mp/variant/5.0]
+lappend ans [list set LOADEDMODULES variant/5.0]
+lappend ans [list set TS0 {foo=val 4:bar=2:b?r =:f* o=}]
 testouterr_cmd_re sh {load variant/5.0 foo=val\ 4 b?r\ =} $ans {}
 
 skip_if_quick_mode
 
 setenv_var TESTSUITE_VARIANT 2
 set ans [list]
-lappend ans [list setpath TS0 {foo=:bar=}]
-lappend ans [list setpath TS1 {foo=default:bar=de *ult}]
-lappend ans [list set LOADEDMODULES variant/5.0]
+lappend ans [list set TS1 {foo=default:bar=de *ult}]
 lappend ans [list set _LMFILES_ $mp/variant/5.0]
+lappend ans [list set LOADEDMODULES variant/5.0]
+lappend ans [list set TS0 {foo=:bar=}]
 testouterr_cmd_re sh {load variant/5.0} $ans {}
 
 setenv_var MODULES_ADVANCED_VERSION_SPEC 0
@@ -66,11 +66,11 @@ setenv_path_var TS0 {foo=val 4:bar=2:b?r =:f* o=}
 setenv_path_var TS1 {foo=val 4:bar=2:b?r =:f* o= ef*ult}
 
 set ans [list]
-lappend ans [list unsetpath TS0]
-lappend ans [list unsetpath TS1]
-lappend ans [list unset LOADEDMODULES]
-lappend ans [list unset _LMFILES_]
 lappend ans [list unset __MODULES_LMVARIANT]
+lappend ans [list unset TS1]
+lappend ans [list unset _LMFILES_]
+lappend ans [list unset LOADEDMODULES]
+lappend ans [list unset TS0]
 testouterr_cmd sh {unload variant/5.0} $ans {}
 testouterr_cmd sh {unload variant/5.0 b?r\ =} $ans {}
 
diff --git a/testsuite/modules.50-cmds/479-variant-boolean.exp b/testsuite/modules.50-cmds/479-variant-boolean.exp
index b153561a..2f924ead 100644
--- a/testsuite/modules.50-cmds/479-variant-boolean.exp
+++ b/testsuite/modules.50-cmds/479-variant-boolean.exp
@@ -258,11 +258,11 @@ testouterr_cmd_re sh {load -v variant/1.0~foo} ERR $tserr
 
 setenv_var TESTSUITE_VARIANT bool1
 set ans [list]
-lappend ans [list setpath TS1 {foo=1}]
-lappend ans [list setpath TS0 {foo=1}]
-lappend ans [list set LOADEDMODULES variant/5.0]
-lappend ans [list set _LMFILES_ $mp/variant/5.0]
 lappend ans [list set __MODULES_LMVARIANT variant/5.0&foo|1|1|0]
+lappend ans [list set TS1 {foo=1}]
+lappend ans [list set _LMFILES_ $mp/variant/5.0]
+lappend ans [list set LOADEDMODULES variant/5.0]
+lappend ans [list set TS0 {foo=1}]
 testouterr_cmd_re sh {load variant/5.0 +foo} $ans {}
 
 
diff --git a/testsuite/modules.61-coll/040-restore.exp b/testsuite/modules.61-coll/040-restore.exp
index 9ecee341..1fc93792 100644
--- a/testsuite/modules.61-coll/040-restore.exp
+++ b/testsuite/modules.61-coll/040-restore.exp
@@ -124,9 +124,9 @@ setenv_var __MODULES_LMALTNAME $cdlmalt
 
 set ans [list]
 lappend ans [list set __MODULES_LMALTNAME $c1lmalt]
-lappend ans [list setpath MODULEPATH $c1modpath]
-lappend ans [list set LOADEDMODULES $c1lm $c1lmnodefault]
 lappend ans [list set _LMFILES_ $c1lmf $c1lmfnodefault]
+lappend ans [list set LOADEDMODULES $c1lm $c1lmnodefault]
+lappend ans [list set MODULEPATH $c1modpath]
 
 testouterr_cmd_re "ALL" "restore $coll1" $ans "$c1errmsg"
 
@@ -166,7 +166,7 @@ setenv_loaded_module [split $c2lm ":"] [split $c2lmf ":"]
 setenv_var __MODULES_LMALTNAME $c2lmalt
 
 set ans [list]
-lappend ans [list setpath MODULEPATH $c3modpath]
+lappend ans [list set MODULEPATH $c3modpath]
 
 testouterr_cmd_re "ALL" "restore $coll3" $ans "$c3errmsg"
 
@@ -232,19 +232,19 @@ unsetenv_var __MODULES_LMALTNAME
 
 if {$install_implicitdefault eq {y}} {
     set ans [list]
-    lappend ans [list set testsuite "yes"]
-    lappend ans [list set LOADEDMODULES $c6lm]
-    lappend ans [list set _LMFILES_ $c6lmf]
-    lappend ans [list setpath MODULEPATH $c6modpath]
     lappend ans [list set __MODULES_LMALTNAME $c6lmalt]
+    lappend ans [list set _LMFILES_ $c6lmf]
+    lappend ans [list set LOADEDMODULES $c6lm]
+    lappend ans [list set testsuite "yes"]
+    lappend ans [list set MODULEPATH $c6modpath]
     set c6errmsg "Loading dvcross/dir1/1.0\nLoading dcross/dir1/3.0\nLoading cross/6.0\nLoading novercross"
 } else {
     set ans [list]
-    lappend ans [list set testsuite "yes"]
-    lappend ans [list set LOADEDMODULES $c6lmnodefault]
-    lappend ans [list set _LMFILES_ $c6lmfnodefault]
-    lappend ans [list setpath MODULEPATH $c6modpath]
     lappend ans [list set __MODULES_LMALTNAME $c6lmalt]
+    lappend ans [list set _LMFILES_ $c6lmfnodefault]
+    lappend ans [list set LOADEDMODULES $c6lmnodefault]
+    lappend ans [list set testsuite "yes"]
+    lappend ans [list set MODULEPATH $c6modpath]
     lappend ans [list ERR]
     set c6errmsg "$err_nodefault'dvcross'\nLoading dcross/dir1/3.0\nLoading cross/6.0\nLoading novercross"
 }
@@ -261,21 +261,23 @@ setenv_loaded_module [list {} {}] [list {} {}]
 
 if {$install_implicitdefault eq {y}} {
     set ans [list]
-    lappend ans [list set testsuite "yes"]
-    lappend ans [list set LOADEDMODULES "::$c6lm"]
-    lappend ans [list set _LMFILES_ "::$c6lmf"]
-    # empty dir elements are ignored but stick to the variable, they should be removed
-    lappend ans [list setpath MODULEPATH "::$c6modpath"]
     lappend ans [list set __MODULES_LMALTNAME $c6lmalt]
+    lappend ans [list set _LMFILES_ "::$c6lmf"]
+    lappend ans [list set LOADEDMODULES "::$c6lm"]
+    lappend ans [list set testsuite "yes"]
+    # empty dir elements are ignored but stick to the variable, they should be removed
+    lappend ans [list set __MODULES_SHARE_MODULEPATH ":2"]
+    lappend ans [list set MODULEPATH "::$c6modpath"]
     set c6errmsg "Loading dvcross/dir1/1.0\nLoading dcross/dir1/3.0\nLoading cross/6.0\nLoading novercross"
 } else {
     set ans [list]
-    lappend ans [list set testsuite "yes"]
-    lappend ans [list set LOADEDMODULES "::$c6lmnodefault"]
-    lappend ans [list set _LMFILES_ "::$c6lmfnodefault"]
-    # empty dir elements are ignored but stick to the variable, they should be removed
-    lappend ans [list setpath MODULEPATH "::$c6modpath"]
     lappend ans [list set __MODULES_LMALTNAME $c6lmalt]
+    lappend ans [list set _LMFILES_ "::$c6lmfnodefault"]
+    lappend ans [list set LOADEDMODULES "::$c6lmnodefault"]
+    lappend ans [list set testsuite "yes"]
+    # empty dir elements are ignored but stick to the variable, they should be removed
+    lappend ans [list set __MODULES_SHARE_MODULEPATH ":2"]
+    lappend ans [list set MODULEPATH "::$c6modpath"]
     lappend ans [list ERR]
     set c6errmsg "$err_nodefault'dvcross'\nLoading dcross/dir1/3.0\nLoading cross/6.0\nLoading novercross"
 }
@@ -306,10 +308,10 @@ testouterr_cmd_re "sh" "restore $coll7fp" $ans $c7errmsg
 setenv_path_var MODULEPATH $modpath
 
 set ans [list]
-lappend ans [list set testsuite "yes"]
-lappend ans [list set LOADEDMODULES $c7lm]
 lappend ans [list set _LMFILES_ $c7lmf]
-lappend ans [list unsetpath MODULEPATH]
+lappend ans [list set LOADEDMODULES $c7lm]
+lappend ans [list set testsuite "yes"]
+lappend ans [list unset MODULEPATH]
 
 testouterr_cmd_re "sh" "restore $coll7fp" $ans $c7errmsg
 
@@ -321,10 +323,10 @@ testouterr_cmd_re "sh" "restore $coll7fp" $ans $c7errmsg
 unsetenv_path_var MODULEPATH
 
 set ans [list]
-lappend ans [list set testsuite "yes"]
-lappend ans [list set LOADEDMODULES $c8lm]
 lappend ans [list set _LMFILES_ $c8lmf]
-lappend ans [list setpath MODULEPATH $c8modpath]
+lappend ans [list set LOADEDMODULES $c8lm]
+lappend ans [list set testsuite "yes"]
+lappend ans [list set MODULEPATH $c8modpath]
 
 testouterr_cmd_re "sh" "restore $coll8fp" $ans $c8errmsg
 
@@ -334,10 +336,10 @@ testouterr_cmd_re "sh" "restore $coll8fp" $ans $c8errmsg
 #
 
 set ans [list]
-lappend ans [list set LOADEDMODULES $c9lm]
 lappend ans [list set _LMFILES_ $c9lmf]
-lappend ans [list setpath MODULEPATH $c9modpath]
+lappend ans [list set LOADEDMODULES $c9lm]
 lappend ans [list set __MODULES_LMTAG $c9lmnua]
+lappend ans [list set MODULEPATH $c9modpath]
 
 testouterr_cmd_re "sh" "restore $coll9fp" $ans $c9errmsg
 
@@ -347,10 +349,10 @@ testouterr_cmd_re "sh" "restore $coll9fp" $ans $c9errmsg
 #
 
 set ans [list]
-lappend ans [list set LOADEDMODULES $c9lm]
 lappend ans [list set _LMFILES_ $c9lmf]
-lappend ans [list setpath MODULEPATH $c9modpath]
+lappend ans [list set LOADEDMODULES $c9lm]
 lappend ans [list set __MODULES_LMTAG $c9lmnua]
+lappend ans [list set MODULEPATH $c9modpath]
 
 testouterr_cmd_re "sh" "restore $coll10fp" $ans $c10errmsg
 
@@ -407,9 +409,9 @@ eval setenv_path_var MODULEPATH [split $c9modpath ":"]
 setenv_loaded_module [split $c9lm ":"] [split $c9lmf ":"]
 
 set ans [list]
-lappend ans [list setpath MODULEPATH $c12modpath]
-lappend ans [list set LOADEDMODULES $c12lm]
 lappend ans [list set _LMFILES_ $c12lmf]
+lappend ans [list set LOADEDMODULES $c12lm]
+lappend ans [list set MODULEPATH $c12modpath]
 lappend ans [list ERR]
 testouterr_cmd_re sh "restore $coll12fp" $ans $c12errmsg
 
@@ -461,9 +463,9 @@ setenv_loaded_module [split $cdlm ":"] [split $cdlmf ":"]
 unsetenv_var MODULES_COLLECTION_TARGET
 
 set ans [list]
-lappend ans [list setpath MODULEPATH $modpath:$modpath.2]
-lappend ans [list set LOADEDMODULES $c2lm:$modpath.2/restore]
 lappend ans [list set _LMFILES_ $c2lmf:$modpath.2/restore]
+lappend ans [list set LOADEDMODULES $c2lm:$modpath.2/restore]
+lappend ans [list set MODULEPATH $modpath:$modpath.2]
 
 if {$plus_in_modpath && $install_advversspec eq {y}} {
     setenv_var MODULES_ADVANCED_VERSION_SPEC 0
@@ -534,17 +536,17 @@ unsetenv_loaded_module
 unsetenv_var __MODULES_LMPREREQ
 
 set ans [list]
-lappend ans [list setpath MODULEPATH $c15modpath]
-lappend ans [list set LOADEDMODULES $c15lm]
-lappend ans [list set _LMFILES_ $c15lmf]
 lappend ans [list set __MODULES_LMALTNAME $c15lmalt]
+lappend ans [list set _LMFILES_ $c15lmf]
+lappend ans [list set LOADEDMODULES $c15lm]
+lappend ans [list set MODULEPATH $c15modpath]
 testouterr_cmd_re sh "restore $coll15fp" $ans $c15errmsg
 
 set ans [list]
-lappend ans [list setpath MODULEPATH $c16modpath]
-lappend ans [list set LOADEDMODULES $c16lm]
-lappend ans [list set _LMFILES_ $c16lmf]
 lappend ans [list set __MODULES_LMALTNAME $c16lmalt]
+lappend ans [list set _LMFILES_ $c16lmf]
+lappend ans [list set LOADEDMODULES $c16lm]
+lappend ans [list set MODULEPATH $c16modpath]
 testouterr_cmd_re sh "restore $coll16fp" $ans $c16errmsg
 
 }
@@ -554,13 +556,13 @@ testouterr_cmd_re sh "restore $coll16fp" $ans $c16errmsg
 #
 
 set ans [list]
-lappend ans [list set testsuite "yes"]
-lappend ans [list setpath MODULEPATH $c17modpath]
-lappend ans [list set LOADEDMODULES $c17lm]
-lappend ans [list set _LMFILES_ $c17lmf]
+lappend ans [list unset mload]
 lappend ans [list set __MODULES_LMALTNAME loc_rc1/1.0&loc_rc1/foo]
 lappend ans [list set t15 t15]
-lappend ans [list unset mload]
+lappend ans [list set _LMFILES_ $c17lmf]
+lappend ans [list set LOADEDMODULES $c17lm]
+lappend ans [list set testsuite "yes"]
+lappend ans [list set MODULEPATH $c17modpath]
 testouterr_cmd_re sh "restore $coll17fp" $ans $c17errmsg
 
 
@@ -578,39 +580,39 @@ setenv_var MODULES_IMPLICIT_DEFAULT 1
 
 setenv_var TESTSUITE_VARIANT coll19
 set ans [list]
-lappend ans [list setpath MODULEPATH $c19modpath]
-lappend ans [list set LOADEDMODULES $c19lm]
-lappend ans [list set _LMFILES_ $c19lmf]
 lappend ans [list set __MODULES_LMVARIANT $c19lmvr]
 lappend ans [list set __MODULES_LMALTNAME $c19lmalt]
+lappend ans [list set _LMFILES_ $c19lmf]
+lappend ans [list set LOADEDMODULES $c19lm]
+lappend ans [list set MODULEPATH $c19modpath]
 testouterr_cmd_re sh "restore $coll19fp" $ans $c19errmsg
 
 setenv_var TESTSUITE_VARIANT coll20
 set ans [list]
-lappend ans [list setpath MODULEPATH $c20modpath]
-lappend ans [list set LOADEDMODULES $c20lm]
-lappend ans [list set _LMFILES_ $c20lmf]
 lappend ans [list set __MODULES_LMVARIANT $c20lmvr]
 lappend ans [list set __MODULES_LMALTNAME $c20lmalt]
+lappend ans [list set _LMFILES_ $c20lmf]
+lappend ans [list set LOADEDMODULES $c20lm]
+lappend ans [list set MODULEPATH $c20modpath]
 testouterr_cmd_re sh "restore $coll20fp" $ans $c20errmsg
 
 setenv_var TESTSUITE_VARIANT coll22
 set ans [list]
-lappend ans [list setpath MODULEPATH $c22modpath]
-lappend ans [list set LOADEDMODULES $c22lm]
-lappend ans [list set _LMFILES_ $c22lmf]
 lappend ans [list set __MODULES_LMVARIANT $c22lmvr]
 lappend ans [list set __MODULES_LMALTNAME $c22lmalt]
+lappend ans [list set _LMFILES_ $c22lmf]
+lappend ans [list set LOADEDMODULES $c22lm]
+lappend ans [list set MODULEPATH $c22modpath]
 testouterr_cmd_re sh "restore $coll22fp" $ans $c22errmsg
 
 setenv_var TESTSUITE_VARIANT coll26
 set ans [list]
-lappend ans [list setpath MODULEPATH $c26modpath]
-lappend ans [list set LOADEDMODULES $c26lm]
-lappend ans [list set _LMFILES_ $c26lmf]
-lappend ans [list set __MODULES_LMTAG $c26lmnua]
 lappend ans [list set __MODULES_LMVARIANT $c26lmvr]
 lappend ans [list set __MODULES_LMALTNAME $c26lmalt]
+lappend ans [list set _LMFILES_ $c26lmf]
+lappend ans [list set LOADEDMODULES $c26lm]
+lappend ans [list set __MODULES_LMTAG $c26lmnua]
+lappend ans [list set MODULEPATH $c26modpath]
 testouterr_cmd_re sh "restore $coll26fp" $ans $c26errmsg
 
 # test restoring variant with advanced_version_spec disabled
@@ -618,9 +620,9 @@ setenv_var MODULES_ADVANCED_VERSION_SPEC 0
 
 setenv_var TESTSUITE_VARIANT coll19
 set ans [list]
-lappend ans [list setpath MODULEPATH $c19modpath]
-lappend ans [list set _LMFILES_ $c19modpath1/$c19mod2]
 lappend ans [list set LOADEDMODULES $c19mod2]
+lappend ans [list set _LMFILES_ $c19modpath1/$c19mod2]
+lappend ans [list set MODULEPATH $c19modpath]
 lappend ans [list ERR]
 testouterr_cmd_re sh "restore $coll19fp" $ans "[msg_load variant/1.0 [err_novarval {bar } {{} val1 val2}]]
 
@@ -639,7 +641,6 @@ lappend ans [list set _LMFILES_ $c26modpath1/$c26mod2:$c26modpath1/$c26mod3]
 lappend ans [list set LOADEDMODULES $c26mod2:$c26mod3]
 lappend ans [list set __MODULES_LMTAG $c26mod2&auto-loaded]
 lappend ans [list set MODULEPATH $c26modpath]
-lappend ans [list set __MODULES_SHARE_MODULEPATH $c26modpath:1]
 lappend ans [list ERR]
 testouterr_cmd_re sh "restore $coll26fp" $ans "[escre [msg_load {variant/1.0} [err_novarval {fo o} {val1 val2 {v?l1 }}]]]
 
@@ -700,7 +701,6 @@ set ans [list]
 lappend ans [list set _LMFILES_ $c26modpath1/$c26mod2]
 lappend ans [list set LOADEDMODULES $c26mod2]
 lappend ans [list set MODULEPATH $c26modpath1]
-lappend ans [list set __MODULES_SHARE_MODULEPATH $c26modpath1:1]
 lappend ans [list ERR]
 testouterr_cmd_re sh "restore $coll29fp" $ans [msg_load variant/1.0{unk=val} [err_unkvar unk]]\n\n[msg_load foo/1.0]
 
diff --git a/testsuite/modules.61-coll/080-access-coll.exp b/testsuite/modules.61-coll/080-access-coll.exp
index c9dc7e08..729abcd9 100644
--- a/testsuite/modules.61-coll/080-access-coll.exp
+++ b/testsuite/modules.61-coll/080-access-coll.exp
@@ -42,23 +42,23 @@ set header_coll "Named collection list:"
 set coll_list "$coll1\n${coll1}.save\n$coll2\n$coll3\n$coll4f\n$coll6f\n$colld\ninfocmd\ninfocmdexp"
 
 if {$install_implicitdefault eq {y}} {
-    lappend ans [list set testsuite yes]
-    lappend ans [list setpath MODULEPATH $c1modpath]
-    lappend ans [list set __MODULES_LMALTNAME $c1lmalt]
     lappend ans [list unset mload]
-    lappend ans [list set LOADEDMODULES $c1lm]
-    lappend ans [list set _LMFILES_ $c1lmf]
+    lappend ans [list set __MODULES_LMALTNAME $c1lmalt]
     lappend ans [list set t15 t15]
+    lappend ans [list set _LMFILES_ $c1lmf]
+    lappend ans [list set LOADEDMODULES $c1lm]
+    lappend ans [list set testsuite yes]
     lappend ans [list set MODULE_VERSION "1.10"]
+    lappend ans [list set MODULEPATH $c1modpath]
     set c1errmsg "Loading loc_rc1/1.0\nLoading load/15\nLoading verssort/1.10\nload $cdmod4\nLoading $cdmod4\nload $c1mod5\nLoading $c1mod5\nload $c1mod6\nLoading $c1mod6"
 } else {
-    lappend ans [list set testsuite yes]
-    lappend ans [list setpath MODULEPATH $c1modpath]
-    lappend ans [list set __MODULES_LMALTNAME $c1lmalt]
     lappend ans [list unset mload]
-    lappend ans [list set LOADEDMODULES $c1lmnodefault]
-    lappend ans [list set _LMFILES_ $c1lmfnodefault]
+    lappend ans [list set __MODULES_LMALTNAME $c1lmalt]
     lappend ans [list set t15 t15]
+    lappend ans [list set _LMFILES_ $c1lmfnodefault]
+    lappend ans [list set LOADEDMODULES $c1lmnodefault]
+    lappend ans [list set testsuite yes]
+    lappend ans [list set MODULEPATH $c1modpath]
     lappend ans [list ERR]
     set c1errmsg "Loading loc_rc1/1.0\nLoading load/15\n$err_nodefault'verssort'\nload $cdmod4\nLoading $cdmod4\nload $c1mod5\nLoading $c1mod5\nload $c1mod6\nLoading $c1mod6"
 }
diff --git a/testsuite/modules.70-maint/020-update.exp b/testsuite/modules.70-maint/020-update.exp
index b71bc8c3..d2c0aa12 100644
--- a/testsuite/modules.70-maint/020-update.exp
+++ b/testsuite/modules.70-maint/020-update.exp
@@ -37,9 +37,9 @@ set err_update "$error_msgs: Invalid command 'update'\n$err_typehelp"
 lappend ans [list set testsuite yes]
 # this allows the test to pass, but don't know why update needs to
 # set the path again
-lappend ans [list setpath MODULEPATH $modpath]
 lappend ans [list set _LMFILES_ "$env(TESTSUITEDIR)/modulefiles/$module:"]
 lappend ans [list set LOADEDMODULES "$module:"]
+lappend ans [list set MODULEPATH $modpath]
 
 #
 #  Set up the environment pointing to the single module file being loaded
diff --git a/testsuite/modules.70-maint/120-autoinit.exp b/testsuite/modules.70-maint/120-autoinit.exp
index afdc566b..30a9b204 100644
--- a/testsuite/modules.70-maint/120-autoinit.exp
+++ b/testsuite/modules.70-maint/120-autoinit.exp
@@ -559,7 +559,6 @@ foreach set_shell_startup [list {} 0 1] {
                     }
                     lappend ans [list set MODULESHOME $moduleshome]
                     if {$shell eq {ksh}} {
-                        lappend ans [list set __MODULES_SHARE_FPATH $install_initdir/ksh-functions:1]
                         lappend ans [list set FPATH $install_initdir/ksh-functions]
                     }
                     lappend ans [list set MODULE_VERSION "(.*)"]
@@ -572,7 +571,6 @@ foreach set_shell_startup [list {} 0 1] {
                     }
                     lappend ans [list set MODULESHOME $moduleshome]
                     if {$shell eq {ksh}} {
-                        lappend ans [list set __MODULES_SHARE_FPATH $install_initdir/ksh-functions:1]
                         lappend ans [list set FPATH $install_initdir/ksh-functions]
                     }
                 }
@@ -648,7 +646,6 @@ if {(!$insmodspath || $modspath_exinstalled) && (!$insmodrc || $modrc_exinstalle
                     lappend ans [list set MODULESHOME $moduleshome]
                     lappend ans [list set LOADEDMODULES ""]
                     if {$shell eq {ksh}} {
-                        lappend ans [list set __MODULES_SHARE_FPATH $install_initdir/ksh-functions:1]
                         lappend ans [list set FPATH $install_initdir/ksh-functions]
                     }
                     lappend ans [list set MODULEPATH ""]
@@ -663,14 +660,12 @@ if {(!$insmodspath || $modspath_exinstalled) && (!$insmodrc || $modrc_exinstalle
                     if {[is_real_shell $shell] && $install_setshellstartup eq {y}} {
                         lappend ans [list set ENV $install_initdir/profile.sh]
                     }
-                    lappend ans [list set __MODULES_SHARE_MODULEPATH "(.*)"]
                     if {[is_real_shell $shell] && $install_setshellstartup eq {y}} {
                         lappend ans [list set BASH_ENV $install_initdir/bash]
                     }
                     lappend ans [list set MODULESHOME $moduleshome]
                     lappend ans [list set LOADEDMODULES ""]
                     if {$shell eq {ksh}} {
-                        lappend ans [list set __MODULES_SHARE_FPATH $install_initdir/ksh-functions:1]
                         lappend ans [list set FPATH $install_initdir/ksh-functions]
                     }
                     lappend ans [list set MODULEPATH "$install_modulepath:$install_prefix/test/modulefiles:$install_prefix/test/etc"]
@@ -685,7 +680,6 @@ if {(!$insmodspath || $modspath_exinstalled) && (!$insmodrc || $modrc_exinstalle
                     if {[is_real_shell $shell] && $install_setshellstartup eq {y}} {
                         lappend ans [list set ENV $install_initdir/profile.sh]
                     }
-                    lappend ans [list set __MODULES_SHARE_MODULEPATH "$install_modulepath:1"]
                     if {[is_real_shell $shell] && $install_setshellstartup eq {y}} {
                         lappend ans [list set BASH_ENV $install_initdir/bash]
                     }
@@ -704,7 +698,6 @@ if {(!$insmodspath || $modspath_exinstalled) && (!$insmodrc || $modrc_exinstalle
                     lappend ans [list set MODULESHOME $install_initdir]
                     lappend ans [list set _LMFILES_ "$install_modulefilesdir/null"]
                     if {$shell eq {ksh} || $shell eq {sh} || $shell eq {bash}} {
-                        lappend ans [list set __MODULES_SHARE_FPATH $install_initdir/ksh-functions:1]
                         lappend ans [list set FPATH $install_initdir/ksh-functions]
                     }
                     lappend ans [list set MODULES_CMD $modulecmd_path]
@@ -713,7 +706,6 @@ if {(!$insmodspath || $modspath_exinstalled) && (!$insmodrc || $modrc_exinstalle
                     lappend ans [list set MODULEPATH "$install_modulepath"]
                     lappend ans [list set MODULES_SET_SHELL_STARTUP 0]
                     lappend ans [list set MODULES_SHELLS_WITH_KSH_FPATH "sh:bash"]
-                    lappend ans [list set __MODULES_SHARE_MODULEPATH "$install_modulepath:1"]
                     if {$install_versioning eq "y"} {
                         lappend ans [list set MODULE_VERSION "(.*)"]
                     }
@@ -727,12 +719,10 @@ if {(!$insmodspath || $modspath_exinstalled) && (!$insmodrc || $modrc_exinstalle
                         lappend ans [list ERR]
                         lappend ans [list [set "func_$shell"]]
                         lappend ans [list set MODULES_CMD $modulecmd_path]
-                        lappend ans [list set __MODULES_SHARE_MODULEPATH (.*)]
                         lappend ans [list set MODULESHOME $moduleshome]
                         lappend ans [list set __MODULES_LMPREREQ m3&m1]
                         lappend ans [list set _LMFILES_ "$modpath.deps/m1:$modpath.deps/m3:$modpath wspace/space yc/4"]
                         lappend ans [list set LOADEDMODULES "m1:m3:space yc/4"]
-                        lappend ans [list set __MODULES_SHARE_FPATH $install_initdir/ksh-functions:1]
                         lappend ans [list set FPATH $install_initdir/ksh-functions]
                         lappend ans [list set __MODULES_LMTAG m1&auto-loaded]
                         lappend ans [list set MODULEPATH "$modpath wspace:$modpath.deps"]
@@ -744,7 +734,6 @@ if {(!$insmodspath || $modspath_exinstalled) && (!$insmodrc || $modrc_exinstalle
                             lappend ans [list set MODULE_VERSION_STACK "(.*)"]
                         }
                         lappend ans [list set MODULES_CMD $modulecmd_path]
-                        lappend ans [list set __MODULES_SHARE_MODULEPATH (.*)]
                         lappend ans [list set MODULESHOME $moduleshome]
                         lappend ans [list set __MODULES_LMPREREQ m3&m1]
                         lappend ans [list set _LMFILES_ "$modpath.deps/m1:$modpath.deps/m3:$modpath wspace/space yc/4"]
@@ -784,7 +773,6 @@ if {!$insmodspath && $initrc_exinstalled && !$install_setshellstartup && $modrc
         lappend ans [list set MODULE_VERSION_STACK "(.*)"]
     }
     lappend ans [list set MODULES_CMD $modulecmd_path]
-    lappend ans [list set __MODULES_SHARE_MODULEPATH (.*)]
     lappend ans [list set MODULESHOME $moduleshome]
     lappend ans [list set __MODULES_LMPREREQ m3&m1]
     lappend ans [list set _LMFILES_ "$modpath.deps/m1:$modpath.deps/m3:$modpath wspace/space yc/4"]
@@ -856,7 +844,6 @@ if {$insmodspath && $modspath_exinstalled && $modspath eq "$install_etcdir/modul
     if {$install_setshellstartup eq {y}} {
         lappend ans [list set ENV $install_initdir/profile.sh]
     }
-    lappend ans [list set __MODULES_SHARE_MODULEPATH "(.*)"]
     if {$install_setshellstartup eq {y}} {
         lappend ans [list set BASH_ENV $install_initdir/bash]
     }
diff --git a/testsuite/modules.70-maint/140-multiargs.exp b/testsuite/modules.70-maint/140-multiargs.exp
index 448ff490..c077eb4b 100644
--- a/testsuite/modules.70-maint/140-multiargs.exp
+++ b/testsuite/modules.70-maint/140-multiargs.exp
@@ -119,9 +119,7 @@ proc multi_test_case {args} {
 
         if {[info exists "::setenv_${m}"]} {
             if {[lindex [set "::setenv_${m}"] 0] eq {setpath}} {
-                lappend ans_lo [list set __MODULES_SHARE_[lindex [set "::setenv_${m}"] 1] "(.*)"]
                 lappend ans_lo [list set {*}[lrange [set "::setenv_${m}"] 1 end]]
-                lappend ans_src [list set __MODULES_SHARE_[lindex [set "::setenv_${m}"] 1] "(.*)"]
                 lappend ans_src [list set {*}[lrange [set "::setenv_${m}"] 1 end]]
             } else {
                 lappend ans_nonpath_lo [set "::setenv_${m}"]
@@ -131,7 +129,11 @@ proc multi_test_case {args} {
             lappend ans_nonpath_src [set "::srcenv_${m}"]
         }
         if {[info exists "::unsetenv_${m}"]} {
-            lappend ans_unlo [set "::unsetenv_${m}"]
+            if {[lindex [set "::unsetenv_${m}"] 0] eq {setpath}} {
+                lappend ans_unlo [list set {*}[lrange [set "::unsetenv_${m}"] 1 end]]
+            } else {
+                lappend ans_nonpath_unlo [set "::unsetenv_${m}"]
+            }
         }
 
         append disp "\n$modfilere:\n\n"
@@ -213,8 +215,12 @@ proc multi_test_case {args} {
     # setup environment for unload action
     setenv_loaded_module $module $modulefile
 
-    lappend ans_unlo [list unset LOADEDMODULES]
     lappend ans_unlo [list unset _LMFILES_]
+    lappend ans_unlo [list unset LOADEDMODULES]
+
+    if {[info exists ans_nonpath_unlo]} {
+        lappend ans_unlo {*}$ans_nonpath_unlo
+    }
 
     # bad mod is stuck loaded
     testouterr_cmd_re "sh" "unload $modsym" $ans_unlo ""
diff --git a/testsuite/modules.70-maint/150-append-path.exp b/testsuite/modules.70-maint/150-append-path.exp
index ee256faa..c7d9f0f8 100644
--- a/testsuite/modules.70-maint/150-append-path.exp
+++ b/testsuite/modules.70-maint/150-append-path.exp
@@ -31,7 +31,6 @@ if {[info exists env(FOO)]} {
 set path1 "/path/to/dir1"
 set path2 "/path/other/dir2"
 
-lappend ans [list set __MODULES_SHARE_FOO "$path1:1"]
 lappend ans [list set FOO $path1]
 
 testouterr_cmd_re "sh" "append-path FOO $path1" $ans ""
@@ -49,14 +48,14 @@ lappend ans [list set FOO "$path1"]
 testouterr_cmd_re "sh" "append-path FOO $path1" $ans ""
 
 set ans [list]
-lappend ans [list setpath FOO "$path1:$path2"]
+lappend ans [list set FOO "$path1:$path2"]
 testouterr_cmd_re "ALL" "append-path FOO $path2" $ans ""
 testouterr_cmd_re "sh" "append-path -d : FOO $path2" $ans ""
 testouterr_cmd_re "sh" "append-path --delim : FOO $path2" $ans ""
 testouterr_cmd_re "sh" "append-path --delim=: FOO $path2" $ans ""
 
 set ans [list]
-lappend ans [list setpath FOO "$path1,$path2"]
+lappend ans [list set FOO "$path1,$path2"]
 testouterr_cmd_re "sh" "append-path -d , FOO $path2" $ans ""
 testouterr_cmd_re "sh" "append-path --delim , FOO $path2" $ans ""
 testouterr_cmd_re "sh" "append-path --delim=, FOO $path2" $ans ""
@@ -68,11 +67,13 @@ if { $verbose > 0 } {
 set env(FOO) "$path1:$path2"
 
 set ans [list]
-lappend ans [list setpath FOO "$path1:$path2"]
+lappend ans [list set __MODULES_SHARE_FOO "$path2:2"]
+lappend ans [list set FOO "$path1:$path2"]
 testouterr_cmd_re "sh" "append-path FOO $path2" $ans ""
 
 set ans [list]
-lappend ans [list setpath FOO "$path1:$path2:"]
+lappend ans [list set __MODULES_SHARE_FOO ":1"]
+lappend ans [list set FOO "$path1:$path2:"]
 testouterr_cmd_re "sh" "append-path FOO " $ans ""
 
 # test bad argument list
@@ -89,28 +90,24 @@ testouterr_cmd_re "sh" "append-path --delim= FOO /path/to" "ERR" "$error_msgs: a
 
 set path1 "/path/to/dir1"
 if { $verbose > 0 } {
-    send_user "\tSetup __MODULES_SHARE_FOO = '$path1:1'\n"
     send_user "\tSetup FOO = '$path1'\n"
 }
-set env(__MODULES_SHARE_FOO) "$path1:1"
 set env(FOO) $path1
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO ":1:/modules/testsuite2.2/2.2:1:$path1:1:/modules/testsuite2.2:1"]
+lappend ans [list set __MODULES_SHARE_FOO ":1"]
 lappend ans [list set FOO "$path1:/modules/testsuite2.2:/modules/testsuite2.2/2.2:"]
 testouterr_cmd_re "sh" "append-path FOO /modules/testsuite2.2:/modules/testsuite2.2/2.2:" $ans ""
 testouterr_cmd_re "sh" "append-path FOO /modules/testsuite2.2 /modules/testsuite2.2/2.2:" $ans ""
 
 # with specific delim
 if { $verbose > 0 } {
-    send_user "\tSetup __MODULES_SHARE_FOO = 'http://foobar.org:1:http://foobar.net:1'\n"
     send_user "\tSetup FOO = 'http://foobar.org,http://foobar.net'\n"
 }
-set env(__MODULES_SHARE_FOO) "http\\://foobar.org:1:http\\://foobar.net:1"
 set env(FOO) "http://foobar.org,http://foobar.net"
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO ":1:http\\://foobar.com:1:http\\://foobar.net:1:http\\://foobar.io:1:http\\://foobar.org:1"]
+lappend ans [list set __MODULES_SHARE_FOO ":1"]
 lappend ans [list set FOO "http://foobar.org,http://foobar.net,http://foobar.com,http://foobar.io,"]
 testouterr_cmd_re "sh" "append-path -d , FOO http://foobar.com,http://foobar.io," $ans ""
 testouterr_cmd_re "sh" "append-path -d , FOO http://foobar.com http://foobar.io," $ans ""
@@ -121,10 +118,8 @@ testouterr_cmd_re "sh" "append-path -d , FOO http://foobar.com http://foobar.io,
 #
 
 if { $verbose > 0 } {
-    send_user "\tSetup __MODULES_SHARE_FOO = '$path1:1'\n"
     send_user "\tSetup FOO = '$path1'\n"
 }
-set env(__MODULES_SHARE_FOO) "$path1:1"
 set env(FOO) $path1
 
 set ans [list]
@@ -139,30 +134,26 @@ testouterr_cmd_re "sh" "append-path --index --duplicates FOO $path1" $ans "$warn
 #
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_DYLD_FOO "$path1:1"]
 lappend ans [list set DYLD_FOO "$path1"]
 testouterr_cmd_re "sh" "append-path DYLD_FOO $path1" $ans ""
 
 if { $verbose > 0 } {
-    send_user "\tSetup __MODULES_SHARE_DYLD_FOO = '$path1:1'\n"
     send_user "\tSetup DYLD_FOO = '$path1'\n"
 }
-set env(__MODULES_SHARE_DYLD_FOO) "$path1:1"
 set env(DYLD_FOO) $path1
 
 # path-variable handling not effective on OSX with DYLD variables when System
 # Integrity Protection (SIP) is enabled: variables are not exported in
 # subshell context, so they appear undefined to modulecmd.tcl
 if {$sip_enabled} {
-    set dyld_refcount 1
+    set ans [list]
+    lappend ans [list set DYLD_FOO "$path1"]
 } else {
-    set dyld_refcount 2
+    set ans [list]
+    lappend ans [list set __MODULES_SHARE_DYLD_FOO "$path1:2"]
+    lappend ans [list set DYLD_FOO "$path1"]
 }
 set tserr "(dyld: warning, unknown environment variable: DYLD_FOO\n|)"
-
-set ans [list]
-lappend ans [list set __MODULES_SHARE_DYLD_FOO "$path1:$dyld_refcount"]
-lappend ans [list set DYLD_FOO "$path1"]
 testouterr_cmd_re "sh" "append-path DYLD_FOO $path1" $ans $tserr
 
 
diff --git a/testsuite/modules.70-maint/151-prepend-path.exp b/testsuite/modules.70-maint/151-prepend-path.exp
index 0ce6a7cb..c01641cb 100644
--- a/testsuite/modules.70-maint/151-prepend-path.exp
+++ b/testsuite/modules.70-maint/151-prepend-path.exp
@@ -31,7 +31,6 @@ if {[info exists env(FOO)]} {
 set path1 "/path/to/dir1"
 set path2 "/path/other/dir2"
 
-lappend ans [list set __MODULES_SHARE_FOO "$path1:1"]
 lappend ans [list set FOO $path1]
 
 testouterr_cmd_re "sh" "prepend-path FOO $path1" $ans ""
@@ -49,14 +48,14 @@ lappend ans [list set FOO "$path1"]
 testouterr_cmd_re "sh" "prepend-path FOO $path1" $ans ""
 
 set ans [list]
-lappend ans [list setpath FOO "$path2:$path1"]
+lappend ans [list set FOO "$path2:$path1"]
 testouterr_cmd_re "ALL" "prepend-path FOO $path2" $ans ""
 testouterr_cmd_re "sh" "prepend-path -d : FOO $path2" $ans ""
 testouterr_cmd_re "sh" "prepend-path --delim : FOO $path2" $ans ""
 testouterr_cmd_re "sh" "prepend-path --delim=: FOO $path2" $ans ""
 
 set ans [list]
-lappend ans [list setpath FOO "$path2,$path1"]
+lappend ans [list set FOO "$path2,$path1"]
 testouterr_cmd_re "sh" "prepend-path -d , FOO $path2" $ans ""
 testouterr_cmd_re "sh" "prepend-path --delim , FOO $path2" $ans ""
 testouterr_cmd_re "sh" "prepend-path --delim=, FOO $path2" $ans ""
@@ -68,11 +67,13 @@ if { $verbose > 0 } {
 set env(FOO) "$path2:$path1"
 
 set ans [list]
-lappend ans [list setpath FOO "$path2:$path1"]
+lappend ans [list set __MODULES_SHARE_FOO "$path2:2"]
+lappend ans [list set FOO "$path2:$path1"]
 testouterr_cmd_re "sh" "prepend-path FOO $path2" $ans ""
 
 set ans [list]
-lappend ans [list setpath FOO ":$path2:$path1"]
+lappend ans [list set __MODULES_SHARE_FOO ":1"]
+lappend ans [list set FOO ":$path2:$path1"]
 testouterr_cmd_re "sh" "prepend-path FOO " $ans ""
 
 
@@ -89,28 +90,24 @@ testouterr_cmd_re "sh" "prepend-path -d : " "ERR" "$error_msgs: add-path $msg_va
 
 set path1 "/path/to/dir1"
 if { $verbose > 0 } {
-    send_user "\tSetup __MODULES_SHARE_FOO = '$path1:1'\n"
     send_user "\tSetup FOO = '$path1'\n"
 }
-set env(__MODULES_SHARE_FOO) "$path1:1"
 set env(FOO) $path1
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO ":1:/modules/testsuite2.2/2.2:1:$path1:1:/modules/testsuite2.2:1"]
+lappend ans [list set __MODULES_SHARE_FOO ":1"]
 lappend ans [list set FOO ":/modules/testsuite2.2:/modules/testsuite2.2/2.2:$path1"]
 testouterr_cmd_re "sh" "prepend-path FOO :/modules/testsuite2.2:/modules/testsuite2.2/2.2" $ans ""
 testouterr_cmd_re "sh" "prepend-path FOO :/modules/testsuite2.2 /modules/testsuite2.2/2.2" $ans ""
 
 # with specific delim
 if { $verbose > 0 } {
-    send_user "\tSetup __MODULES_SHARE_FOO = 'http://foobar.org:1:http://foobar.net:1'\n"
     send_user "\tSetup FOO = 'http://foobar.org,http://foobar.net'\n"
 }
-set env(__MODULES_SHARE_FOO) "http\\://foobar.org:1:http\\://foobar.net:1"
 set env(FOO) "http://foobar.org,http://foobar.net"
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO ":1:http\\://foobar.com:1:http\\://foobar.net:1:http\\://foobar.io:1:http\\://foobar.org:1"]
+lappend ans [list set __MODULES_SHARE_FOO ":1"]
 lappend ans [list set FOO ",http://foobar.com,http://foobar.io,http://foobar.org,http://foobar.net"]
 testouterr_cmd_re "sh" "prepend-path -d , FOO ,http://foobar.com,http://foobar.io" $ans ""
 testouterr_cmd_re "sh" "prepend-path -d , FOO ,http://foobar.com http://foobar.io" $ans ""
@@ -121,14 +118,12 @@ testouterr_cmd_re "sh" "prepend-path -d , FOO ,http://foobar.com http://foobar.i
 #
 
 if { $verbose > 0 } {
-    send_user "\tSetup __MODULES_SHARE_FOO = '$path1:1:/foo:1'\n"
     send_user "\tSetup FOO = '$path1:/foo'\n"
 }
-set env(__MODULES_SHARE_FOO) "$path1:1:/foo:1"
 set env(FOO) "$path1:/foo"
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO "$path1:2:/foo:1"]
+lappend ans [list set __MODULES_SHARE_FOO "$path1:2"]
 lappend ans [list set FOO "$path1:$path1:/foo"]
 testouterr_cmd_re "sh" "prepend-path --duplicates FOO $path1" $ans ""
 
diff --git a/testsuite/modules.70-maint/152-remove-path.exp b/testsuite/modules.70-maint/152-remove-path.exp
index bf350ac0..8d399af9 100644
--- a/testsuite/modules.70-maint/152-remove-path.exp
+++ b/testsuite/modules.70-maint/152-remove-path.exp
@@ -38,21 +38,20 @@ skip_if_quick_mode
 setenv_path_var FOO $path1
 
 set ans [list]
-lappend ans [list unsetpath FOO]
+lappend ans [list unset FOO]
 testouterr_cmd_re "sh" "remove-path FOO $path1" $ans ""
 
 
 setenv_path_var FOO $path1 $path2
 
 set ans [list]
-lappend ans [list setpath FOO "$path1"]
+lappend ans [list set FOO "$path1"]
 testouterr_cmd_re "ALL" "remove-path FOO $path2" $ans ""
 testouterr_cmd_re "sh" "remove-path -d : FOO $path2" $ans ""
 testouterr_cmd_re "sh" "remove-path --delim : FOO $path2" $ans ""
 testouterr_cmd_re "sh" "remove-path --delim=: FOO $path2" $ans ""
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO "$path1:1:$path2:1"]
 lappend ans [list set FOO "$path1:$path2"]
 testouterr_cmd_re "sh" "remove-path FOO $path3" $ans ""
 
@@ -61,7 +60,7 @@ unsetenv_var __MODULES_SHARE_FOO
 setenv_var FOO "$path1,$path2"
 
 set ans [list]
-lappend ans [list setpath FOO "$path1"]
+lappend ans [list set FOO "$path1"]
 testouterr_cmd_re "sh" "remove-path -d , FOO $path2" $ans ""
 testouterr_cmd_re "sh" "remove-path --delim , FOO $path2" $ans ""
 testouterr_cmd_re "sh" "remove-path --delim=, FOO $path2" $ans ""
@@ -70,7 +69,8 @@ testouterr_cmd_re "sh" "remove-path --delim=, FOO $path2" $ans ""
 setenv_path_var FOO {} $path1 $path2
 
 set ans [list]
-lappend ans [list setpath FOO "$path1:$path2"]
+lappend ans [list unset __MODULES_SHARE_FOO]
+lappend ans [list set FOO "$path1:$path2"]
 testouterr_cmd_re "sh" "remove-path FOO " $ans ""
 
 
@@ -90,7 +90,7 @@ set path1 "/path/to/dir1"
 setenv_path_var FOO $path1 "/modules/testsuite2.2" "/modules/testsuite2.2/2.2" {}
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO "$path1:1"]
+lappend ans [list unset __MODULES_SHARE_FOO]
 lappend ans [list set FOO "$path1"]
 testouterr_cmd_re "sh" "remove-path FOO /modules/testsuite2.2:/modules/testsuite2.2/2.2:" $ans ""
 testouterr_cmd_re "sh" "remove-path FOO /modules/testsuite2.2 /modules/testsuite2.2/2.2:" $ans ""
@@ -100,7 +100,7 @@ setenv_var __MODULES_SHARE_FOO ":1:http\\://foobar.com:1:http\\://foobar.net:1:h
 setenv_var FOO ",http://foobar.com,http://foobar.io,http://foobar.org,http://foobar.net"
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO "http\\://foobar.net:1:http\\://foobar.org:1"]
+lappend ans [list unset __MODULES_SHARE_FOO]
 lappend ans [list set FOO "http://foobar.org,http://foobar.net"]
 testouterr_cmd_re "sh" "remove-path -d , FOO ,http://foobar.com,http://foobar.io" $ans ""
 testouterr_cmd_re "sh" "remove-path -d , FOO ,http://foobar.com http://foobar.io" $ans ""
@@ -113,7 +113,7 @@ testouterr_cmd_re "sh" "remove-path -d , FOO ,http://foobar.com http://foobar.io
 setenv_path_var FOO $path1 "/foo" $path1
 
 set ans [list]
-lappend ans [list set __MODULES_SHARE_FOO "$path1:1:/foo:1"]
+lappend ans [list unset __MODULES_SHARE_FOO]
 lappend ans [list set FOO "$path1:/foo"]
 testouterr_cmd_re "sh" "remove-path FOO $path1" $ans ""
 testouterr_cmd_re "sh" "remove-path --duplicates FOO $path1" $ans "$warn_msgs: --duplicates option has no effect on unload-path"
@@ -145,7 +145,7 @@ if {$sip_enabled} {
     lappend ans [list unset __MODULES_SHARE_DYLD_FOO]
     lappend ans [list unset DYLD_FOO]
 } else {
-    lappend ans [list set __MODULES_SHARE_DYLD_FOO "$path1:1"]
+    lappend ans [list unset __MODULES_SHARE_DYLD_FOO]
     lappend ans [list set DYLD_FOO "$path1"]
 }
 set tserr "(dyld: warning, unknown environment variable: DYLD_FOO\n|)"
diff --git a/testsuite/modules.70-maint/210-clear.exp b/testsuite/modules.70-maint/210-clear.exp
index 5c9f34c9..794fd2a1 100644
--- a/testsuite/modules.70-maint/210-clear.exp
+++ b/testsuite/modules.70-maint/210-clear.exp
@@ -33,7 +33,6 @@ lappend ans [list unset __MODULES_LMALTNAME]
 lappend ans [list unset _LMFILES_]
 lappend ans [list unset __MODULES_LMPREREQ]
 lappend ans [list unset LOADEDMODULES]
-lappend ans [list unset __MODULES_SHARE_MODULEPATH]
 lappend ans [list unset __MODULES_LMTAG]
 lappend ans [list unset __MODULES_LMSOURCESH]
 
@@ -58,7 +57,6 @@ lappend ans [list unset __MODULES_LMALTNAME]
 lappend ans [list unset _LMFILES_]
 lappend ans [list unset __MODULES_LMPREREQ]
 lappend ans [list unset LOADEDMODULES]
-lappend ans [list unset __MODULES_SHARE_MODULEPATH]
 lappend ans [list unset __MODULES_LMTAG]
 lappend ans [list unset __MODULES_LMSOURCESH]
 testouterr_cmd sh {clear y} $ans {}
@@ -73,14 +71,12 @@ setenv_var __MODULES_LMTAG clear/2&nearly-forbidden
 setenv_var __MODULES_LMVARIANT clear/2&foo|val1|0|0
 setenv_path_var FOO bar
 set ans [list]
-lappend ans [list unset __MODULES_SHARE_FOO]
 lappend ans [list unset __MODULES_LMVARIANT]
 lappend ans [list unset __MODULES_LMCONFLICT]
 lappend ans [list unset __MODULES_LMALTNAME]
 lappend ans [list unset _LMFILES_]
 lappend ans [list unset __MODULES_LMPREREQ]
 lappend ans [list unset LOADEDMODULES]
-lappend ans [list unset __MODULES_SHARE_MODULEPATH]
 lappend ans [list unset __MODULES_LMTAG]
 lappend ans [list unset __MODULES_LMSOURCESH]
 testouterr_cmd sh {clear YES} $ans {}
diff --git a/testsuite/modules.70-maint/280-ml.exp b/testsuite/modules.70-maint/280-ml.exp
index 1f1e646c..7b5528d8 100644
--- a/testsuite/modules.70-maint/280-ml.exp
+++ b/testsuite/modules.70-maint/280-ml.exp
@@ -286,7 +286,6 @@ lappend ans [list unset __MODULES_LMALTNAME]
 lappend ans [list unset _LMFILES_]
 lappend ans [list unset __MODULES_LMPREREQ]
 lappend ans [list unset LOADEDMODULES]
-lappend ans [list unset __MODULES_SHARE_MODULEPATH]
 lappend ans [list unset __MODULES_LMTAG]
 lappend ans [list unset __MODULES_LMSOURCESH]
 testinouterr_cmd sh {clear} y $ans {}
diff --git a/testsuite/modules.95-version/020-load-version.exp b/testsuite/modules.95-version/020-load-version.exp
index 7c4639d2..d08629ec 100644
--- a/testsuite/modules.95-version/020-load-version.exp
+++ b/testsuite/modules.95-version/020-load-version.exp
@@ -31,9 +31,9 @@ set env(MODULE_VERSION_STACK) "$module_version_stack1"
 #  For the different shells ...
 #
 
-lappend ans [list setpath MODULE_VERSION_STACK $module_version_stack2]
-lappend ans [list set LOADEDMODULES $module2]
+lappend ans [list set MODULE_VERSION_STACK $module_version_stack2]
 lappend ans [list set _LMFILES_ $modulefile2]
+lappend ans [list set LOADEDMODULES $module2]
 lappend ans [list set MODULE_VERSION $version2]
 
 #
diff --git a/testsuite/modules.95-version/020-unload.exp b/testsuite/modules.95-version/020-unload.exp
index efd4adf4..d533964c 100644
--- a/testsuite/modules.95-version/020-unload.exp
+++ b/testsuite/modules.95-version/020-unload.exp
@@ -33,9 +33,9 @@ setenv_loaded_module [list $module1 $module2] [list $modulefile1 $modulefile2]
 #  For the different shells ...
 #
 
-lappend ans [list setpath MODULE_VERSION_STACK $module_version_stack1]
-lappend ans [list set LOADEDMODULES $module1]
+lappend ans [list set MODULE_VERSION_STACK $module_version_stack1]
 lappend ans [list set _LMFILES_ $modulefile1]
+lappend ans [list set LOADEDMODULES $module1]
 lappend ans [list set MODULE_VERSION $version1]
 
 #
@@ -54,9 +54,9 @@ skip_if_quick_mode
 #
 
 set ans [list]
-lappend ans [list setpath MODULE_VERSION_STACK $version2]
-lappend ans [list set LOADEDMODULES $module2]
+lappend ans [list set MODULE_VERSION_STACK $version2]
 lappend ans [list set _LMFILES_ $modulefile2]
+lappend ans [list set LOADEDMODULES $module2]
 lappend ans [list set MODULE_VERSION $version2]
 
 
diff --git a/testsuite/modules.95-version/022-load2.exp b/testsuite/modules.95-version/022-load2.exp
index 3b218bfa..b9b7d338 100644
--- a/testsuite/modules.95-version/022-load2.exp
+++ b/testsuite/modules.95-version/022-load2.exp
@@ -35,13 +35,13 @@ setenv_loaded_module $module2 $modulefile2
 #  For the different shells ...
 #
 
-lappend ans [list setpath MODULE_VERSION_STACK $module_version_stack3]
-lappend ans [list set LOADEDMODULES "$module2:$module3"]
-lappend ans [list set _LMFILES_ "$modulefile2:$modulefile3"]
-lappend ans [list set MODULE_VERSION $version3]
+lappend ans [list set MODULE_VERSION_STACK $module_version_stack3]
 if {[is_conf_enabled advversspec implicitdefault]} {
     lappend ans [list set __MODULES_LMALTNAME $module3&as|versions/default&as|versions/latest]
 }
+lappend ans [list set _LMFILES_ "$modulefile2:$modulefile3"]
+lappend ans [list set LOADEDMODULES "$module2:$module3"]
+lappend ans [list set MODULE_VERSION $version3]
 
 
 #
diff --git a/testsuite/modules.95-version/022-unload2.exp b/testsuite/modules.95-version/022-unload2.exp
index c57fe337..c6e4af11 100644
--- a/testsuite/modules.95-version/022-unload2.exp
+++ b/testsuite/modules.95-version/022-unload2.exp
@@ -35,9 +35,9 @@ setenv_loaded_module [list $module1 $module2 $module3] [list $modulefile1 $modul
 #  For the different shells ...
 #
 
-lappend ans [list setpath MODULE_VERSION_STACK $module_version_stack2]
-lappend ans [list set LOADEDMODULES "$module1:$module2"]
+lappend ans [list set MODULE_VERSION_STACK $module_version_stack2]
 lappend ans [list set _LMFILES_ "$modulefile1:$modulefile2"]
+lappend ans [list set LOADEDMODULES "$module1:$module2"]
 lappend ans [list set MODULE_VERSION $version2]
 
 
@@ -54,9 +54,9 @@ test_cmd_re "ALL" "unload $module3" $ans
 #
 
 set ans [list]
-lappend ans [list setpath MODULE_VERSION_STACK "$version3:$version1"]
-lappend ans [list set LOADEDMODULES "$module1:$module3"]
+lappend ans [list set MODULE_VERSION_STACK "$version3:$version1"]
 lappend ans [list set _LMFILES_ "$modulefile1:$modulefile3"]
+lappend ans [list set LOADEDMODULES "$module1:$module3"]
 lappend ans [list set MODULE_VERSION $version3]
 
 #
diff --git a/testsuite/modules.95-version/050-fullpathentry.exp b/testsuite/modules.95-version/050-fullpathentry.exp
index 632cb279..cb9e094f 100644
--- a/testsuite/modules.95-version/050-fullpathentry.exp
+++ b/testsuite/modules.95-version/050-fullpathentry.exp
@@ -27,14 +27,14 @@ unsetenv_path_var MODULEPATH
 
 # use test
 set ans [list]
-lappend ans [list setpath MODULEPATH \$MODULE_PATH_VAR]
+lappend ans [list set MODULEPATH \$MODULE_PATH_VAR]
 test_cmd sh {use $MODULE_PATH_VAR} $ans
 
 setenv_path_var MODULEPATH \$MODULE_PATH_VAR
 
 # unuse test
 set ans [list]
-lappend ans [list unsetpath MODULEPATH]
+lappend ans [list unset MODULEPATH]
 test_cmd sh {unuse $MODULE_PATH_VAR} $ans
 
 # load test
@@ -64,14 +64,14 @@ unsetenv_var TESTSUITE
 
 # use test
 set ans [list]
-lappend ans [list setpath MODULEPATH \$MODULE_PATH_VAR]
+lappend ans [list set MODULEPATH \$MODULE_PATH_VAR]
 test_cmd sh {use $MODULE_PATH_VAR} $ans
 
 setenv_path_var MODULEPATH \$MODULE_PATH_VAR
 
 # unuse test
 set ans [list]
-lappend ans [list unsetpath MODULEPATH]
+lappend ans [list unset MODULEPATH]
 test_cmd sh {unuse $MODULE_PATH_VAR} $ans
 
 # load test