diff --git a/tests/smoke-test b/tests/smoke-test
index 7344ccfa..fe6d614d 100755
--- a/tests/smoke-test
+++ b/tests/smoke-test
@@ -87,7 +87,7 @@ EOF
 	then c=POGO r=peter
 	else c="${p#0}"; r="$c"
 	fi
-	sed '1,3d;$d' <$j | src/client/empire "$c" "$r" >&3
+	src/client/empire "$c" "$r" <$j >&3
 	echo "Player $p Turn $t completed successfully" >&3
     done
     need_update=y
diff --git a/tests/smoke/00/00 b/tests/smoke/00/00
index 42cdd1b6..5771d74a 100644
--- a/tests/smoke/00/00
+++ b/tests/smoke/00/00
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed POGO peter << EOF
 xdump meta sect
 xdump meta ship
 xdump meta plane
@@ -50,4 +47,3 @@ xdump meta retreat-flags
 xdump meta ship-chr-flags
 xdump meta treaty-flags
 xdump meta country
-EOF
diff --git a/tests/smoke/00/01 b/tests/smoke/00/01
index 11be3028..163bcd8e 100644
--- a/tests/smoke/00/01
+++ b/tests/smoke/00/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 xdump sect 0,0
 break
 expl c 0,0 1 uh
@@ -52,4 +49,3 @@ des 0,-2 c
 capital 0,-2
 des 0,0 g
 thres d 0,0 1
-EOF
diff --git a/tests/smoke/00/02 b/tests/smoke/00/02
index 9fb9b9a5..60109f45 100644
--- a/tests/smoke/00/02
+++ b/tests/smoke/00/02
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 2 << EOF
 break
 expl c 0,0 1 uh
 desi 1,-1 +
@@ -56,4 +53,3 @@ xdump meta retreat-flags
 xdump meta ship-chr-flags
 xdump meta treaty-flags
 xdump meta country
-EOF
diff --git a/tests/smoke/00/03 b/tests/smoke/00/03
index 13b5cf52..05f14c65 100644
--- a/tests/smoke/00/03
+++ b/tests/smoke/00/03
@@ -1,10 +1,6 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 3 << EOF
 break
 expl c 0,0 1 uh
 desi 1,-1 +
 mov c 0,0 205 uh
 desi 1,-1 g
 cen *
-EOF
diff --git a/tests/smoke/00/04 b/tests/smoke/00/04
index 1741ae8e..05f14c65 100644
--- a/tests/smoke/00/04
+++ b/tests/smoke/00/04
@@ -1,10 +1,6 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 4 << EOF
 break
 expl c 0,0 1 uh
 desi 1,-1 +
 mov c 0,0 205 uh
 desi 1,-1 g
 cen *
-EOF
diff --git a/tests/smoke/00/05 b/tests/smoke/00/05
index 9b27206c..05f14c65 100644
--- a/tests/smoke/00/05
+++ b/tests/smoke/00/05
@@ -1,10 +1,6 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 5 << EOF
 break
 expl c 0,0 1 uh
 desi 1,-1 +
 mov c 0,0 205 uh
 desi 1,-1 g
 cen *
-EOF
diff --git a/tests/smoke/00/06 b/tests/smoke/00/06
index 2a12ff24..05f14c65 100644
--- a/tests/smoke/00/06
+++ b/tests/smoke/00/06
@@ -1,10 +1,6 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 6 << EOF
 break
 expl c 0,0 1 uh
 desi 1,-1 +
 mov c 0,0 205 uh
 desi 1,-1 g
 cen *
-EOF
diff --git a/tests/smoke/00/07 b/tests/smoke/00/07
index 5366bca3..05f14c65 100644
--- a/tests/smoke/00/07
+++ b/tests/smoke/00/07
@@ -1,10 +1,6 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 7 << EOF
 break
 expl c 0,0 1 uh
 desi 1,-1 +
 mov c 0,0 205 uh
 desi 1,-1 g
 cen *
-EOF
diff --git a/tests/smoke/00/08 b/tests/smoke/00/08
index 986c2f8a..05f14c65 100644
--- a/tests/smoke/00/08
+++ b/tests/smoke/00/08
@@ -1,10 +1,6 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
 break
 expl c 0,0 1 uh
 desi 1,-1 +
 mov c 0,0 205 uh
 desi 1,-1 g
 cen *
-EOF
diff --git a/tests/smoke/00/09 b/tests/smoke/00/09
index d91cc9a8..05f14c65 100644
--- a/tests/smoke/00/09
+++ b/tests/smoke/00/09
@@ -1,10 +1,6 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 9 << EOF
 break
 expl c 0,0 1 uh
 desi 1,-1 +
 mov c 0,0 205 uh
 desi 1,-1 g
 cen *
