diff --git a/testsuite/tests-to-run/sem01.sh b/testsuite/tests-to-run/sem01.sh
index 7c13cc89..e79418fc 100755
--- a/testsuite/tests-to-run/sem01.sh
+++ b/testsuite/tests-to-run/sem01.sh
@@ -13,14 +13,20 @@ parallel --semaphorename `tty` --semaphore --wait
 echo done
 
 echo '### Test semaphore 2 jobs running simultaneously'
-parallel -u -j2 --semaphore 'echo job1; sleep 0.5; echo job1'
-parallel -u -j2 --semaphore 'echo job2; sleep 0.5; echo job2'
+parallel -u -j2 --semaphore 'echo job1a; sleep 1; echo job1b'
+sleep 0.1
+parallel -u -j2 --semaphore 'echo job2a; sleep 1; echo job2b'
+sleep 0.1
+parallel -u -j2 --semaphore 'echo job3a; sleep 1; echo job3b'
 parallel --semaphore --wait
 echo done
 
 echo '### Test if parallel invoked as sem will run parallel --semaphore'
-sem -u -j2 'echo job1; sleep 0.5; echo job1'
-sem -u -j2  'echo job2; sleep 0.5; echo job2'
+sem -u -j2 'echo job1a; sleep 1; echo job1b'
+sleep 0.1
+sem -u -j2  'echo job2a; sleep 1; echo job2b'
+sleep 0.1
+sem -u -j2  'echo job3a; sleep 1; echo job3b'
 sem --wait
 echo done
 
diff --git a/testsuite/tests-to-run/test03.sh b/testsuite/tests-to-run/test03.sh
index 5c1d1402..129cc38b 100755
--- a/testsuite/tests-to-run/test03.sh
+++ b/testsuite/tests-to-run/test03.sh
@@ -1,13 +1,3 @@
 #!/bin/bash
 
-PAR=parallel
-
-rm -rf tmp 2>/dev/null
-cp -a input-files/testdir2 tmp
-cd tmp
-
-# tests if -c (cat | sh) works
-perl -e 'for(1..25) {print "echo a $_; echo b $_\n"}' | $PAR 2>&1 | sort
-
-cd ..
-rm -rf tmp
+# Moved to test15
\ No newline at end of file
diff --git a/testsuite/tests-to-run/test06.sh b/testsuite/tests-to-run/test06.sh
index bdd38e5e..9ad27401 100755
--- a/testsuite/tests-to-run/test06.sh
+++ b/testsuite/tests-to-run/test06.sh
@@ -1,16 +1,3 @@
 #!/bin/bash
 
-PAR=parallel
-
-rm -rf tmp 2>/dev/null
-cp -a input-files/testdir2 tmp
-cd tmp
-
-# tests if cat | sh-mode works
-perl -e 'for(1..25) {print "echo a $_; echo b $_\n"}' | $PAR 2>&1 | sort
-
-# tests if xargs-mode works
-perl -e 'for(1..25) {print "a $_\nb $_\n"}' | $PAR echo 2>&1 | sort
-
-cd ..
-rm -rf tmp
+# Moved to test15
diff --git a/testsuite/tests-to-run/test07.sh b/testsuite/tests-to-run/test07.sh
index 0ec7f9e2..129cc38b 100755
--- a/testsuite/tests-to-run/test07.sh
+++ b/testsuite/tests-to-run/test07.sh
@@ -1,5 +1,3 @@
 #!/bin/bash
 
-PAR=parallel
-
-seq 1 100 | $PAR -j0 -qv perl -e '$r=rand(shift);for($f=0;$f<$r;$f++){$a="a"x100};print shift,"\n"' 10000 | sort
+# Moved to test15
\ No newline at end of file
diff --git a/testsuite/tests-to-run/test09.sh b/testsuite/tests-to-run/test09.sh
index 0b7e73ea..d672a33e 100755
--- a/testsuite/tests-to-run/test09.sh
+++ b/testsuite/tests-to-run/test09.sh
@@ -1,8 +1,48 @@
 #!/bin/bash
 
 # Simple jobs taking 100s that can be run in parallel
-cat <<'EOF' | sed -e s/\$SERVER1/$SERVER1/\;s/\$SERVER2/$SERVER2/ | parallel -j0 -k -L1
+cat <<'EOF' | sed -e 's/;$/; /;s/$SERVER1/'$SERVER1'/;s/$SERVER2/'$SERVER2'/' | stdout parallel -k -L1
 echo "### Test Force outside the file handle limit, 2009-02-17 Gave fork error"; 
