diff --git a/testsuite/expect/inc3.11.1 b/testsuite/expect/inc3.11.1
index 9be167a39c70e69dd5a18f2e89d1c85a322af41d..3e7ff84ccd77d9e6a5ad74a0e0e6420653caee8d 100644
--- a/testsuite/expect/inc3.11.1
+++ b/testsuite/expect/inc3.11.1
@@ -1,6 +1,35 @@
-#!/usr/bin/expect
-
-
+############################################################################
+# Purpose: Test of SLURM functionality
+# to be called from test3.11
+# Make a list of lists with a series of parameters to test.
+# All the tests in goodtests should pass, all those in badtests
+# should fail.
+#
+############################################################################
+# Copyright (C) 2009 Lawrence Livermore National Security
+# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+# Written by Dave Bremer <dbremer@llnl.gov>
+# CODE-OCEC-09-009. All rights reserved.
+#
+#
+# This file is part of SLURM, a resource management program.
+# For details, see <http://www.schedmd.com/slurmdocs/>.
+# Please also read the included file: DISCLAIMER.
+#
+# SLURM 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 of the License, or (at your option)
+# any later version.
+#
+# SLURM 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 SLURM; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+############################################################################
proc inc3_11_1 {} {
global def_node user_name def_partition exit_code res_name
diff --git a/testsuite/expect/inc3.11.2 b/testsuite/expect/inc3.11.2
index 45fa88c76af3ba6b1eaf0c27d01937115d8dde08..130a0da5ff61b208bbb3ce2da39a7c4e09c9d085 100644
--- a/testsuite/expect/inc3.11.2
+++ b/testsuite/expect/inc3.11.2
@@ -1,5 +1,33 @@
-#!/usr/bin/expect
-
+############################################################################
+# Purpose: Test of SLURM functionality
+# to be called from test3.11
+# Create a reservation and update it in various ways
+#
+############################################################################
+# Copyright (C) 2009 Lawrence Livermore National Security
+# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+# Written by Dave Bremer <dbremer@llnl.gov>
+# CODE-OCEC-09-009. All rights reserved.
+#
+#
+# This file is part of SLURM, a resource management program.
+# For details, see <http://www.schedmd.com/slurmdocs/>.
+# Please also read the included file: DISCLAIMER.
+#
+# SLURM 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 of the License, or (at your option)
+# any later version.
+#
+# SLURM 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 SLURM; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+############################################################################
proc inc3_11_2 {} {
global def_node user_name def_partition exit_code res_name
diff --git a/testsuite/expect/inc3.11.3 b/testsuite/expect/inc3.11.3
index 49de36f66365c80ec692d2afd0d64b33d8c2733d..35f1c3e67bd5cb735e577abd579e17b02bb84bc1 100644
--- a/testsuite/expect/inc3.11.3
+++ b/testsuite/expect/inc3.11.3
@@ -1,5 +1,34 @@
-#!/usr/bin/expect
-
+############################################################################
+# Purpose: Test of SLURM functionality
+# to be called from test3.11
+# Make a reservation, submit a job to it, confirm that the
+# job is paired with the reservation.
+#
+############################################################################
+# Copyright (C) 2009 Lawrence Livermore National Security
+# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+# Written by Dave Bremer <dbremer@llnl.gov>
+# CODE-OCEC-09-009. All rights reserved.
+#
+#
+# This file is part of SLURM, a resource management program.
+# For details, see <http://www.schedmd.com/slurmdocs/>.
+# Please also read the included file: DISCLAIMER.
+#
+# SLURM 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 of the License, or (at your option)
+# any later version.
+#
+# SLURM 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 SLURM; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+############################################################################
proc inc3_11_3 {} {
global user_name exit_code res_name
@@ -7,9 +36,7 @@ proc inc3_11_3 {} {
global alpha_numeric_under scancel
# TEST 3
- # Make a reservation, submit a job to it, confirm that the job is paired
- # with the reservation.
- #
+
send_user "\n+++++ STARTING TEST 3 +++++\n"
# Make the reservation
set ret_code [create_res "StartTime=now+60minutes Duration=60 NodeCnt=1 User=$user_name" 0]
diff --git a/testsuite/expect/inc3.11.4 b/testsuite/expect/inc3.11.4
index 09fcedd1953605654350ad1c2e13346531ab1823..9840c33c55d269aef4ebb14dd34afd588e4a85bd 100644
--- a/testsuite/expect/inc3.11.4
+++ b/testsuite/expect/inc3.11.4
@@ -1,3 +1,34 @@
+############################################################################
+# Purpose: Test of SLURM functionality
+# to be called from test3.11
+# If not running as root, make a reservation restricted to root,
+# submit a job, and confirm that the job is rejected.
+#
+############################################################################
+# Copyright (C) 2009 Lawrence Livermore National Security
+# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+# Written by Dave Bremer <dbremer@llnl.gov>
+# CODE-OCEC-09-009. All rights reserved.
+#
+#
+# This file is part of SLURM, a resource management program.
+# For details, see <http://www.schedmd.com/slurmdocs/>.
+# Please also read the included file: DISCLAIMER.
+#
+# SLURM 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 of the License, or (at your option)
+# any later version.
+#
+# SLURM 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 SLURM; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+############################################################################
proc inc3_11_4 {} {
global user_name exit_code res_name
diff --git a/testsuite/expect/inc3.11.5 b/testsuite/expect/inc3.11.5
index 498c2b2bbf1865482fb66d6dfc56f9c0b02f9071..8f2b88c833fb5fe06045a1ffe89f3a1066985079 100644
--- a/testsuite/expect/inc3.11.5
+++ b/testsuite/expect/inc3.11.5
@@ -1,6 +1,33 @@
-#!/usr/bin/expect
-
-
+############################################################################
+# Purpose: Test of SLURM functionality
+# to be called from test3.11
+# Test node reservation conflict
+#
+############################################################################
+# Copyright (C) 2009 Lawrence Livermore National Security
+# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+# Written by Dave Bremer <dbremer@llnl.gov>
+# CODE-OCEC-09-009. All rights reserved.
+#
+#
+# This file is part of SLURM, a resource management program.
+# For details, see <http://www.schedmd.com/slurmdocs/>.
+# Please also read the included file: DISCLAIMER.
+#
+# SLURM 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 of the License, or (at your option)
+# any later version.
+#
+# SLURM 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 SLURM; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+############################################################################
proc inc3_11_5 {} {
global user_name exit_code res_name
diff --git a/testsuite/expect/inc3.11.6 b/testsuite/expect/inc3.11.6
index 8e3f3b179a9370e045832ff36e1ad3aeaa9008a0..18a861c4ad013282b6f0c8aa6862fe3c463a7f4c 100644
--- a/testsuite/expect/inc3.11.6
+++ b/testsuite/expect/inc3.11.6
@@ -1,6 +1,33 @@
-#!/usr/bin/expect
-
-
+############################################################################
+# Purpose: Test of SLURM functionality
+# to be called from test3.11
+# Test time reservation conflict
+#
+############################################################################
+# Copyright (C) 2009 Lawrence Livermore National Security
+# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+# Written by Dave Bremer <dbremer@llnl.gov>
+# CODE-OCEC-09-009. All rights reserved.
+#
+#
+# This file is part of SLURM, a resource management program.
+# For details, see <http://www.schedmd.com/slurmdocs/>.
+# Please also read the included file: DISCLAIMER.
+#
+# SLURM 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 of the License, or (at your option)
+# any later version.
+#
+# SLURM 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 SLURM; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+############################################################################
proc inc3_11_6 {} {
global user_name exit_code res_name file_in bin_rm