diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 796668122..32758665f 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -20,6 +20,9 @@
 	for the first line indent; (start_paragraph): remove leader
 	handling; (end_paragraph): Handle all formatting, including leader
 	and first line indent.
+	* src/plugins/Checkpoint.py (rcs): Do not write comment on
+	initialization.
+	* test/tools.sh: Add test set for tools.
 
 2005-11-22  Don Allingham  <don@gramps-project.org>
 	* src/docgen/AbiWord2Doc.py: fix spacing for top and bottom margin
diff --git a/gramps2/src/plugins/Checkpoint.py b/gramps2/src/plugins/Checkpoint.py
index c789b900f..a4e36bfe3 100644
--- a/gramps2/src/plugins/Checkpoint.py
+++ b/gramps2/src/plugins/Checkpoint.py
@@ -309,7 +309,6 @@ class Checkpoint(Tool.Tool):
             proc = popen2.Popen3(
                 'rcs -i -U -q -t-"GRAMPS database" %s' % archive,
                 True)
-            proc.tochild.write(comment)
             proc.tochild.close()
             status = proc.wait()
             message = "\n".join(proc.childerr.readlines())
diff --git a/gramps2/test/.cvsignore b/gramps2/test/.cvsignore
index fe2e5865d..966e0ca5a 100644
--- a/gramps2/test/.cvsignore
+++ b/gramps2/test/.cvsignore
@@ -1,2 +1,3 @@
 data
 reports
+tools
diff --git a/gramps2/test/tools.sh b/gramps2/test/tools.sh
new file mode 100755
index 000000000..9d6d63406
--- /dev/null
+++ b/gramps2/test/tools.sh
@@ -0,0 +1,51 @@
+#! /bin/sh
+#
+# Tool test for GRAMPS: Run tools with the default options.
+#
+# The results of this test set depend on what options were used
+# previously with the tools, because this test set is not
+# specifying all possible options and their combinations. 
+# Instead, this is a general test for all tools.
+
+# $Id$
+
+TOP_DIR=`dirname $PWD`
+TEST_DIR=$TOP_DIR/test
+SRC_DIR=$TOP_DIR/src
+PRG="python gramps.py"
+EXAMPLE_XML=$TOP_DIR/example/gramps/example.gramps
+
+TOOL_DIR=$TEST_DIR/tools
+mkdir -p $TOOL_DIR
+
+OPTS="-i $EXAMPLE_XML"
+
+TOOLS1="reorder_ids verify chkpoint rebuild dgenstats check"
+TOOLS2="chtype cmdref testcasegenerator"
+
+# Run all tools on the example data, check at the end
+echo ""
+echo "+--------------------------------------------------------------"
+echo "| Tools: chtype cmdref $TOOLS1"
+echo "+--------------------------------------------------------------"
+action=
+action="$action -a tool -p name=chtype,fromtype=Burial,totype=WeirdType"
+action="$action -a tool -p name=cmdref,include=1,target=$TOOL_DIR/junk.xml"
+for tool in $TOOLS1; do
+    action="$action -a tool -p name=$tool"
+done
+(cd $SRC_DIR; $PRG $OPTS $action)
+
+# Run random test generator on an empty db, preserve the result.
+echo ""
+echo "+--------------------------------------------------------------"
+echo "| Tool: testcasegenerator"
+echo "+--------------------------------------------------------------"
+TEST_DATA=$TOOL_DIR/junk.grdb
+if [ -f $TEST_DATA ]; then
+    rm $TEST_DATA
+fi
+touch $TEST_DATA
+OPTS="-O $TEST_DATA"
+action="-a tool -p name=testcasegenerator"
+(cd $SRC_DIR; $PRG $OPTS $action)