-  (echo echo Start; seq 1 20000 | perl -pe 's/^/true /'; echo echo end) | parallel -uj 0 
+  (echo echo Start; seq 1 20000 | perl -pe 's/^/true /'; echo echo end) | parallel -uj 0
+
+echo '### Test race condition on 8 CPU (my laptop)'; 
+  seq 1 5000000 > /tmp/parallel_test; 
+  seq 1 10 | parallel -k "cat /tmp/parallel_test | parallel --pipe --recend '' -k gzip >/dev/null; echo {}"
+
+echo '### Test exit val - true'; 
+  echo true | parallel; 
+  echo $?
+
+echo '### Test exit val - false'; 
+  echo false | parallel; 
+  echo $?
+
+echo '### Test --halt-on-error 0'; 
+  (echo "sleep 1;true"; echo "sleep 2;false";echo "sleep 3;true") | parallel -j10 --halt-on-error 0; 
+  echo $?; 
+  (echo "sleep 1;true"; echo "sleep 2;false";echo "sleep 3;true";echo "sleep 4; non_exist") | parallel -j10 -H0; 
+  echo $?
+
+echo '### Test --halt-on-error 1'; 
+  (echo "sleep 1;true"; echo "sleep 2;false";echo "sleep 3;true") | parallel -j10 --halt-on-error 1; 
+  echo $?; 
+  (echo "sleep 1;true"; echo "sleep 2;false";echo "sleep 3;true";echo "sleep 4; non_exist") | parallel -j10 -H1; 
+  echo $?
+
+echo '### Test --halt-on-error 2'; 
+  (echo "sleep 1;true"; echo "sleep 2;false";echo "sleep 3;true") | parallel -j10 --halt-on-error 2; 
+  echo $?; 
+  (echo "sleep 1;true"; echo "sleep 2;false";echo "sleep 3;true";echo "sleep 4; non_exist") | parallel -j10 -H2; 
+  echo $?
+
+echo '### Test last dying print --halt-on-error'; 
+  (seq 0 8;echo 0; echo 9) | parallel -j10 -kqH1 perl -e 'sleep $ARGV[0];print STDERR @ARGV,"\n"; exit shift'; 
+  echo $?; 
+  (seq 0 8;echo 0; echo 9) | parallel -j10 -kqH2 perl -e 'sleep $ARGV[0];print STDERR @ARGV,"\n"; exit shift'; 
+  echo $?
+
+echo '### Test slow arguments generation - https://savannah.gnu.org/bugs/?32834'; 
+  seq 1 3 | parallel -j1 "sleep 2; echo {}" | parallel -kj2 echo
+
 EOF
 
diff --git a/testsuite/tests-to-run/test11.sh b/testsuite/tests-to-run/test11.sh
index a6dceb4d..9ad27401 100755
--- a/testsuite/tests-to-run/test11.sh
+++ b/testsuite/tests-to-run/test11.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
 
-PAR=parallel
-
-# Test the empty line
-echo | $PAR echo foo
+# Moved to test15
diff --git a/testsuite/tests-to-run/test15.sh b/testsuite/tests-to-run/test15.sh
index f1b0b6d1..56db422a 100755
--- a/testsuite/tests-to-run/test15.sh
+++ b/testsuite/tests-to-run/test15.sh
@@ -124,7 +124,7 @@ echo /tmp/parallel_f1 /tmp/parallel_f2 | stdout parallel -kv --delimiter ' ' gzi
 rm /tmp/parallel_f*
 
 
-cat <<'EOF' | parallel -j0 -k
+cat <<'EOF' | sed -e 's/;$/; /;s/$SERVER1/'$SERVER1'/;s/$SERVER2/'$SERVER2'/' | stdout parallel -j10 -k -L1
 echo '### Test -i and --replace: Replace with argument'
 (echo a; echo END; echo b) | parallel -k -i -eEND echo repl{}ce
 (echo a; echo END; echo b) | parallel -k --replace -eEND echo repl{}ce
@@ -194,4 +194,66 @@ echo '### Test --verbose and -t'
 echo '### Test --show-limits'
 (echo b; echo c; echo f) | parallel -k --show-limits echo {}ar
 (echo b; echo c; echo f) | parallel -j1 -kX --show-limits -s 100 echo {}ar