-EOF
diff --git a/tests/smoke/00/10 b/tests/smoke/00/10
index 09106e9d..05f14c65 100644
--- a/tests/smoke/00/10
+++ b/tests/smoke/00/10
@@ -1,10 +1,6 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 10 << EOF
 break
 expl c 0,0 1 uh
 desi 1,-1 +
 mov c 0,0 205 uh
 desi 1,-1 g
 cen *
-EOF
diff --git a/tests/smoke/01/01 b/tests/smoke/01/01
index 1c74624b..216e3da6 100644
--- a/tests/smoke/01/01
+++ b/tests/smoke/01/01
@@ -1,8 +1,4 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 real 0 -8:12,-4:4
 cen *
 map #
 read y
-EOF
diff --git a/tests/smoke/02/01 b/tests/smoke/02/01
index 9bac4333..6e86bc3c 100644
--- a/tests/smoke/02/01
+++ b/tests/smoke/02/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 desi -1,-1 b
 mov i 2,0 200 4,0
 mov i 1,-1 4 jh
@@ -16,4 +13,3 @@ dist # 5,-1
 thre h 4,0 1
 thre l 3,-1 1
 desi 5,-1 h
-EOF
diff --git a/tests/smoke/03/01 b/tests/smoke/03/01
index d8631e3f..4d559faf 100644
--- a/tests/smoke/03/01
+++ b/tests/smoke/03/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 cen *
 map #
 read y
@@ -28,4 +25,3 @@ thres d 4,-2 10
 thres d -1,-1 50
 thres c 1,1 768
 prod *
-EOF
diff --git a/tests/smoke/03/08 b/tests/smoke/03/08
index 491ef225..62c24d3a 100644
--- a/tests/smoke/03/08
+++ b/tests/smoke/03/08
@@ -1,10 +1,6 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
 cen *
 map #
 read y
 exp c 0,0 50 gyyygh
 des -7,-3 )
 lost *
-EOF
diff --git a/tests/smoke/04/01 b/tests/smoke/04/01
index 26a1e40c..36ca3d6b 100644
--- a/tests/smoke/04/01
+++ b/tests/smoke/04/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 cen *
 ship *
 map #
@@ -16,4 +13,3 @@ h
 assault 11,-1 0
 25
 prod *
-EOF
diff --git a/tests/smoke/04/08 b/tests/smoke/04/08
index 3e2496b8..a0adda1d 100644
--- a/tests/smoke/04/08
+++ b/tests/smoke/04/08
@@ -1,8 +1,4 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
 cen *
 map #
 read y
 lost *
-EOF
diff --git a/tests/smoke/05/01 b/tests/smoke/05/01
index 0bb6b922..d0c97746 100644
--- a/tests/smoke/05/01
+++ b/tests/smoke/05/01
@@ -1,10 +1,6 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 real 0 -8:16,-4:4
 cen *
 ship *
 map #
 read y
 prod *
-EOF
diff --git a/tests/smoke/06/01 b/tests/smoke/06/01
index 93eed5eb..4a00579b 100644
--- a/tests/smoke/06/01
+++ b/tests/smoke/06/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 real 1 -16:24,-8:8
 convert 11,-1 76
 thres c -2,2 769
@@ -34,4 +31,3 @@ ship *
 map #
 read y
 prod *
-EOF
diff --git a/tests/smoke/06/08 b/tests/smoke/06/08
index 9918af5f..b91dade0 100644
--- a/tests/smoke/06/08
+++ b/tests/smoke/06/08
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
 exp c 0,0 1 gh
 exp c 0,0 1 yh
 exp c 0,0 1 ygh
@@ -31,4 +28,3 @@ cen *
 map #
 read y
 prod *
-EOF
diff --git a/tests/smoke/07/01 b/tests/smoke/07/01
index 565d1a24..4144d7eb 100644
--- a/tests/smoke/07/01
+++ b/tests/smoke/07/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 build bridge 5,-1 j
 explore c 5,-1 1 jh
 mov c 5,-1 76 7,-1
@@ -30,4 +27,3 @@ ship *
 map #
 read y
 prod *
-EOF
diff --git a/tests/smoke/07/08 b/tests/smoke/07/08
index 40ee9d84..5a3a495e 100644
--- a/tests/smoke/07/08
+++ b/tests/smoke/07/08
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
 des 7,-1 c
 capital 7,-1
 des * ?gold>1 g
@@ -28,4 +25,3 @@ cen *
 map #
 read y
 prod *
