diff --git a/testsuite/tests-to-run/parallel-local150.sh b/testsuite/tests-to-run/parallel-local150.sh
index 5c030ac6..17ef2ba1 100644
--- a/testsuite/tests-to-run/parallel-local150.sh
+++ b/testsuite/tests-to-run/parallel-local150.sh
@@ -1,17 +1,105 @@
 #!/bin/bash
 
-echo '### Test fix #32191'
-seq 1 150 | nice nice parallel -j9 --retries 2 -S localhost,: "/bin/non-existant 2>/dev/null"
+rsync -Ha --delete input-files/segfault/ tmp/
+cd tmp
 
+# -L1 will join lines ending in ' '
+cat <<'EOF' | sed -e s/\$SERVER1/$SERVER1/\;s/\$SERVER2/$SERVER2/ | parallel -j0 -k -L1
 echo '### Test --tagstring'
-parallel -j1 -X -v --tagstring a{}b echo  ::: 3 4
-parallel -j1 -k -v --tagstring a{}b echo  ::: 3 4
-parallel -j1 -k -v --tagstring a{}b echo job{#} ::: 3 4
-parallel -j1 -k -v --tagstring ajob{#}b echo job{#} ::: 3 4
+  nice parallel -j1 -X -v --tagstring a{}b echo  ::: 3 4
+  nice parallel -j1 -k -v --tagstring a{}b echo  ::: 3 4
+  nice parallel -j1 -k -v --tagstring a{}b echo job{#} ::: 3 4
+  nice parallel -j1 -k -v --tagstring ajob{#}b echo job{#} ::: 3 4
+
+echo '### Bug in --load'; 
+  nice parallel -k --load 30 sleep 0.1\;echo ::: 1 2 3
+
+echo '### Test --timeout'; 
+  nice parallel -j0 -k --timeout 1 echo {}\; sleep {}\; echo {} ::: 1.1 6.6 7.7 8.8
+
+echo '### Test retired'; 
+  stdout parallel -B; 
+  stdout parallel -g; 
+  stdout parallel -H; 
+  stdout parallel -T; 
+  stdout parallel -U; 
+  stdout parallel -W; 
+  stdout parallel -Y;
+
+echo '### Test --joblog followed by --resume --joblog'
+  rm -f /tmp/joblog; 
+  timeout -k 1 1 parallel -j2 --joblog /tmp/joblog sleep {} ::: 1.1 2.2 3.3 4.4 2>/dev/null; 
+  parallel -j2 --resume --joblog /tmp/joblog sleep {} ::: 1.1 2.2 3.3 4.4; 
+  cat /tmp/joblog | wc -lw; 
+  rm -f /tmp/joblog;
+
+echo '### Test --resume --joblog followed by --resume --joblog'; 
+  rm -f /tmp/joblog2; 
+  timeout -k 1 1 parallel -j2 --resume --joblog /tmp/joblog2 sleep {} ::: 1.1 2.2 3.3 4.4 2>/dev/null; 
+  parallel -j2 --resume --joblog /tmp/joblog2 sleep {} ::: 1.1 2.2 3.3 4.4; 
+  cat /tmp/joblog2 | wc -lw; 
+  rm -f /tmp/joblog2;
+
+echo '### Test --header'; 
+  printf "a\tb\n1.2\t3/4.5" | parallel --colsep "\t" --header "\n" echo {b} {a} {b.} {b/} {b//} {b/.}; 
+
+echo '### 64-bit wierdness - this did not complete on a 64-bit machine'; 
+  seq 1 2 | parallel -j1 'seq 1 1 | parallel true'
+
+echo "### BUG-fix: bash -c 'parallel -a <(seq 1 3) echo'"; 
+  stdout bash -c 'parallel -k -a <(seq 1 3)  echo'
+
+echo "### bug #35268: shell_quote doesn't treats [] brackets correctly"; 
+  touch /tmp/foo1; 
+  stdout parallel echo ::: '/tmp/foo[123]'
+
+echo '### Test make .deb package'; 
+  cd ~/privat/parallel/packager/debian; 
+  stdout make | grep 'To install the GNU Parallel Debian package, run:'
+
+echo '### Test of segfaulting issue'
+  echo 'This gave /home/tange/bin/stdout: line 3: 20374 Segmentation fault      "$@" 2>&1'; 
+  echo 'before adding wait() before exit'; 
+  seq 1 300 | stdout parallel ./trysegfault
+
+echo '### Test basic --arg-sep'; 
+  parallel -k echo ::: a b
+
+echo '### Run commands using --arg-sep'; 
+  parallel -kv ::: 'echo a' 'echo b'
+
+echo '### Change --arg-sep'; 
+  parallel --arg-sep ::: -kv ::: 'echo a' 'echo b'; 
+  parallel --arg-sep .--- -kv .--- 'echo a' 'echo b'; 
+  parallel --argsep ::: -kv ::: 'echo a' 'echo b'; 
+  parallel --argsep .--- -kv .--- 'echo a' 'echo b'
+
+echo '### Test stdin goes to first command only'
+  echo via cat |parallel --arg-sep .--- -kv .--- 'cat' 'echo b'
+  echo via cat |parallel -kv ::: 'cat' 'echo b'
+
+echo '### Bug made 4 5 go before 1 2 3'; 
+  parallel -k ::: "sleep 1; echo 1" "echo 2" "echo 3" "echo 4" "echo 5"
+
+echo '### Bug made 3 go before 1 2'; 
+  parallel -kj 1 ::: "sleep 1; echo 1" "echo 2" "echo 3"
+
+echo '### Bug did not quote'; 
+  echo '>' | parallel -v echo; 
+  parallel -v echo ::: '>'; 
+  (echo '>'; echo  2) | parallel -j1 -vX echo; 
+  parallel -X -j1 echo ::: '>' 2
+
+echo '### Must not quote'; 
+  echo 'echo | wc -l' | parallel -v; 
+  parallel -v ::: 'echo | wc -l'; 
+  echo 'echo a b c | wc -w' | parallel -v; 
+  parallel -kv ::: 'echo a b c | wc -w' 'echo a b | wc -w'
 
 echo '### Test bug #35820: sem breaks if $HOME is not writable'
-echo 'Workaround: use another writable dir'
-rm -rf /tmp/.parallel
-HOME=/tmp sem echo OK
-HOME=/tmp sem --wait
-HOME=/usr/this/should/fail stdout sem echo should fail
+  echo 'Workaround: use another writable dir'; 
+  rm -rf /tmp/.parallel; 
+  HOME=/tmp sem echo OK; 
+  HOME=/tmp sem --wait; 
+  HOME=/usr/this/should/fail stdout sem echo should fail
+EOF
diff --git a/testsuite/wanted-results/parallel-local150 b/testsuite/wanted-results/parallel-local150
index 77e5042b..e9f776d0 100644
--- a/testsuite/wanted-results/parallel-local150
+++ b/testsuite/wanted-results/parallel-local150
@@ -1,4 +1,3 @@
-### Test fix #32191
 ### Test --tagstring
 echo 3 4
 a3b a4b	3 4
@@ -14,6 +13,119 @@ echo job1
 ajob1b	job1
 echo job2
 ajob2b	job2
+### Bug in --load
+1
+2
+3
+### Test --timeout
+1.1
+1.1
+6.6
+7.7
+8.8
+### Test retired
+parallel: Error: -g has been retired. Use --group.
+parallel: Error: -B has been retired. Use --bf.
+parallel: Error: -T has been retired. Use --tty.
+parallel: Error: -U has been retired. Use --er.
+parallel: Error: -W has been retired. Use --wd.
+parallel: Error: -Y has been retired. Use --shebang.
+parallel: Error: -H has been retired. Use --halt.
+parallel: Error: -g has been retired. Use --group.
+parallel: Error: -B has been retired. Use --bf.
+parallel: Error: -T has been retired. Use --tty.
+parallel: Error: -U has been retired. Use --er.
+parallel: Error: -W has been retired. Use --wd.
+parallel: Error: -Y has been retired. Use --shebang.
+parallel: Error: -H has been retired. Use --halt.
+parallel: Error: -g has been retired. Use --group.
+parallel: Error: -B has been retired. Use --bf.
+parallel: Error: -T has been retired. Use --tty.
+parallel: Error: -U has been retired. Use --er.
+parallel: Error: -W has been retired. Use --wd.
+parallel: Error: -Y has been retired. Use --shebang.
+parallel: Error: -H has been retired. Use --halt.
+### Test --joblog followed by --resume --joblog
+      5      49
+### Test --resume --joblog followed by --resume --joblog
+      5      49
+### Test --header
+3/4.5 1.2 3/4 4.5 3 4
+### 64-bit wierdness - this did not complete on a 64-bit machine
+### BUG-fix: bash -c 'parallel -a <(seq 1 3) echo'
+1
+2
+3
+### bug #35268: shell_quote doesn't treats [] brackets correctly
+/tmp/foo[123]
+### Test make .deb package
+To install the GNU Parallel Debian package, run:
+### Test of segfaulting issue
+This gave /home/tange/bin/stdout: line 3: 20374 Segmentation fault      "$@" 2>&1
+before adding wait() before exit
+### Test basic --arg-sep
+a
+b
+### Run commands using --arg-sep
+echo a
+a
+echo b
+b
+### Change --arg-sep
+echo a
+a
+echo b
+b
+echo a
+a
+echo b
+b
+echo a
+a
+echo b
+b
+echo a
+a
+echo b
+b
+### Test stdin goes to first command only
+cat
+via cat
+echo b
+b
+cat
+via cat
+echo b
+b
+### Bug made 4 5 go before 1 2 3
+1
+2
+3
+4
+5
+### Bug made 3 go before 1 2
+1
+2
+3
+### Bug did not quote
+echo \>
+>
+echo \>
+>
+echo \> 2
+> 2
+> 2
+### Must not quote
+echo | wc -l
+1
+echo | wc -l
+1
+echo a b c | wc -w
+3
+echo a b c | wc -w
+3
+echo a b | wc -w
+2
 ### Test bug #35820: sem breaks if $HOME is not writable
 Workaround: use another writable dir
 OK