+
+echo '### Test empty line as input'
+echo | parallel echo empty input line
+
+echo '### Tests if (cat | sh) works'
+perl -e 'for(1..25) {print "echo a $_; echo b $_\n"}' | parallel 2>&1 | sort
+
+echo '### Test if xargs-mode works'
+perl -e 'for(1..25) {print "a $_\nb $_\n"}' | parallel echo 2>&1 | sort
+
+echo '### Test -q'
+parallel -kq perl -e '$ARGV[0]=~/^\S+\s+\S+$/ and print $ARGV[0],"\n"' ::: "a b" c "d e f" g "h i"
+
+echo '### Test -q {#}'
+parallel -kq echo {#} ::: a b
+parallel -kq echo {\#} ::: a b
+parallel -kq echo {\\#} ::: a b
+
+echo '### Test long commands do not take up all memory'
+seq 1 100 | parallel -j0 -qv perl -e '$r=rand(shift);for($f=0;$f<$r;$f++){$a="a"x100};print shift,"\n"' 10000 | sort
+
+echo '### Test 0-arguments'
+seq 1 2 | parallel -k -n0 echo n0
+seq 1 2 | parallel -k -L0 echo L0
+seq 1 2 | parallel -k -N0 echo N0
+
+echo '### Because of --tollef -l, then -l0 == -l1, sorry'
+seq 1 2 | parallel -k -l0 echo l0
+
+echo '### Test replace {}'
+seq 1 2 | parallel -k -N0 echo replace {} curlies
+
+echo '### Test arguments on commandline'
+parallel -k -N0 echo args on cmdline ::: 1 2
+
+echo '### Test --nice locally'
+parallel --nice 1 -vv 'PAR=a bash -c "echo  \$PAR {}"' ::: b
+
+echo '### Test --nice remote'
+stdout parallel --nice 1 -S .. -vv 'PAR=a bash -c "echo  \$PAR {}"' ::: b 
+  | perl -pe 's/\S*parallel-server\S*/one-server/'
+
+echo '### Test distribute arguments at EOF to 2 jobslots'
+seq 1 92 | parallel -j+0 -kX -s 100 echo
+
+echo '### Test distribute arguments at EOF to 5 jobslots'
+seq 1 92 | parallel -j+3 -kX -s 100 echo
+
+echo '### Test distribute arguments at EOF to infinity jobslots'
+seq 1 92 | parallel -j0 -kX -s 100 echo
+
+echo '### Test -N is not broken by distribution - single line'
+seq 9 | parallel  -N 10  echo
+
+echo '### Test -N is not broken by distribution - two lines'
+seq 19 | parallel -k -N 10  echo
+
+echo '### Test -N context replace'
+seq 19 | parallel -k -N 10  echo a{}b
+
+echo '### Test -L context replace'
+seq 19 | parallel -k -L 10  echo a{}b
 EOF
diff --git a/testsuite/tests-to-run/test22.sh b/testsuite/tests-to-run/test22.sh
index 21de1356..05a7907c 100755
--- a/testsuite/tests-to-run/test22.sh
+++ b/testsuite/tests-to-run/test22.sh
@@ -1,34 +1,2 @@
 #!/bin/bash
 
-PAR=parallel
-SERVER1=parallel-server1
-SERVER2=parallel-server2
-
-(
-echo '### Test exit val'
-echo true | parallel
-echo $?
-echo false | parallel
-echo $?
-
-echo '### Test --halt-on-error'
-(echo "sleep 1;true"; echo "sleep 2;false";echo "sleep 3;true") | parallel -j10 --halt-on-error 0
-echo $?
-(echo "sleep 1;true"; echo "sleep 2;false";echo "sleep 3;true") | parallel -j10 --halt-on-error 1
-echo $?
-(echo "sleep 1;true"; echo "sleep 2;false";echo "sleep 3;true") | parallel -j10 --halt-on-error 2
-echo $?
-
-(echo "sleep 1;true"; echo "sleep 2;false";echo "sleep 3;true";echo "sleep 4; non_exist") | parallel -j10 -H0
-echo $?
-(echo "sleep 1;true"; echo "sleep 2;false";echo "sleep 3;true";echo "sleep 4; non_exist") | parallel -j10 -H1
-echo $?
-(echo "sleep 1;true"; echo "sleep 2;false";echo "sleep 3;true";echo "sleep 4; non_exist") | parallel -j10 -H2
-echo $?
-
-echo '### Test last dying print --halt-on-error'
-(seq 0 8;echo 0; echo 9) | parallel -j10 -kqH1 perl -e 'sleep $ARGV[0];print STDERR @ARGV,"\n"; exit shift'
-echo $?
-(seq 0 8;echo 0; echo 9) | parallel -j10 -kqH2 perl -e 'sleep $ARGV[0];print STDERR @ARGV,"\n"; exit shift'
-echo $?
-) 2>&1
diff --git a/testsuite/tests-to-run/test27.sh b/testsuite/tests-to-run/test27.sh
index eb0decbd..a9b93671 100644
--- a/testsuite/tests-to-run/test27.sh
+++ b/testsuite/tests-to-run/test27.sh
@@ -6,6 +6,7 @@ echo '### Tests from xargs'
 rsync -Ha --delete input-files/xargs-inputs/ tmp/
 cd tmp
 
+cat <<'EOF' | sed -e 's/;$/; /;s/$SERVER1/'$SERVER1'/;s/$SERVER2/'$SERVER2'/' | stdout parallel -j0 -k -L1
 echo '### -0 -n3 echo < files0.xi'
 stdout xargs -0 -n3 echo < files0.xi
 stdout parallel -k -0 -n3 echo < files0.xi
@@ -243,7 +244,7 @@ echo '###  -s30 -t echo < stairs.xi - xargs'
 stdout xargs -s30 -t echo < stairs.xi
 echo '###  -s30 -t echo < stairs.xi - parallel'
 echo 'Because of -t these lines can be flipped around therefore sort'
-stdout parallel -k -X -s30 -t echo < stairs.xi | sort 
+stdout parallel -k -X -s30 -t echo < stairs.xi | sort
 echo '###  -t echo this plus that < space.xi'
 stdout xargs -t echo this plus that < space.xi
 stdout parallel -k -t echo this plus that < space.xi
@@ -254,6 +255,8 @@ echo '###  -n2 -t echo < foobar.xi'
 stdout xargs -n2 -t echo < foobar.xi
 stdout parallel -k -n2 -t echo < foobar.xi
 
+EOF
+
 # 
 # xargs_start 123 {-n1 -IARG sh -c ARG} ftt.xi
 # xargs_start 124 {-n1 -IARG sh -c ARG} ett.xi
diff --git a/testsuite/tests-to-run/test44.sh b/testsuite/tests-to-run/test44.sh
index 321a8dff..3a6b6da0 100644
--- a/testsuite/tests-to-run/test44.sh
+++ b/testsuite/tests-to-run/test44.sh
@@ -1,10 +1,4 @@
 #!/bin/bash
 
-# Test --nice
-echo '### Test --nice locally'
-parallel --nice 1 -vv 'PAR=a bash -c "echo  \$PAR {}"' ::: b
-
-echo '### Test --nice remote'
-stdout parallel --nice 1 -S .. -vv 'PAR=a bash -c "echo  \$PAR {}"' ::: b \
-| perl -pe 's/\S*parallel-server\S*/one-server/'
+# Moved to test15.sh
 
diff --git a/testsuite/tests-to-run/test48.sh b/testsuite/tests-to-run/test48.sh
index 2babcf6f..aa6decb8 100644
--- a/testsuite/tests-to-run/test48.sh
+++ b/testsuite/tests-to-run/test48.sh
@@ -1,22 +1,3 @@
 #!/bin/bash
 
-echo '### Test distribute arguments at EOF to 2 jobslots'
-seq 1 92 | parallel -j+0 -kX -s 100 echo
-
-echo '### Test distribute arguments at EOF to 5 jobslots'
-seq 1 92 | parallel -j+3 -kX -s 100 echo
-
-echo '### Test distribute arguments at EOF to infinity jobslots'
-seq 1 92 | parallel -j0 -kX -s 100 echo
-
-echo '### Test -N is not broken by distribution - single line'
-seq 9 | parallel  -N 10  echo
-
-echo '### Test -N is not broken by distribution - two lines'
-seq 19 | parallel -k -N 10  echo
-
-echo '### Test -N context replace'
-seq 19 | parallel -k -N 10  echo a{}b
-
-echo '### Test -L context replace'
-seq 19 | parallel -k -L 10  echo a{}b
+# Moved to test15.sh
diff --git a/testsuite/tests-to-run/test53.sh b/testsuite/tests-to-run/test53.sh
index f94caf07..9ad27401 100644
--- a/testsuite/tests-to-run/test53.sh
+++ b/testsuite/tests-to-run/test53.sh
@@ -1,14 +1,3 @@
 #!/bin/bash
 
-echo '### Test 0-arguments'
-seq 1 2 | parallel -k -n0 echo n0
-seq 1 2 | parallel -k -L0 echo L0
-seq 1 2 | parallel -k -N0 echo N0
-echo '### Because of --tollef -l, then -l0 == -l1, sorry'
-seq 1 2 | parallel -k -l0 echo l0
-
-echo '### Test replace {}'
-seq 1 2 | parallel -k -N0 echo replace {} curlies
-
-echo '### Test arguments on commandline'
-parallel -k -N0 echo args on cmdline ::: 1 2
+# Moved to test15
diff --git a/testsuite/tests-to-run/test55.sh b/testsuite/tests-to-run/test55.sh
index affa9b60..05a7907c 100644
--- a/testsuite/tests-to-run/test55.sh
+++ b/testsuite/tests-to-run/test55.sh
@@ -1,6 +1,2 @@
 #!/bin/bash
 
-echo '### Test race condition on 8 CPU (my laptop)'
-seq 1 5000000 > /tmp/parallel_test
-seq 1 10 | parallel -k "cat /tmp/parallel_test | parallel --pipe --recend '' -k gzip >/dev/null; echo {}"
-
diff --git a/testsuite/tests-to-run/test63.sh b/testsuite/tests-to-run/test63.sh
index 86bb5f66..9ad27401 100644
--- a/testsuite/tests-to-run/test63.sh
+++ b/testsuite/tests-to-run/test63.sh
@@ -1,11 +1,3 @@
 #!/bin/bash
 
-cat <<'EOF' | parallel -j0 -k
-echo '### Test -q'
-parallel -kq perl -e '$ARGV[0]=~/^\S+\s+\S+$/ and print $ARGV[0],"\n"' ::: "a b" c "d e f" g "h i"
-
-echo '### Test -q {#}'
-parallel -kq echo {#} ::: a b
-parallel -kq echo {\#} ::: a b
-parallel -kq echo {\\#} ::: a b
-EOF
+# Moved to test15
diff --git a/testsuite/wanted-results/sem01 b/testsuite/wanted-results/sem01
index 6d0795d4..61b816e2 100644
--- a/testsuite/wanted-results/sem01
+++ b/testsuite/wanted-results/sem01
@@ -43,16 +43,20 @@ done
 20
 done
 ### Test semaphore 2 jobs running simultaneously
-job1
-job2
-job1
-job2
+job1a
+job2a
+job1b
+job3a
+job2b
+job3b
 done
 ### Test if parallel invoked as sem will run parallel --semaphore
-job1
-job2
-job1
-job2
+job1a
+job2a
+job1b
+job2b
+job3a
+job3b
 done
 ### Test similar example as from man page - run 2 jobs simultaneously
 Expect done: 1 2 5 3 4
diff --git a/testsuite/wanted-results/test03 b/testsuite/wanted-results/test03
index 40593335..e69de29b 100644
--- a/testsuite/wanted-results/test03
+++ b/testsuite/wanted-results/test03
@@ -1,50 +0,0 @@
-a 1
-a 10
-a 11
-a 12
-a 13
-a 14
-a 15
-a 16
-a 17
-a 18
-a 19
-a 2
-a 20
-a 21
-a 22
-a 23
-a 24
-a 25
-a 3
-a 4
-a 5
-a 6
-a 7
-a 8
-a 9
-b 1
-b 10
-b 11
-b 12
-b 13
-b 14
-b 15
-b 16
-b 17
-b 18
-b 19
-b 2
-b 20
-b 21
-b 22
-b 23
-b 24
-b 25
-b 3
-b 4
-b 5
-b 6
-b 7
-b 8
-b 9
diff --git a/testsuite/wanted-results/test06 b/testsuite/wanted-results/test06
index b1735d70..e69de29b 100644
--- a/testsuite/wanted-results/test06
+++ b/testsuite/wanted-results/test06
@@ -1,100 +0,0 @@
-a 1
-a 10
-a 11
-a 12
-a 13
-a 14
-a 15
-a 16
-a 17
-a 18
-a 19
-a 2
-a 20
-a 21
-a 22
-a 23
-a 24
-a 25
-a 3
-a 4
-a 5
-a 6
-a 7
-a 8
-a 9
-b 1
-b 10
-b 11
-b 12
-b 13
-b 14
-b 15
-b 16
-b 17
-b 18
-b 19
-b 2
-b 20
-b 21
-b 22
-b 23
-b 24
-b 25
-b 3
-b 4
-b 5
-b 6
-b 7
-b 8
-b 9
-a 1
-a 10
-a 11
-a 12
-a 13
-a 14
-a 15
-a 16
-a 17
-a 18
-a 19
-a 2
-a 20
-a 21
-a 22
-a 23
-a 24
-a 25
-a 3
-a 4
-a 5
-a 6
-a 7
-a 8
-a 9
-b 1
-b 10
-b 11
-b 12
-b 13
-b 14
-b 15
-b 16
-b 17
-b 18
-b 19
-b 2
-b 20
-b 21
-b 22
-b 23
-b 24
-b 25
-b 3
-b 4
-b 5
-b 6
-b 7
-b 8
-b 9
diff --git a/testsuite/wanted-results/test07 b/testsuite/wanted-results/test07
index b4a941d9..e69de29b 100644
--- a/testsuite/wanted-results/test07
+++ b/testsuite/wanted-results/test07
@@ -1,200 +0,0 @@
-1
-10
-100
-11
-12
-13
-14
-15
-16
-17
-18
-19
-2
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-3
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-4
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-5
-50
-51
-52
-53
-54
-55
-56
-57
-58
-59
-6
-60
-61
-62
-63
-64
-65
-66
-67
-68
-69
-7
-70
-71
-72
-73
-74
-75
-76
-77
-78
-79
-8
-80
-81
-82
-83
-84
-85
-86
-87
-88
-89
-9
-90
-91
-92
-93
-94
-95
-96
-97
-98
-99
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 1
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 10
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 100
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 11
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 12
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 13
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 14
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 15
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 16
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 17
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 18
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 19
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 2
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 20
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 21
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 22
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 23
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 24
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 25
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 26
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 27
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 28
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 29
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 3
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 30
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 31
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 32
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 33
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 34
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 35
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 36
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 37
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 38
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 39
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 4
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 40
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 41
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 42
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 43
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 44
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 45
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 46
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 47
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 48
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 49
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 5
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 50
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 51
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 52
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 53
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 54
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 55
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 56
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 57
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 58
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 59
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 6
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 60
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 61
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 62
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 63
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 64
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 65
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 66
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 67
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 68
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 69
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 7
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 70
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 71
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 72
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 73
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 74
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 75
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 76
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 77
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 78
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 79
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 8
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 80
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 81
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 82
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 83
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 84
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 85
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 86
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 87
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 88
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 89
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 9
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 90
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 91
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 92
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 93
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 94
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 95
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 96
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 97
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 98
-perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 99
diff --git a/testsuite/wanted-results/test09 b/testsuite/wanted-results/test09
index 655a8191..2ad8a90d 100644
--- a/testsuite/wanted-results/test09
+++ b/testsuite/wanted-results/test09
@@ -1,3 +1,80 @@
+parallel: Warning: Only enough filehandles to run 507 jobs in parallel. Raising ulimit -n may help.
 ### Test Force outside the file handle limit, 2009-02-17 Gave fork error
 Start
 end
+### Test race condition on 8 CPU (my laptop)
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+### Test exit val - true
+0
+### Test exit val - false
+1
+sh: non_exist: command not found
+### Test --halt-on-error 0
+1
+2
+parallel: Starting no more jobs. Waiting for 2 jobs to finish. This job failed:
+sleep 2;false
+sh: non_exist: command not found
+parallel: Starting no more jobs. Waiting for 3 jobs to finish. This job failed:
+sleep 2;false
+parallel: Starting no more jobs. Waiting for 1 jobs to finish. This job failed:
+sleep 4; non_exist
+### Test --halt-on-error 1
+1
+127
+parallel: This job failed:
+sleep 2;false
+parallel: This job failed:
+sleep 2;false
+### Test --halt-on-error 2
+1
+1
+0
+1
+2
+3
+4
+5
+6
+7
+8
+0
+9
+parallel: Starting no more jobs. Waiting for 9 jobs to finish. This job failed:
+perl -e sleep\ \$ARGV[0]\;print\ STDERR\ @ARGV,\"\\n\"\;\ exit\ shift 1
+parallel: Starting no more jobs. Waiting for 8 jobs to finish. This job failed:
+perl -e sleep\ \$ARGV[0]\;print\ STDERR\ @ARGV,\"\\n\"\;\ exit\ shift 2
+parallel: Starting no more jobs. Waiting for 7 jobs to finish. This job failed:
+perl -e sleep\ \$ARGV[0]\;print\ STDERR\ @ARGV,\"\\n\"\;\ exit\ shift 3
+parallel: Starting no more jobs. Waiting for 6 jobs to finish. This job failed:
+perl -e sleep\ \$ARGV[0]\;print\ STDERR\ @ARGV,\"\\n\"\;\ exit\ shift 4
+parallel: Starting no more jobs. Waiting for 5 jobs to finish. This job failed:
+perl -e sleep\ \$ARGV[0]\;print\ STDERR\ @ARGV,\"\\n\"\;\ exit\ shift 5
+parallel: Starting no more jobs. Waiting for 4 jobs to finish. This job failed:
+perl -e sleep\ \$ARGV[0]\;print\ STDERR\ @ARGV,\"\\n\"\;\ exit\ shift 6
+parallel: Starting no more jobs. Waiting for 3 jobs to finish. This job failed:
+perl -e sleep\ \$ARGV[0]\;print\ STDERR\ @ARGV,\"\\n\"\;\ exit\ shift 7
+parallel: Starting no more jobs. Waiting for 2 jobs to finish. This job failed:
+perl -e sleep\ \$ARGV[0]\;print\ STDERR\ @ARGV,\"\\n\"\;\ exit\ shift 8
+parallel: Starting no more jobs. Waiting for 1 jobs to finish. This job failed:
+perl -e sleep\ \$ARGV[0]\;print\ STDERR\ @ARGV,\"\\n\"\;\ exit\ shift 9
+0
+1
+parallel: This job failed:
+perl -e sleep\ \$ARGV[0]\;print\ STDERR\ @ARGV,\"\\n\"\;\ exit\ shift 1
+### Test last dying print --halt-on-error
+9
+1
+### Test slow arguments generation - https://savannah.gnu.org/bugs/?32834
+1
+2
+3
diff --git a/testsuite/wanted-results/test11 b/testsuite/wanted-results/test11
index 257cc564..e69de29b 100644
--- a/testsuite/wanted-results/test11
+++ b/testsuite/wanted-results/test11
@@ -1 +0,0 @@
-foo
diff --git a/testsuite/wanted-results/test15 b/testsuite/wanted-results/test15
index b21b2cd1..9eabf027 100644
--- a/testsuite/wanted-results/test15
+++ b/testsuite/wanted-results/test15
@@ -315,3 +315,394 @@ Execution of  will continue now, and it will try to read its input
 and run commands; if this is not what you wanted to happen, please
 press CTRL-D or CTRL-C
 bar car far
+### Test empty line as input
+empty input line
+### Tests if (cat | sh) works
+a 1
+a 10
+a 11
+a 12
+a 13
+a 14
+a 15
+a 16
+a 17
+a 18
+a 19
+a 2
+a 20
+a 21
+a 22
+a 23
+a 24
+a 25
+a 3
+a 4
+a 5
+a 6
+a 7
+a 8
+a 9
+b 1
+b 10
+b 11
+b 12
+b 13
+b 14
+b 15
+b 16
+b 17
+b 18
+b 19
+b 2
+b 20
+b 21
+b 22
+b 23
+b 24
+b 25
+b 3
+b 4
+b 5
+b 6
+b 7
+b 8
+b 9
+### Test if xargs-mode works
+a 1
+a 10
+a 11
+a 12
+a 13
+a 14
+a 15
+a 16
+a 17
+a 18
+a 19
+a 2
+a 20
+a 21
+a 22
+a 23
+a 24
+a 25
+a 3
+a 4
+a 5
+a 6
+a 7
+a 8
+a 9
+b 1
+b 10
+b 11
+b 12
+b 13
+b 14
+b 15
+b 16
+b 17
+b 18
+b 19
+b 2
+b 20
+b 21
+b 22
+b 23
+b 24
+b 25
+b 3
+b 4
+b 5
+b 6
+b 7
+b 8
+b 9
+### Test -q
+a b
+h i
+### Test -q {#}
+1
+2
+1
+2
+{\#} a
+{\#} b
+### Test long commands do not take up all memory
+1
+10
+100
+11
+12
+13
+14
+15
+16
+17
+18
+19
+2
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+3
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+4
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+5
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+6
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+7
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+8
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+9
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 1
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 10
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 100
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 11
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 12
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 13
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 14
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 15
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 16
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 17
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 18
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 19
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 2
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 20
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 21
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 22
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 23
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 24
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 25
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 26
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 27
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 28
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 29
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 3
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 30
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 31
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 32
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 33
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 34
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 35
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 36
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 37
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 38
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 39
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 4
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 40
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 41
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 42
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 43
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 44
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 45
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 46
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 47
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 48
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 49
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 5
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 50
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 51
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 52
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 53
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 54
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 55
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 56
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 57
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 58
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 59
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 6
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 60
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 61
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 62
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 63
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 64
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 65
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 66
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 67
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 68
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 69
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 7
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 70
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 71
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 72
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 73
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 74
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 75
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 76
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 77
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 78
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 79
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 8
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 80
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 81
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 82
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 83
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 84
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 85
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 86
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 87
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 88
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 89
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 9
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 90
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 91
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 92
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 93
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 94
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 95
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 96
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 97
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 98
+perl -e \$r=rand\(shift\)\;for\(\$f=0\;\$f\<\$r\;\$f++\){\$a=\"a\"x100}\;print\ shift,\"\\n\" 10000 99
+### Test 0-arguments
+n0
+n0
+L0
+L0
+N0
+N0
+### Because of --tollef -l, then -l0 == -l1, sorry
+l0 1
+l0 2
+### Test replace {}
+replace curlies
+replace curlies
+### Test arguments on commandline
+args on cmdline
+args on cmdline
+### Test --nice locally
+nice -n1 bash -c PAR=a\ bash\ -c\ \"echo\ \ \\\$PAR\ b\"
+a b
+### Test --nice remote
+ssh one-server 'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\; setenv PARALLEL_PID '$PARALLEL_PID' || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\;PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;' nice\ -n1\ bash\ -c\ PAR=a\\\ bash\\\ -c\\\ \\\"echo\\\ \\\ \\\\\\\$PAR\\\ b\\\";
+a b
+### Test distribute arguments at EOF to 2 jobslots
+1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34
+35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65
+66 67 68 69 70 71 72 73 74 75 76 77 78 79
+80 81 82 83 84 85 86 87 88 89 90 91 92
+### Test distribute arguments at EOF to 5 jobslots
+1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34
+35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65
+66 67 68 69 70 71
+72 73 74 75 76 77
+78 79 80 81 82 83
+84 85 86 87 88 89
+90 91 92
+### Test distribute arguments at EOF to infinity jobslots
+1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34
+35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+### Test -N is not broken by distribution - single line
+1 2 3 4 5 6 7 8 9
+### Test -N is not broken by distribution - two lines
+1 2 3 4 5 6 7 8 9 10
+11 12 13 14 15 16 17 18 19
+### Test -N context replace
+a1b a2b a3b a4b a5b a6b a7b a8b a9b a10b
+a11b a12b a13b a14b a15b a16b a17b a18b a19b
+### Test -L context replace
+a1b a2b a3b a4b a5b a6b a7b a8b a9b a10b
+a11b a12b a13b a14b a15b a16b a17b a18b a19b
diff --git a/testsuite/wanted-results/test22 b/testsuite/wanted-results/test22
index 876e5479..e69de29b 100644
--- a/testsuite/wanted-results/test22
+++ b/testsuite/wanted-results/test22
@@ -1,58 +0,0 @@
-### Test exit val
-0
-1
-### Test --halt-on-error
-1
-parallel: Starting no more jobs. Waiting for 2 jobs to finish. This job failed:
-sleep 2;false
-1
-parallel: This job failed:
-sleep 2;false
-1
-sh: non_exist: command not found
-2
-sh: non_exist: command not found
-parallel: Starting no more jobs. Waiting for 3 jobs to finish. This job failed:
-sleep 2;false
-parallel: Starting no more jobs. Waiting for 1 jobs to finish. This job failed:
-sleep 4; non_exist
-127
-parallel: This job failed:
-sleep 2;false
-1
-### Test last dying print --halt-on-error
-0
-1
-2
-3
-4
-5
-6
-7
-8
-0
-9
-parallel: Starting no more jobs. Waiting for 9 jobs to finish. This job failed:
-perl -e sleep\ \$ARGV[0]\;print\ STDERR\ @ARGV,\"\\n\"\;\ exit\ shift 1
-parallel: Starting no more jobs. Waiting for 8 jobs to finish. This job failed:
-perl -e sleep\ \$ARGV[0]\;print\ STDERR\ @ARGV,\"\\n\"\;\ exit\ shift 2
-parallel: Starting no more jobs. Waiting for 7 jobs to finish. This job failed:
-perl -e sleep\ \$ARGV[0]\;print\ STDERR\ @ARGV,\"\\n\"\;\ exit\ shift 3
-parallel: Starting no more jobs. Waiting for 6 jobs to finish. This job failed:
-perl -e sleep\ \$ARGV[0]\;print\ STDERR\ @ARGV,\"\\n\"\;\ exit\ shift 4
-parallel: Starting no more jobs. Waiting for 5 jobs to finish. This job failed:
-perl -e sleep\ \$ARGV[0]\;print\ STDERR\ @ARGV,\"\\n\"\;\ exit\ shift 5
-parallel: Starting no more jobs. Waiting for 4 jobs to finish. This job failed:
-perl -e sleep\ \$ARGV[0]\;print\ STDERR\ @ARGV,\"\\n\"\;\ exit\ shift 6
-parallel: Starting no more jobs. Waiting for 3 jobs to finish. This job failed:
-perl -e sleep\ \$ARGV[0]\;print\ STDERR\ @ARGV,\"\\n\"\;\ exit\ shift 7
-parallel: Starting no more jobs. Waiting for 2 jobs to finish. This job failed:
-perl -e sleep\ \$ARGV[0]\;print\ STDERR\ @ARGV,\"\\n\"\;\ exit\ shift 8
-parallel: Starting no more jobs. Waiting for 1 jobs to finish. This job failed:
-perl -e sleep\ \$ARGV[0]\;print\ STDERR\ @ARGV,\"\\n\"\;\ exit\ shift 9
-9
-0
-1
-parallel: This job failed:
-perl -e sleep\ \$ARGV[0]\;print\ STDERR\ @ARGV,\"\\n\"\;\ exit\ shift 1
-1
diff --git a/testsuite/wanted-results/test44 b/testsuite/wanted-results/test44
index 6ae49b90..e69de29b 100644
--- a/testsuite/wanted-results/test44
+++ b/testsuite/wanted-results/test44
@@ -1,6 +0,0 @@
-### Test --nice locally
-nice -n1 bash -c PAR=a\ bash\ -c\ \"echo\ \ \\\$PAR\ b\"
-a b
-### Test --nice remote
-ssh one-server 'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\; setenv PARALLEL_PID '$PARALLEL_PID' || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\;PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;' nice\ -n1\ bash\ -c\ PAR=a\\\ bash\\\ -c\\\ \\\"echo\\\ \\\ \\\\\\\$PAR\\\ b\\\";
-a b
diff --git a/testsuite/wanted-results/test48 b/testsuite/wanted-results/test48
index 859ce375..e69de29b 100644
--- a/testsuite/wanted-results/test48
+++ b/testsuite/wanted-results/test48
@@ -1,54 +0,0 @@
-### Test distribute arguments at EOF to 2 jobslots
-1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34
-35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65
-66 67 68 69 70 71 72 73 74 75 76 77 78 79
-80 81 82 83 84 85 86 87 88 89 90 91 92
-### Test distribute arguments at EOF to 5 jobslots
-1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34
-35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65
-66 67 68 69 70 71
-72 73 74 75 76 77
-78 79 80 81 82 83
-84 85 86 87 88 89
-90 91 92
-### Test distribute arguments at EOF to infinity jobslots
-1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34
-35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65
-66
-67
-68
-69
-70
-71
-72
-73
-74
-75
-76
-77
-78
-79
-80
-81
-82
-83
-84
-85
-86
-87
-88
-89
-90
-91
-92
-### Test -N is not broken by distribution - single line
-1 2 3 4 5 6 7 8 9
-### Test -N is not broken by distribution - two lines
-1 2 3 4 5 6 7 8 9 10
-11 12 13 14 15 16 17 18 19
-### Test -N context replace
-a1b a2b a3b a4b a5b a6b a7b a8b a9b a10b
-a11b a12b a13b a14b a15b a16b a17b a18b a19b
-### Test -L context replace
-a1b a2b a3b a4b a5b a6b a7b a8b a9b a10b
-a11b a12b a13b a14b a15b a16b a17b a18b a19b
diff --git a/testsuite/wanted-results/test53 b/testsuite/wanted-results/test53
index 83dcd2bd..e69de29b 100644
--- a/testsuite/wanted-results/test53
+++ b/testsuite/wanted-results/test53
@@ -1,16 +0,0 @@
-### Test 0-arguments
-n0
-n0
-L0
-L0
-N0
-N0
-### Because of --tollef -l, then -l0 == -l1, sorry
-l0 1
-l0 2
-### Test replace {}
-replace curlies
-replace curlies
-### Test arguments on commandline
-args on cmdline
-args on cmdline
diff --git a/testsuite/wanted-results/test55 b/testsuite/wanted-results/test55
index 42c0d9a3..e69de29b 100644
--- a/testsuite/wanted-results/test55
+++ b/testsuite/wanted-results/test55
@@ -1,11 +0,0 @@
-### Test race condition on 8 CPU (my laptop)
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
diff --git a/testsuite/wanted-results/test63 b/testsuite/wanted-results/test63
index 9560fb64..e69de29b 100644
--- a/testsuite/wanted-results/test63
+++ b/testsuite/wanted-results/test63
@@ -1,10 +0,0 @@
-### Test -q
-a b
-h i
-### Test -q {#}
-1
-2
-1
-2
-{\#} a
-{\#} b