-EOF
diff --git a/tests/smoke/08/01 b/tests/smoke/08/01
index ff44a87f..962b9e43 100644
--- a/tests/smoke/08/01
+++ b/tests/smoke/08/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 des 0,2 m
 deliver i 0,2 0 j
 thres d 0,2 0
@@ -29,4 +26,3 @@ ship *
 map #
 read y
 prod *
-EOF
diff --git a/tests/smoke/08/08 b/tests/smoke/08/08
index 4d5a7dd5..8d9ec31a 100644
--- a/tests/smoke/08/08
+++ b/tests/smoke/08/08
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
 thres c -3:-1,-1 769
 des 0:2,0 m
 thres i 0:2,0 1
@@ -9,4 +6,3 @@ cen *
 map #
 read y
 prod *
-EOF
diff --git a/tests/smoke/09/01 b/tests/smoke/09/01
index 9de05987..7ff3a457 100644
--- a/tests/smoke/09/01
+++ b/tests/smoke/09/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 mov u 2,0 10 7,-1
 des -2,2 i
 thres l -2,2 600
@@ -16,4 +13,3 @@ ship *
 map #
 read y
 prod *
-EOF
diff --git a/tests/smoke/09/08 b/tests/smoke/09/08
index f6c4a123..41b8511f 100644
--- a/tests/smoke/09/08
+++ b/tests/smoke/09/08
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
 thres d 1,-1 0
 mov d 1,-1 1 4,0
 des 3,-1 m
@@ -21,4 +18,3 @@ cen *
 map #
 read y
 prod *
-EOF
diff --git a/tests/smoke/10/01 b/tests/smoke/10/01
index 691582e6..68d33d7d 100644
--- a/tests/smoke/10/01
+++ b/tests/smoke/10/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 mov h 5,-1 100 7,-1
 build bridge 7,-1 j
 explore c 7,-1 1 jh
@@ -51,4 +48,3 @@ ship *
 map #
 read y
 prod *
-EOF
diff --git a/tests/smoke/10/08 b/tests/smoke/10/08
index d2487f52..53ee1105 100644
--- a/tests/smoke/10/08
+++ b/tests/smoke/10/08
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
 des -3,-1 j
 thres i -3,-1 999
 thres l -3,-1 1
@@ -15,4 +12,3 @@ cen *
 map #
 read y
 prod *
-EOF
diff --git a/tests/smoke/11/01 b/tests/smoke/11/01
index f64732b3..1f42ff79 100644
--- a/tests/smoke/11/01
+++ b/tests/smoke/11/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 thres l 6,-2 300
 thres l 5,-1 200
 thres h 5,-1 200
@@ -15,4 +12,3 @@ ship *
 map #
 read y
 prod *
-EOF
diff --git a/tests/smoke/11/08 b/tests/smoke/11/08
index 18aec92f..fc17af96 100644
--- a/tests/smoke/11/08
+++ b/tests/smoke/11/08
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
 des -1,-1 m
 thres i -1,-1 1
 thres d -1,-1 0
@@ -24,4 +21,3 @@ cen *
 map #
 read y
 prod *
-EOF
diff --git a/tests/smoke/12/01 b/tests/smoke/12/01
index 05e62447..58c21062 100644
--- a/tests/smoke/12/01
+++ b/tests/smoke/12/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 build l 10,2 cav 5
 build sh 5,-1 cs 3
 thres m 10,2 25
@@ -13,4 +10,3 @@ land *
 map #
 read y
 prod *
-EOF
diff --git a/tests/smoke/12/08 b/tests/smoke/12/08
index fea65f13..0f5d99f0 100644
--- a/tests/smoke/12/08
+++ b/tests/smoke/12/08
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
 des 6,-2 t
 des 6,0 h
 thres d 6,0 0
@@ -18,4 +15,3 @@ cen *
 map #
 read y
 prod *
-EOF
diff --git a/tests/smoke/13/01 b/tests/smoke/13/01
index d1c3fa35..46f1e89d 100644
--- a/tests/smoke/13/01
+++ b/tests/smoke/13/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 des -2,-2 j
 thres l -2,-2 1
 des -4,-2 k
@@ -59,4 +56,3 @@ land *
 map #
 read y
 prod *
-EOF
diff --git a/tests/smoke/13/02 b/tests/smoke/13/02
index 07c26b50..5f738b11 100644
--- a/tests/smoke/13/02
+++ b/tests/smoke/13/02
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 2 << EOF
 explore c 2,0  1 uh
 explore c 2,0  1 jh
 explore c 2,0  1 bh
@@ -90,4 +87,3 @@ cen *
 map #
 read y
 prod *
