diff --git a/shell.x b/shell.x
deleted file mode 100644
index 0ef6ab5..0000000
--- a/shell.x
+++ /dev/null
@@ -1,39 +0,0 @@
-Format_Index: l,d,y,a,d,p
-#!/bin/sh
-# SPDX-License-Identifier: %s
-#
-# %s
-
-me=$0
-scriptversion="1.0.0"
-
-version="$me $scriptversion
-
-Copyright (C) %d %s
-This is free software; you are free to change and redistribute it.
-There is NO WARRANTY, to  the textent permitted by law."
-
-usage="\
-Usage: $me [OPTION]...
-%s
-
-Options:
-
-   --help     print this help and exit
-   --version  output version information"
-
-while [ $# -gt 0 ]; do
-  case $1 in
-    --help) echo "$usage"; exit 0;;
-    --version) echo "$version"; exit 0;;
-    -*)
-      echo "$0: Unknown option '$1'." >&2
-      echo "$0: Try '--help' for more information." >&2
-      exit 1 ;;
-  esac
-  shift
-done
-
-echo "$0: done."
-
-# End: %s
diff --git a/t/shell.x b/t/shell.x
index af2d7f3..0ef6ab5 100644
--- a/t/shell.x
+++ b/t/shell.x
@@ -1,14 +1,17 @@
-Format_Index: l, y, a, d
+Format_Index: l,d,y,a,d,p
 #!/bin/sh
 # SPDX-License-Identifier: %s
+#
+# %s
+
 me=$0
 scriptversion="1.0.0"
 
 version="$me $scriptversion
 
-Copyright (C) %d %s.
+Copyright (C) %d %s
 This is free software; you are free to change and redistribute it.
-There is NO WARRANTY, to the extent permitted by law."
+There is NO WARRANTY, to  the textent permitted by law."
 
 usage="\
 Usage: $me [OPTION]...
@@ -19,14 +22,18 @@ Options:
    --help     print this help and exit
    --version  output version information"
 
-while test $# -gt 0; do
+while [ $# -gt 0 ]; do
   case $1 in
     --help) echo "$usage"; exit 0;;
     --version) echo "$version"; exit 0;;
     -*)
-     echo "$0: Unknown option '$1'." >&2
-     echo "$0: Try '--help' for more information." >&2
-     exit 1;;
+      echo "$0: Unknown option '$1'." >&2
+      echo "$0: Try '--help' for more information." >&2
+      exit 1 ;;
   esac
   shift
 done
+
+echo "$0: done."
+
+# End: %s