diff --git a/tests/Makefile.am b/tests/Makefile.am
line changes: +19/-19
index eed1172..9f938cb
--- a/tests/Makefile.am
+++ b/tests/Makefile.am

@@ -1,23 +1,23 @@
-## Process this file with automake to produce Makefile.in.
-## Makefile for hello/tests.
-##
-## Copyright (C) 1996, 2005 Free Software Foundation, Inc.
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Process this file with automake to produce Makefile.in.
+# Makefile for hello/tests.
+#
+# Copyright (C) 1996, 2005, 2006 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-TESTS = hello-1 world-1 nothing-1
+TESTS = greeting-1 hello-1 traditional-1
 
 EXTRA_DIST = $(TESTS)
 

diff --git a/tests/greeting-1 b/tests/greeting-1
line changes: +33/-0
index 0000000..b1849bc
--- /dev/null
+++ b/tests/greeting-1

@@ -0,0 +1,33 @@
+#! /bin/sh
+# Test arbitrary --greeting.
+# 
+# Copyright (C) 2001, 2006 Free Software Foundation, Inc.  
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
+
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+LANGUAGE=
+LC_ALL=
+LC_MESSAGES=
+LANG=
+export LANGUAGE LC_ALL LC_MESSAGES LANG
+
+tmpfiles="greeting-test1.ok"
+cat <<EOF > greeting-test1.ok
+Nothing happens here.
+EOF
+
+tmpfiles="$tmpfiles greeting-test1.out"
+: ${HELLO=hello}
+${HELLO} -g 'Nothing happens here.' > greeting-test1.out
+
+: ${DIFF=diff}
+${DIFF} greeting-test1.ok greeting-test1.out
+result=$?
+
+rm -f $tmpfiles
+
+exit $result

diff --git a/tests/hello-1 b/tests/hello-1
line changes: +7/-6
index a529ca6..5b56e0e
--- a/tests/hello-1
+++ b/tests/hello-1

@@ -1,4 +1,11 @@
 #! /bin/sh
+# Test standard GNU greeting.
+# 
+# Copyright (C) 2001, 2006 Free Software Foundation, Inc.  
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
 # This script takes one argument.
 
 trap 'rm -fr $tmpfiles' 1 2 3 15

@@ -18,10 +25,6 @@ tmpfiles="$tmpfiles hello-test1.out"
 : ${HELLO=hello}
 ${HELLO} > hello-test1.out
 
-# $HELLO > test.out
-# $HELLO sailor >> test.out
-# $HELLO --traditional >> test.out
-
 : ${DIFF=diff}
 ${DIFF} hello-test1.ok hello-test1.out
 result=$?

@@ -29,5 +32,3 @@ result=$?
 rm -f $tmpfiles
 
 exit $result
-
-# hello ends here

diff --git a/tests/nothing-1 b/tests/nothing-1
line changes: +0/-31
index c64923c..0000000
--- a/tests/nothing-1
+++ /dev/null

@@ -1,31 +0,0 @@
-#! /bin/sh
-# This script takes one argument.
-
-trap 'rm -fr $tmpfiles' 1 2 3 15
-
-LANGUAGE=
-LC_ALL=
-LC_MESSAGES=
-LANG=
-export LANGUAGE LC_ALL LC_MESSAGES LANG
-
-tmpfiles="hello-test2.ok"
-cat <<EOF > hello-test2.ok
-Nothing happens here.
-EOF
-
-tmpfiles="$tmpfiles hello-test2.out"
-: ${HELLO=hello}
-${HELLO} sailor > hello-test2.out
-
-# $HELLO > test.out
-# $HELLO sailor >> test.out
-# $HELLO --traditional >> test.out
-
-: ${DIFF=diff}
-${DIFF} hello-test2.ok hello-test2.out
-result=$?
-
-rm -f $tmpfiles
-
-exit $result

diff --git a/tests/traditional-1 b/tests/traditional-1
line changes: +33/-0
index 0000000..87b5398
--- /dev/null
+++ b/tests/traditional-1

@@ -0,0 +1,33 @@
+#! /bin/sh
+# Test traditional greeting.
+# 
+# Copyright (C) 2001, 2006 Free Software Foundation, Inc.  
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
+
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+LANGUAGE=
+LC_ALL=
+LC_MESSAGES=
+LANG=
+export LANGUAGE LC_ALL LC_MESSAGES LANG
+
+tmpfiles="traditional-test1.ok"
+cat <<EOF > traditional-test1.ok
+hello, world
+EOF
+
+tmpfiles="$tmpfiles traditional-test1.out"
+: ${HELLO=hello}
+${HELLO} --traditional > traditional-test1.out
+
+: ${DIFF=diff}
+${DIFF} traditional-test1.ok traditional-test1.out
+result=$?
+
+rm -f $tmpfiles
+
+exit $result

diff --git a/tests/world-1 b/tests/world-1
line changes: +0/-33
index 03b1552..0000000
--- a/tests/world-1
+++ /dev/null

@@ -1,33 +0,0 @@
-#! /bin/sh
-# This script takes one argument.
-
-trap 'rm -fr $tmpfiles' 1 2 3 15
-
-LANGUAGE=
-LC_ALL=
-LC_MESSAGES=
-LANG=
-export LANGUAGE LC_ALL LC_MESSAGES LANG
-
-tmpfiles="hello-test3.ok"
-cat <<EOF > hello-test3.ok
-hello, world
-EOF
-
-tmpfiles="$tmpfiles hello-test3.out"
-: ${HELLO=hello}
-${HELLO} --traditional > hello-test3.out
-
-# $HELLO > test.out
-# $HELLO sailor >> test.out
-# $HELLO --traditional >> test.out
-
-: ${DIFF=diff}
-${DIFF} hello-test3.ok hello-test3.out
-result=$?
-
-rm -f $tmpfiles
-
-exit $result
-
-# hello ends here