-EOF
diff --git a/tests/smoke/13/08 b/tests/smoke/13/08
index 319450c5..7bc22c26 100644
--- a/tests/smoke/13/08
+++ b/tests/smoke/13/08
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
 thres c -2,0 769
 thres c 1,1 769
 thres c 5,-1 769
@@ -20,4 +17,3 @@ cen *
 map #
 read y
 prod *
-EOF
diff --git a/tests/smoke/14/01 b/tests/smoke/14/01
index 0c577c71..141677dd 100644
--- a/tests/smoke/14/01
+++ b/tests/smoke/14/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 lload m 4/5 5
 lload s 5 200
 lload g 5 20
@@ -27,4 +24,3 @@ plane *
 map #
 read y
 prod *
-EOF
diff --git a/tests/smoke/14/02 b/tests/smoke/14/02
index 27cd4a17..dac7a05f 100644
--- a/tests/smoke/14/02
+++ b/tests/smoke/14/02
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 2 << EOF
 des 0:2,0 m
 thres i 0:2,0 1
 thres i -5,-1 999
@@ -22,4 +19,3 @@ cen *
 map #
 read y
 prod *
-EOF
diff --git a/tests/smoke/14/08 b/tests/smoke/14/08
index c4aafd71..65f743af 100644
--- a/tests/smoke/14/08
+++ b/tests/smoke/14/08
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
 thres c * 769
 thres i -2:0,-2 1
 des -2:0,-2 m
@@ -17,4 +14,3 @@ cen *
 map #
 read y
 prod *
-EOF
diff --git a/tests/smoke/15/01 b/tests/smoke/15/01
index 69560fad..4569d87b 100644
--- a/tests/smoke/15/01
+++ b/tests/smoke/15/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 build p 11,-1 f1 3
 thres s 11,-1 200
 thres p 11,-1 200
@@ -23,4 +20,3 @@ plane *
 map #
 read y
 prod *
-EOF
diff --git a/tests/smoke/15/02 b/tests/smoke/15/02
index af0204a8..26ac4b5d 100644
--- a/tests/smoke/15/02
+++ b/tests/smoke/15/02
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 2 << EOF
 des -5,-1 j
 thres l -5,-1 1
 thres l 3,-1 300
@@ -12,4 +9,3 @@ cen *
 map #
 read y
 prod *
-EOF
diff --git a/tests/smoke/15/08 b/tests/smoke/15/08
index 001b5eee..51547c04 100644
--- a/tests/smoke/15/08
+++ b/tests/smoke/15/08
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
 des 5,-1 d
 thres g 5,-1 1
 des -6,-4 f
@@ -30,4 +27,3 @@ cen *
 map #
 read y
 prod *
-EOF
diff --git a/tests/smoke/16/01 b/tests/smoke/16/01
index ca98b4d5..4155d398 100644
--- a/tests/smoke/16/01
+++ b/tests/smoke/16/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 mov c 1,-1 230 jjh
 mov c 3,-1 230 jh
 mov c 2,-2 230 njh
@@ -34,4 +31,3 @@ plane *
 map #
 read y
 prod *
-EOF
diff --git a/tests/smoke/16/02 b/tests/smoke/16/02
index 73ebd39f..c32cf963 100644
--- a/tests/smoke/16/02
+++ b/tests/smoke/16/02
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 2 << EOF
 des 3,-1 l
 thres d 3,-1 0
 des 5,-1 k
@@ -17,4 +14,3 @@ cen *
 map #
 read y
 prod *
-EOF
diff --git a/tests/smoke/16/08 b/tests/smoke/16/08
index 593352f5..4435ba61 100644
--- a/tests/smoke/16/08
+++ b/tests/smoke/16/08
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
 des -4,-4 o
 thres o -4,-4 1
 thres o -5,-3 0
@@ -9,4 +6,3 @@ cen *
 map #
 read y
 prod *
-EOF
diff --git a/tests/smoke/99/00 b/tests/smoke/99/00
index c841d75c..e74905b0 100644
--- a/tests/smoke/99/00
+++ b/tests/smoke/99/00
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed POGO peter << EOF
 xdump sect 0,0
 xdump ship *
 xdump plane *
@@ -50,4 +47,3 @@ xdump retreat-flags *
 xdump ship-chr-flags *
 xdump treaty-flags *
 xdump country *
-EOF
diff --git a/tests/smoke/99/01 b/tests/smoke/99/01
index 1a9306c1..b37a931b 100644
--- a/tests/smoke/99/01
+++ b/tests/smoke/99/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 1 << EOF
 xdump sect 0,0
 xdump ship *
 xdump plane *
@@ -50,4 +47,3 @@ xdump retreat-flags *
 xdump ship-chr-flags *
 xdump treaty-flags *
 xdump country *
-EOF