diff --git a/www/sec-check/GNUmakefile.in b/www/sec-check/GNUmakefile.in
index 9352716e5d0c0e7227fc983017280482235ae8a0..bf88483983a69bd56e5b06346b5afb258ec6e756 100644
--- a/www/sec-check/GNUmakefile.in
+++ b/www/sec-check/GNUmakefile.in
@@ -16,6 +16,8 @@ all: $(all_tasks)
 msgs: $(msgs_tasks)
 
 SRCDIR		= @srcdir@
+RESDIR		= $(SRCDIR)/results
+
 TESTBED_SRCDIR	= @top_srcdir@
 
 OBJDIR		= ../..
@@ -32,9 +34,9 @@ OURDOMAIN       = @OURDOMAIN@
 src_forms: src_list src_msg
 
 # All of the forms lines.
-SRC_FORMS	= $(SRCDIR)/src_forms.list
+SRC_FORMS	= $(RESDIR)/src_forms.list
 # Just the files list.
-SRC_FILES	= $(SRCDIR)/src_files.list
+SRC_FILES	= $(RESDIR)/src_files.list
 src_list: $(SRC_FORMS) $(SRC_FILES)
 $(SRC_FORMS):
 	# Ignore any Emacs backup files with tilde's in the filenames.
@@ -89,7 +91,7 @@ login_user = wget -S -dv $(cookie_args) $(sv_cookies) \
 	--post-data "uid=$(1)&password=$(2)&login=Login" \
 	$(sroot)/login.php3
 login_sys := $(call login_user,$(uid),$(pswd))
-login:
+login: logout
 	$(login_sys)
 
 # Log in above, then use this to toggle the admin bit on.
@@ -266,10 +268,10 @@ exp_common =  $(call fmt_html_args,\
 	    formfields[exp_localnsfile]=/users/$(USER)/shaped-2-nodes.ns\
 	    formfields[exp_swappable]=1\
 	    formfields[exp_noswap_reason]=\
-	    formfields[exp_idleswap]=1\
+	    formfields[exp_idleswap]=0\
 	    formfields[exp_idleswap_timeout]=4\
-	    formfields[exp_noidleswap_reason]=\
-	    formfields[exp_autoswap]=1\
+	    formfields[exp_noidleswap_reason]=Because\
+	    formfields[exp_autoswap]=0\
 	    formfields[exp_autoswap_timeout]=16\
 	    formfields[exp_linktest]=3)
 exp1 = testexp1
@@ -287,6 +289,8 @@ new_exp2:
 	    -p $(EinE_proj) -e $(exp2) shaped-2-nodes.ns'
 
 # Modify an experiment (first time creates an archive.)
+### XXX This fails at first: "You cannot modify an experiment in transition."
+### XXX Try again.  Gotta figure out how to wait until it's done with the swapin.
 mod_exp2:
 	$(call wget_post,,modifyexp.php3,modexp2.html,\
 	    pid=$(EinE_proj) eid=$(exp2) go=1\
@@ -355,8 +359,8 @@ admin.wget/admin.log:
 	du -s admin.wget
 
 # Extract a list of the active forms in the site.
-SITE_FORMS	= $(SRCDIR)/site_forms.list
-SITE_FILES	= $(SRCDIR)/site_files.list
+SITE_FORMS	= $(RESDIR)/site_forms.list
+SITE_FILES	= $(RESDIR)/site_files.list
 site_list: $(SITE_FORMS) $(SITE_FILES)
 
 # Ignore flyspray and Twiki for now.
@@ -370,16 +374,16 @@ FORMS_CMD = find . \( -name distributions -prune \) \
 # Kill suffix after filename first: .../archive_view.php3/9/trunk?exptidx=9
 FILES_CMD = sed -e 's|\(php3*\).*|\1|' -e 's|^[^:]*/||' 
 
-PUBLIC_FORMS	= $(SRCDIR)/public_forms.list
-PUBLIC_FILES	= $(SRCDIR)/public_files.list
+PUBLIC_FORMS	= $(RESDIR)/public_forms.list
+PUBLIC_FILES	= $(RESDIR)/public_files.list
 public_list: $(PUBLIC_FORMS) $(PUBLIC_FILES)
 $(PUBLIC_FORMS): public.wget/public.log
 	(cd public.wget; $(FORMS_CMD) > $(PUBLIC_FORMS)
 $(PUBLIC_FILES): $(PUBLIC_FORMS)
 	$(FILES_CMD) $(PUBLIC_FORMS) | uniq > $(PUBLIC_FILES)
 
-ADMIN_FORMS	= $(SRCDIR)/admin_forms.list
-ADMIN_FILES	= $(SRCDIR)/admin_files.list
+ADMIN_FORMS	= $(RESDIR)/admin_forms.list
+ADMIN_FILES	= $(RESDIR)/admin_files.list
 admin_list: $(ADMIN_FORMS) $(ADMIN_FILES)
 $(ADMIN_FORMS): admin.wget/admin.log
 	(cd admin.wget; $(FORMS_CMD) > $(ADMIN_FORMS)
@@ -406,7 +410,7 @@ site_msg: site_list public_list admin_list
 .PHONY:         files_missing forms_msg
 forms_coverage: files_missing forms_msg
 
-FILES_MISSING = $(SRCDIR)/files_missing.list
+FILES_MISSING = $(RESDIR)/files_missing.list
 files_missing: $(FILES_MISSING)
 $(FILES_MISSING): $(SRC_FILES) $(SITE_FILES)
 	diff $(SRC_FILES) $(SITE_FILES) | grep '^[<>]' > $(FILES_MISSING)
@@ -423,11 +427,11 @@ forms_msg: files_missing src_msg site_msg
 .PHONY:         input_list input_msg
 input_coverage: input_list input_msg
 
-SITE_INPUTS     = $(SRCDIR)/site_inputs.list
-INPUT_NAMES	= $(SRCDIR)/input_names.list
+SITE_INPUTS     = $(RESDIR)/site_inputs.list
+INPUT_NAMES	= $(RESDIR)/input_names.list
 input_list: $(SITE_INPUTS) $(INPUT_NAMES)
-PUBLIC_INPUTS   = $(SRCDIR)/public_inputs.list
-ADMIN_INPUTS    = $(SRCDIR)/admin_inputs.list
+PUBLIC_INPUTS   = $(RESDIR)/public_inputs.list
+ADMIN_INPUTS    = $(RESDIR)/admin_inputs.list
 $(SITE_INPUTS): $(PUBLIC_INPUTS) $(ADMIN_INPUTS)
 	cat $(PUBLIC_INPUTS) $(ADMIN_INPUTS) > $(SITE_INPUTS)
 
@@ -435,8 +439,8 @@ $(SITE_INPUTS): $(PUBLIC_INPUTS) $(ADMIN_INPUTS)
 # Output sections terminated by a blank line contain: filename, <form, <input* .
 # Canonicalize and reorder: <input type="..." name="..." value=... ...>
 # INPUTS_CMD is parameterized by dir:={public,admin}
-DIR_FORMS 	= $(SRCDIR)/$(dir)_forms.list
-DIR_INPUTS	= $(SRCDIR)/$(dir)_inputs.list
+DIR_FORMS 	= $(RESDIR)/$(dir)_forms.list
+DIR_INPUTS	= $(RESDIR)/$(dir)_inputs.list
 # This awk command gets a long list of forms file names on the command line.
 INPUTS_CMD = @echo "form-inputs from $(dir)_forms.list files to $(dir)_inputs.list"; \
 	(cd $(dir).wget && gawk -f ../$(SRCDIR)/form-input.gawk \
@@ -451,9 +455,9 @@ ADMIN_INPUTS_CMD := $(INPUTS_CMD)
 $(ADMIN_INPUTS): $(ADMIN_FORMS) $(SRCDIR)/form-input.gawk
 	$(ADMIN_INPUTS_CMD)
 
-# Get unique input field names: text, textarea, hidden, checkbox, and select.
+# Get unique input field names: text(area), hidden, checkbox, select, radio/checked.
 $(INPUT_NAMES): $(SITE_INPUTS)
-	awk '/type="text/ || /type="hidden"/ || /type="checkbox"/ || /type="select"/ \
+	gawk '/type="(text|hidden|checkbox|select)/ || /\<checked\>/ \
 	    {print $$3}' $(SITE_INPUTS) | sort -u > $(INPUT_NAMES)
 
 input_msg: input_list
@@ -461,7 +465,7 @@ input_msg: input_list
 	      "`wc -l < $(INPUT_NAMES)` unique.  **" | tr -s " "
 
 # Copy input_names.list to input_values.list at first, 
-# then Edit default values onto the lines for auto-form-fill-in.
+# then edit default values onto the lines for auto-form-fill-in.
 INPUT_VALUES	= $(SRCDIR)/input_values.list
 
 #================================================================
@@ -477,28 +481,28 @@ run_tasks = run_setup run_normal run_teardown
 gen_all: $(gen_tasks)
 run_all: $(run_tasks)
 
-NORMAL_URLS	= $(SRCDIR)/site_normal.urls
-NORMAL_WGET	= $(SRCDIR)/normal_cases.wget
-NORMAL_CASES	= $(SRCDIR)/normal_cases.xml
+NORMAL_URLS	= $(RESDIR)/site_normal.urls
+NORMAL_WGET	= $(RESDIR)/normal_cases.wget
+NORMAL_CASES	= $(RESDIR)/normal_cases.xml
 gen_normal: $(NORMAL_URLS) $(NORMAL_WGET) ###$(NORMAL_CASES)
 
 # Separate out the setup and teardown URL's.
 sep_cmd		= gawk -f $(SRCDIR)/sep-urls.gawk
-SETUP_URLS	= $(SRCDIR)/site_setup.urls
-SETUP_FORMS	= $(SRCDIR)/setup_forms.list
-SETUP_WGET	= $(SRCDIR)/setup_cases.wget
-SETUP_CASES	= $(SRCDIR)/setup_cases.xml
+SETUP_URLS	= $(RESDIR)/site_setup.urls
+SETUP_FORMS	= $(RESDIR)/setup_forms.list
+SETUP_WGET	= $(RESDIR)/setup_cases.wget
+SETUP_CASES	= $(RESDIR)/setup_cases.xml
 gen_setup: $(SETUP_URLS) $(SETUP_WGET) ###$(SETUP_CASES)
 
-TEARDOWN_URLS	= $(SRCDIR)/site_teardown.urls
-TEARDOWN_FORMS	= $(SRCDIR)/teardown_forms.list
-TEARDOWN_WGET	= $(SRCDIR)/teardown_cases.wget
-TEARDOWN_CASES	= $(SRCDIR)/teardown_cases.xml
+TEARDOWN_URLS	= $(RESDIR)/site_teardown.urls
+TEARDOWN_FORMS	= $(RESDIR)/teardown_forms.list
+TEARDOWN_WGET	= $(RESDIR)/teardown_cases.wget
+TEARDOWN_CASES	= $(RESDIR)/teardown_cases.xml
 gen_teardown: $(TEARDOWN_URLS) $(TEARDOWN_WGET) ###$(TEARDOWN_CASES)
 
 $(NORMAL_URLS) $(SETUP_URLS) $(TEARDOWN_URLS): \
   $(SITE_INPUTS) $(INPUT_NAMES) $(INPUT_VALUES) $(SRCDIR)/forms-to-urls.gawk \
-  $(SRCDIR)/sep-urls.gawk $(SRCDIR)/setup_forms.list $(SRCDIR)/teardown_forms.list
+  $(SRCDIR)/sep-urls.gawk $(SETUP_FORMS) $(TEARDOWN_FORMS)
 	gawk -f $(SRCDIR)/forms-to-urls.gawk -v VALUES=$(INPUT_VALUES) \
             $(SITE_INPUTS) > tmp_urls
 	fgrep -v -f $(SETUP_FORMS) tmp_urls | \
@@ -537,10 +541,10 @@ analyze:
 	@$(call analyze_hdr,failure)
 	-$(call analyze_cmd,failure.txt)
 	@$(call analyze_hdr,UNKNOWN)
-	@sed -n 's/:.*//' $(analyze_output) > recognized_output.files
+	@sed -n 's/:.*//p' $(analyze_output) > recognized_output.files
 	ls *.html | fgrep -v -f recognized_output.files $(tee)
 
-NORMAL_OUTPUT	= $(SRCDIR)/normal_output.xml
+NORMAL_OUTPUT	= $(RESDIR)/normal_output.xml
 run_webinject: $(NORMAL_OUTPUT)
 $(NORMAL_OUTPUT): $(NORMAL_CASES)
 	(cd $(SRCDIR)/webinject;
@@ -554,8 +558,8 @@ probe:  gen_probes run_probes
 
 # Generate WebInject cases with SQL injection probes in individual fields.
 # Probe strings include form and field names that caused the hole.
-PROBE_URLS	= $(SRCDIR)/site_probe.urls
-PROBE_CASES	= $(SRCDIR)/probe_cases.xml
+PROBE_URLS	= $(RESDIR)/site_probe.urls
+PROBE_CASES	= $(RESDIR)/probe_cases.xml
 gen_probes: $(PROBE_CASES)
 $(PROBE_URLS): $(SITE_INPUTS) $(INPUT_VALUES)
         gawk -f $(SRCDIR)/forms-to-urls -v PROBE=1 -v VALUES=$(INPUT_VALUES) \
@@ -566,7 +570,7 @@ $(PROBE_CASES): $(PROBE_URLS)
 # Run the probes through webinject.
 # Successfully caught cases should produce "invalid input" warnings.
 # Potential penetrations will log SQL errors with the form/field name.
-PROBE_OUTPUT	= $(SRCDIR)/probe_output.xml
+PROBE_OUTPUT	= $(RESDIR)/probe_output.xml
 run_probes: $(PROBE_OUTPUT)
 $(PROBE_OUTPUT): $(PROBE_CASES)
 	(cd $(SRCDIR)/webinject;
diff --git a/www/sec-check/README-howto.txt b/www/sec-check/README-howto.txt
index 6d7755b41039490004f96ebae3f33c6cb92492fa..8e1134c89d6cb41a0051ee29012ba7e2d1d34976 100644
--- a/www/sec-check/README-howto.txt
+++ b/www/sec-check/README-howto.txt
@@ -93,7 +93,7 @@ sec-check/README-howto.txt - Documentation outline.
          gmake input_msg
      - But only 78 of the unique field names are text fields.
 
- - "normal" test cases
+ - "normal operation" test cases
    . Convert the list to test cases submitting input field values.
        gmake gen_normal
          Creates: site_normal.urls, normal_cases.xml
@@ -102,10 +102,10 @@ sec-check/README-howto.txt - Documentation outline.
          Creates: normal_output.xml
 
  - Probe the checking code of all input fields for SQL injection holes
-   . Generate WebInject cases with SQL injection probes in individual fields.
+   . Generate test cases with SQL injection probes in individual fields.
      Probe strings include form and field names that caused the hole.
    . Successfully caught cases should produce "invalid input" warnings.
-   . Potential penetrations will log SQL errors with the form/field name.
+   . Potential penetrations will log DBQuery errors with the form/field names.
 
  - Plug all of the holes by adding or fixing input validation logic.
    . Re-run probes to check.
diff --git a/www/sec-check/failure.txt b/www/sec-check/failure.txt
index 80dfcdab2d0bb0808fa04731fb5c4ea7011c7c92..caa5fe8d4ef9650c24e7c7b4236fe2c00d130354 100644
--- a/www/sec-check/failure.txt
+++ b/www/sec-check/failure.txt
@@ -1,6 +1,6 @@
 Invalid form arguments
 Invalid page arguments
-Invalid node name
+Invalid node
 No tags
 Could not continue
 You are not authorized
@@ -21,8 +21,16 @@ You cannot modify
 You are already a member
 You must provide
 No tags for experiment
-The following images are using this OS Descriptor
+The following images are using
 There must be a unique mapping
 Page Error
 cannot freeze someone
 not active
+At least one node must be selected
+No Matches
+Please try again
+You are still logged in
+Please log out first
+You do not appear to be logged in
+Please log in again
+You cannot modify an experiment in transition
diff --git a/www/sec-check/forms-to-urls.gawk b/www/sec-check/forms-to-urls.gawk
index 8a5fd71674a2a69c8650c0b50e65d467de93343f..9f8e42eb80601f575234f67e84d22d184d786fe6 100644
--- a/www/sec-check/forms-to-urls.gawk
+++ b/www/sec-check/forms-to-urls.gawk
@@ -86,10 +86,12 @@ form && /^<input/ {		# <input type="..." name="..." value=... ...>
     else if ( $0 ~ " value='" )
 	value = gensub(".* value='([^']*)'.*", "\\1", 1);
     else value = "";
-    ##printf "type %s, name %s, value %s\n", type, name, value;
+    checked = $0 ~ "\\<checked\\>";
+    ##printf "type %s, name %s, value %s, checked %s\n", type, name, value, checked;
 
     val_arg = (type=="text" || type=="textarea" || type=="password" || 
-	       type=="hidden" || type=="checkbox" || type=="select");
+	       type=="hidden" || type=="checkbox" || type=="select" ||
+	       type=="radio" && checked);
     # Follow just the positive submit controls, not cancel, etc.
     sub_arg = (type=="submit" && 
 	       (value ~ "Submit" || value ~ "Create" || 
diff --git a/www/sec-check/input_values.list b/www/sec-check/input_values.list
index 9295b97c4da63329d3a0a56e0cb4eaaf95c6d17a..abda6f48d686d614525a8da9fe58fdd0fb09210c 100644
--- a/www/sec-check/input_values.list
+++ b/www/sec-check/input_values.list
@@ -11,12 +11,12 @@ name="def_boot_cmd_line"
 name="def_boot_osid"
 name="description"
 name="dochange"
-name="eid" testexp1
+name="eid" !testexp1
 name="email"
 name="eventrestart"
 name="exp_pideid"
-name="exptidx"
-name="formfields[autoswap]"
+name="exptidx" 7
+name="formfields[autoswap]" 0
 name="formfields[autoswap_timeout]"
 name="formfields[batchmode]"
 name="formfields[body]" Test body.
@@ -25,8 +25,8 @@ name="formfields[copyid]"
 name="formfields[count]"
 name="formfields[cpu_usage]" 3
 name="formfields[description]" Descriptive text.
-name="formfields[eid]" testexp1
-name="formfields[exp_autoswap]"
+name="formfields[eid]" !testexp1
+name="formfields[exp_autoswap]" 0
 name="formfields[exp_autoswap_timeout]"
 name="formfields[exp_batched]"
 name="formfields[exp_branch]"
@@ -39,7 +39,7 @@ name="formfields[exp_linktest]"
 name="formfields[exp_localnsfile]" /users/fish/shaped-2-nodes.ns
 name="formfields[exp_noidleswap_reason]" Testing.
 name="formfields[exp_noswap_reason]"
-name="formfields[exp_pid]" testproj
+name="formfields[exp_pid]" testbed
 name="formfields[exp_preload]"
 name="formfields[exp_savedisk]"
 name="formfields[exp_swappable]"
@@ -48,7 +48,7 @@ name="formfields[fullname]"
 name="formfields[gid]"
 name="formfields[idleswap]" 0
 name="formfields[idleswap_timeout]"
-name="formfields[imagename]"
+name="formfields[imagename]" testimg
 name="formfields[joining_uid]" testuser
 name="formfields[linktest_level]"
 name="formfields[listname]"
@@ -61,7 +61,7 @@ name="formfields[mtype_pc850]" Yep
 name="formfields[mtype_pc3000]" Yep
 name="formfields[name]"
 name="formfields[new_section]" test_section
-name="formfields[node]" pc4
+name="formfields[node]" pc32
 name="formfields[noidleswap_reason]" Testing.
 name="formfields[notes]"
 name="formfields[op_mode]"
@@ -76,8 +76,8 @@ name="formfields[password1]" EinE_tmp
 name="formfields[password2]" EinE_tmp
 name="formfields[passphrase1]" EinE_tmp
 name="formfields[passphrase2]" EinE_tmp
-name="formfields[path]"
-name="formfields[pid]" testproj
+name="formfields[path]" /proj/testbed/images/testimg.ndz
+name="formfields[pid]" !testbed
 name="formfields[proj_URL]" http://myboss.vulnelab.testbed.emulab.net
 name="formfields[proj_funders]" none
 name="formfields[proj_head_uid]" fish
@@ -89,7 +89,7 @@ name="formfields[proj_plabpcs]" checked
 name="formfields[proj_public]" checked
 name="formfields[proj_ronpcs]"
 name="formfields[proj_why]" Scanning inputs.
-name="formfields[proj_whynotpublic]" Because.
+name="formfields[proj_whynotpublic]"
 name="formfields[resusage]"
 name="formfields[section]"
 name="formfields[shared]"
@@ -121,10 +121,11 @@ name="formfields[wholedisk]"
 name="formfields[wikiname]" TestUser
 name="formfields[xref_tag]" test_tag
 name="group_description"
-name="group_id"
-name="group_leader"
-name="group_pid"
-name="imageid" emulab-ops-RHL90-STD
+name="group_id" testgroup
+name="group_leader" fish
+name="group_pid" testproj1
+name="inout" !out
+name="imageid" testbed-testimg
 name="level"
 name="log_entry" Test log entry.
 name="login"
@@ -135,11 +136,11 @@ name="metadata_vers"
 name="mode"
 name="newprefix"
 name="newtype"
-name="node" pc4
-name="node_id" pc4
+name="node" pc32
+name="node_id" pc32
 name="node_type"
-name="nodeid" pc4
-name="nodes[]" pc4
+name="nodeid" pc32
+name="nodes[]" pc32
 name="nodetype"
 name="nsdata"
 name="op_mode"
@@ -155,9 +156,11 @@ name="osid" emulab-ops-RHL90-STD
 name="osname"
 name="phone"
 name="password" EinE_tmp
-name="pid" testproj
+name="pid" !testbed
 name="poweron"
-name="query"
+name="query" what
+name="query_type"
+name="query_which"
 name="range"
 name="reboot"
 name="referrer"
@@ -175,7 +178,7 @@ name="showtype"
 name="sortby"
 name="startupcmd"
 name="tarballs"
-name="target_pid" testproj
+name="target_pid" testbed
 name="target_uid" testuser
 name="template"
 name="template_guid"
diff --git a/www/sec-check/admin_files.list b/www/sec-check/results/admin_files.list
similarity index 100%
rename from www/sec-check/admin_files.list
rename to www/sec-check/results/admin_files.list
diff --git a/www/sec-check/admin_forms.list b/www/sec-check/results/admin_forms.list
similarity index 100%
rename from www/sec-check/admin_forms.list
rename to www/sec-check/results/admin_forms.list
diff --git a/www/sec-check/admin_inputs.list b/www/sec-check/results/admin_inputs.list
similarity index 100%
rename from www/sec-check/admin_inputs.list
rename to www/sec-check/results/admin_inputs.list
diff --git a/www/sec-check/files_missing.list b/www/sec-check/results/files_missing.list
similarity index 100%
rename from www/sec-check/files_missing.list
rename to www/sec-check/results/files_missing.list
diff --git a/www/sec-check/input_names.list b/www/sec-check/results/input_names.list
similarity index 99%
rename from www/sec-check/input_names.list
rename to www/sec-check/results/input_names.list
index 7b88efd124744902910fb6e6034d53bd9802883f..5b150f5174c8a39d0d81f36985b6569f5293cfa8 100644
--- a/www/sec-check/input_names.list
+++ b/www/sec-check/results/input_names.list
@@ -141,6 +141,8 @@ name="phone"
 name="pid"
 name="poweron"
 name="query"
+name="query_type"
+name="query_which"
 name="range"
 name="referrer"
 name="remap[0]"
diff --git a/www/sec-check/normal_cases.wget b/www/sec-check/results/normal_cases.wget
similarity index 66%
rename from www/sec-check/normal_cases.wget
rename to www/sec-check/results/normal_cases.wget
index b70604d490192ecbb3d397fe4475aeb94cf159c6..e19750a3e0ccbea38a13d8da1ca33d7a5533f3a6 100644
--- a/www/sec-check/normal_cases.wget
+++ b/www/sec-check/results/normal_cases.wget
@@ -1,28 +1,23 @@
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O kb-search.php3.html "https://myboss.vulnelab.testbed.emulab.net/kb-search.php3?submit=Submit%20Query&query="
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O login.php3.html --post-data "password=EinE_tmp&uid=testuser" "https://myboss.vulnelab.testbed.emulab.net/login.php3"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O archive_tag.php3.html "https://myboss.vulnelab.testbed.emulab.net/archive_tag.php3?exptidx=1"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O archive_tags.php3.html "https://myboss.vulnelab.testbed.emulab.net/archive_tags.php3?exptidx=1"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O archive_missing.php3.html "https://myboss.vulnelab.testbed.emulab.net/archive_missing.php3?exptidx=1"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O boot.php3.html --post-data "confirmed=Confirm&node_id=pc4" "https://myboss.vulnelab.testbed.emulab.net/boot.php3"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O editexp.php3.html --post-data "formfields[mem_usage]=0&formfields[batchmode]=1&formfields[idleswap_timeout]=4&submit=Submit&formfields[autoswap]=1&formfields[autoswap_timeout]=10&formfields[noidleswap_reason]=Testing.&eid=hwdown&formfields[cpu_usage]=3&formfields[idleswap]=0&formfields[linktest_level]=0&formfields[description]=Descriptive%20text.&pid=emulab-ops" "https://myboss.vulnelab.testbed.emulab.net/editexp.php3"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O editgroup.php3.html --post-data "testuser$$trust=local_root&add_testuser=permit&gid=testgroup&pid=testproj" "https://myboss.vulnelab.testbed.emulab.net/editgroup.php3"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O editimageid.php3.html --post-data "formfields[path]=/proj/testbed/images/FBSD-RON.ndz&formfields[mtype_pc850]=Yep&submit=Submit&imageid=emulab-ops-FBSD-RON&formfields[description]=Descriptive%20text." "https://myboss.vulnelab.testbed.emulab.net/editimageid.php3"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O feedback.php3.html "https://myboss.vulnelab.testbed.emulab.net/feedback.php3?mode=clear&confirmed=Confirm&clear_last=1&eid=testexp1&clear_bootstrap=1&pid=testproj"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O kb-search.php3.html "https://myboss.vulnelab.testbed.emulab.net/kb-search.php3?query_type=and&submit=Submit%20Query&query_which=both&query=what"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O archive_tag.php3.html "https://myboss.vulnelab.testbed.emulab.net/archive_tag.php3?exptidx=7"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O archive_tags.php3.html "https://myboss.vulnelab.testbed.emulab.net/archive_tags.php3?exptidx=7"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O archive_missing.php3.html "https://myboss.vulnelab.testbed.emulab.net/archive_missing.php3?exptidx=7"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O boot.php3.html --post-data "confirmed=Confirm&node_id=pc32" "https://myboss.vulnelab.testbed.emulab.net/boot.php3"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O editimageid.php3.html --post-data "formfields[path]=/proj/testbed/images/testimg.ndz&formfields[mtype_pc850]=Yep&submit=Submit&imageid=emulab-ops-FBSD-RON&formfields[description]=Descriptive%20text." "https://myboss.vulnelab.testbed.emulab.net/editimageid.php3"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O feedback.php3.html "https://myboss.vulnelab.testbed.emulab.net/feedback.php3?mode=clear&confirmed=Confirm&clear_last=1&eid=testexp1&clear_bootstrap=1&pid=testbed"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O gensslcert.php3.html --post-data "formfields[passphrase1]=EinE_tmp&submit=Create%20SSL%20Cert&formfields[passphrase2]=EinE_tmp&formfields[target_uid]=testuser" "https://myboss.vulnelab.testbed.emulab.net/gensslcert.php3"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O kb-manage.php3.html --post-data "formfields[xref_tag]=test_tag&formfields[title]=Test%20title.&submit=Submit&formfields[section]=none&formfields[body]=Test%20body.&formfields[faq_entry]=0&formfields[new_section]=test_section" "https://myboss.vulnelab.testbed.emulab.net/kb-manage.php3"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O loadimage.php3.html --post-data "node=pc4&submit=Go%21&imageid=emulab-ops-RHL90-STD" "https://myboss.vulnelab.testbed.emulab.net/loadimage.php3"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O modifyexp.php3.html --post-data "nsdata=&MAX_FILE_SIZE=1024&go=1&formfields[exp_localnsfile]=/users/fish/shaped-2-nodes.ns&eid=testexp1&pid=testbed" "https://myboss.vulnelab.testbed.emulab.net/modifyexp.php3"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O loadimage.php3.html --post-data "node=pc32&submit=Go%21&imageid=testbed-testimg" "https://myboss.vulnelab.testbed.emulab.net/loadimage.php3"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O moduserinfo.php3.html --post-data "formfields[usr_country]=USA&formfields[user_interface]=plab&formfields[usr_city]=Salt%20Lake%20Silly&formfields[usr_affil]=Emulab%20Scripts&formfields[usr_state]=UT&formfields[usr_URL]=http://www.emulab.net&formfields[usr_name]=Test%20User&submit=Submit&formfields[usr_addr]=Silly&formfields[target_uid]=testuser&formfields[notes]=&formfields[password1]=EinE_tmp&formfields[usr_email]=fish@flux.utah.edu&formfields[password2]=EinE_tmp&formfields[usr_phone]=801-123-4567&formfields[w_password1]=;lkjasdf&formfields[usr_zip]=12345&formfields[w_password2]=&formfields[usr_shell]=sh&formfields[usr_addr2]=Address&formfields[usr_title]=Tester" "https://myboss.vulnelab.testbed.emulab.net/moduserinfo.php3"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O newnodelog.php3.html --post-data "log_type=misc&log_entry=Test%20log%20entry.&node_id=pc4" "https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O newnodelog.php3.html --post-data "log_type=misc&log_entry=Test%20log%20entry.&node_id=pc32" "https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O newnodes_list.php3.html "https://myboss.vulnelab.testbed.emulab.net/newnodes_list.php3?remap[4]=&remap[5]=&newprefix=&remap[6]=&newtype=&create=Create%20selected%20nodes&remap[0]=&remap[1]=&remap[2]=&remap[3]=&addnumber="
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O nodecontrol.php3.html --post-data "rpms=&def_boot_osid=CONSUME&startupcmd=&node_type=cisco6509&tarballs=&refer=&def_boot_cmd_line=&node_id=pc4" "https://myboss.vulnelab.testbed.emulab.net/nodecontrol.php3"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O nodecontrol.php3.html --post-data "rpms=&def_boot_osid=CONSUME&startupcmd=&node_type=cisco6509&tarballs=&refer=&def_boot_cmd_line=&node_id=pc32" "https://myboss.vulnelab.testbed.emulab.net/nodecontrol.php3"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O nscheck.php3.html --post-data "MAX_FILE_SIZE=1024&formfields[exp_localnsfile]=/users/fish/shaped-2-nodes.ns" "https://myboss.vulnelab.testbed.emulab.net/nscheck.php3"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O nsgen.php3.html "https://myboss.vulnelab.testbed.emulab.net/nsgen.php3?template=plabdevbox&templatevalues[ImageName]=PLAB-DEVBOX&templatevalues[NodeName]=devbox&templatevalues[HWType]=pc"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O plab_ez.php3.html "https://myboss.vulnelab.testbed.emulab.net/plab_ez.php3?formfields[count]=10&formfields[when]=52&submit=Create%20it&formfields[type]=pcplab&formfields[canfail]=Yep&formfields[units]=168&formfields[resusage]=3"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O powertime.php3.html "https://myboss.vulnelab.testbed.emulab.net/powertime.php3?nodes[]=pc4&poweron=Yep&confirmed=Confirm"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O powertime.php3.html "https://myboss.vulnelab.testbed.emulab.net/powertime.php3?nodes[]=pc32&poweron=Yep&confirmed=Confirm"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O showpubkeys.php3.html --post-data "MAX_FILE_SIZE=1024&formfields[target_uid]=testuser&formfields[usr_key]=" "https://myboss.vulnelab.testbed.emulab.net/showpubkeys.php3"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O showsfskeys.php3.html --post-data "formfields[target_uid]=testuser&formfields[usr_key]=" "https://myboss.vulnelab.testbed.emulab.net/showsfskeys.php3"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O showsumstats.php3.html "https://myboss.vulnelab.testbed.emulab.net/showsumstats.php3?sortby=pdays&range=mm/dd/yy-mm/dd/yy&showby=users"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O showuser_list.php3.html --post-data "sortby=uid&searchfor=&showtype=loggedin" "https://myboss.vulnelab.testbed.emulab.net/showuser_list.php3"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O swapexp.php3.html --post-data "confirmed=Confirm&eid=testexp1&inout=in&pid=testbed" "https://myboss.vulnelab.testbed.emulab.net/swapexp.php3"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O updateaccounts.php3.html --post-data "confirmed=Confirm&eid=opsnodes&nodeid=pc4&pid=emulab-ops" "https://myboss.vulnelab.testbed.emulab.net/updateaccounts.php3"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O updateaccounts.php3.html --post-data "confirmed=Confirm&eid=testexp1&nodeid=pc32&pid=testbed" "https://myboss.vulnelab.testbed.emulab.net/updateaccounts.php3"
diff --git a/www/sec-check/public_files.list b/www/sec-check/results/public_files.list
similarity index 100%
rename from www/sec-check/public_files.list
rename to www/sec-check/results/public_files.list
diff --git a/www/sec-check/public_forms.list b/www/sec-check/results/public_forms.list
similarity index 100%
rename from www/sec-check/public_forms.list
rename to www/sec-check/results/public_forms.list
diff --git a/www/sec-check/public_inputs.list b/www/sec-check/results/public_inputs.list
similarity index 100%
rename from www/sec-check/public_inputs.list
rename to www/sec-check/results/public_inputs.list
diff --git a/www/sec-check/results/setup_cases.wget b/www/sec-check/results/setup_cases.wget
new file mode 100644
index 0000000000000000000000000000000000000000..8aed26b20e31e701125f61f784953beecb2b949b
--- /dev/null
+++ b/www/sec-check/results/setup_cases.wget
@@ -0,0 +1,12 @@
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O login.php3.html --post-data "password=EinE_tmp&uid=testuser3" "https://myboss.vulnelab.testbed.emulab.net/login.php3"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O newproject.php3.html --post-data "formfields[proj_plabpcs]=checked&formfields[proj_funders]=none&formfields[usr_country]=USA&formfields[proj_linked]=checked&MAX_FILE_SIZE=1024&formfields[proj_name]=Testproj%20description.&formfields[usr_city]=Salt%20Lake%20Silly&formfields[usr_affil]=Emulab%20Scripts&formfields[wikiname]=TestUser&formfields[proj_why]=Scanning%20inputs.&formfields[proj_public]=checked&formfields[proj_URL]=http://myboss.vulnelab.testbed.emulab.net&formfields[pid]=testproj3&formfields[usr_state]=UT&formfields[usr_URL]=http://www.emulab.net&formfields[usr_name]=Test%20User&formfields[proj_head_uid]=fish&submit=Submit&formfields[proj_members]=1&formfields[usr_addr]=Silly&formfields[proj_ronpcs]=checked&formfields[proj_pcs]=3&formfields[password1]=EinE_tmp&formfields[usr_email]=fish@flux.utah.edu&formfields[proj_whynotpublic]=&formfields[password2]=EinE_tmp&formfields[usr_key]=&formfields[usr_phone]=801-123-4567&formfields[usr_zip]=12345&formfields[usr_addr2]=Address&formfields[usr_title]=Tester" "https://myboss.vulnelab.testbed.emulab.net/newproject.php3"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O joinproject.php3.html --post-data "formfields[usr_country]=USA&MAX_FILE_SIZE=1024&formfields[usr_city]=Salt%20Lake%20Silly&formfields[usr_affil]=Emulab%20Scripts&formfields[wikiname]=TestUser&formfields[gid]=&formfields[pid]=testproj3&formfields[usr_state]=UT&formfields[usr_URL]=http://www.emulab.net&formfields[usr_name]=Test%20User&submit=Submit&formfields[usr_addr]=Silly&formfields[password1]=EinE_tmp&formfields[usr_email]=fish@flux.utah.edu&formfields[password2]=EinE_tmp&formfields[usr_key]=&formfields[usr_phone]=801-123-4567&formfields[usr_zip]=12345&formfields[joining_uid]=testuser3&formfields[usr_addr2]=Address&formfields[usr_title]=Tester" "https://myboss.vulnelab.testbed.emulab.net/joinproject.php3"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O beginexp_html.php3.html --post-data "formfields[exp_autoswap_timeout]=16&formfields[exp_noswap_reason]=&formfields[exp_id]=testexp3&beginexp=Submit&formfields[exp_noidleswap_reason]=Testing.&formfields[exp_idleswap_timeout]=4&MAX_FILE_SIZE=1024&formfields[exp_batched]=Yep&formfields[exp_swappable]=1&formfields[exp_preload]=Yep&formfields[exp_savedisk]=Yep&formfields[exp_description]=Test%20experiment.&formfields[exp_linktest]=0&formfields[exp_gid]=&formfields[exp_pid]=testproj3&formfields[exp_localnsfile]=/users/fish/shaped-2-nodes.ns&formfields[exp_autoswap]=0&formfields[exp_idleswap]=0" "https://myboss.vulnelab.testbed.emulab.net/beginexp_html.php3"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O modifyexp.php3.html --post-data "nsdata=&MAX_FILE_SIZE=1024&go=1&formfields[exp_localnsfile]=/users/fish/shaped-2-nodes.ns&eid=testexp3&pid=testproj3" "https://myboss.vulnelab.testbed.emulab.net/modifyexp.php3"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O editexp.php3.html --post-data "formfields[mem_usage]=0&formfields[batchmode]=1&formfields[idleswap_timeout]=4&submit=Submit&formfields[autoswap]=0&formfields[autoswap_timeout]=10&formfields[noidleswap_reason]=Testing.&eid=testexp3&formfields[cpu_usage]=3&formfields[idleswap]=0&formfields[linktest_level]=0&formfields[description]=Descriptive%20text.&pid=testproj3" "https://myboss.vulnelab.testbed.emulab.net/editexp.php3"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O newgroup.php3.html --post-data "group_id=testgroup3&group_description=&group_leader=fish&group_pid=testproj3" "https://myboss.vulnelab.testbed.emulab.net/newgroup.php3"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O editgroup.php3.html --post-data "testuser3$$trust=local_root&add_testuser3=permit&gid=testgroup3&pid=testproj3" "https://myboss.vulnelab.testbed.emulab.net/editgroup.php3"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O newimageid_ez.php3.html --post-data "formfields[os_feature_linktest]=checked&formfields[os_feature_ping]=checked&formfields[path]=/proj/testbed/images/testimg.ndz&formfields[mtype_pc850]=Yep&formfields[os_version]=&formfields[gid]=&formfields[pid]=testproj3&formfields[os_feature_ssh]=checked&submit=Submit&formfields[os_name]=none&formfields[loadpart]=X&formfields[node]=pc32&formfields[description]=Descriptive%20text.&formfields[imagename]=testimg&formfields[shared]=Yep&formfields[wholedisk]=Yep&formfields[os_feature_isup]=checked&formfields[os_feature_ipod]=checked&formfields[max_concurrent]=&formfields[op_mode]=none" "https://myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O newmmlist.php3.html --post-data "formfields[listname]=&formfields[pid]=testproj3&submit=Submit&formfields[password1]=EinE_tmp&formfields[password2]=EinE_tmp&formfields[fullname]=" "https://myboss.vulnelab.testbed.emulab.net/newmmlist.php3"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O newosid.php3.html --post-data "os_feature_isup=checked&os_magic=&os_path=&os_version=&os_feature_ping=checked&os_feature_ipod=checked&OS=Linux&os_feature_linktest=checked&op_mode=NORMALv2&description=&os_feature_ssh=checked&osname=&pid=testproj3" "https://myboss.vulnelab.testbed.emulab.net/newosid.php3"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O template_create.php.html --post-data "MAX_FILE_SIZE=1024&formfields[tid]=&formfields[localnsfile]=&formfields[gid]=&formfields[pid]=testproj3&create=Create%20Template&formfields[description]=Descriptive%20text." "https://myboss.vulnelab.testbed.emulab.net/template_create.php"
diff --git a/www/sec-check/setup_forms.list b/www/sec-check/results/setup_forms.list
similarity index 79%
rename from www/sec-check/setup_forms.list
rename to www/sec-check/results/setup_forms.list
index e2ed37018772f7b2f07427f6488e11bc37757a69..ae009cda15d204523d9747212eb19912d83fe8c5 100644
--- a/www/sec-check/setup_forms.list
+++ b/www/sec-check/results/setup_forms.list
@@ -1,10 +1,14 @@
+login.php3
 newproject.php3
-joinproject.php3
 approveproject_form.php3
-newgroup_form.php3
+joinproject.php3
 approveuser.php3
 beginexp_html.php3
+modifyexp.php3
+editexp.php3
+newgroup_form.php3
 newgroup.php3
+editgroup.php3
 newimageid_ez.php3
 newmmlist.php3
 newosid.php3
diff --git a/www/sec-check/site_files.list b/www/sec-check/results/site_files.list
similarity index 100%
rename from www/sec-check/site_files.list
rename to www/sec-check/results/site_files.list
diff --git a/www/sec-check/site_forms.list b/www/sec-check/results/site_forms.list
similarity index 100%
rename from www/sec-check/site_forms.list
rename to www/sec-check/results/site_forms.list
diff --git a/www/sec-check/site_inputs.list b/www/sec-check/results/site_inputs.list
similarity index 100%
rename from www/sec-check/site_inputs.list
rename to www/sec-check/results/site_inputs.list
diff --git a/www/sec-check/site_normal.urls b/www/sec-check/results/site_normal.urls
similarity index 68%
rename from www/sec-check/site_normal.urls
rename to www/sec-check/results/site_normal.urls
index 4c5ee797c04129e7a753a0d870fb9b0b8d849f3f..91fde8abd7bebcff25451b95e57377a9e75b6f9c 100644
--- a/www/sec-check/site_normal.urls
+++ b/www/sec-check/results/site_normal.urls
@@ -1,28 +1,23 @@
-https://myboss.vulnelab.testbed.emulab.net/kb-search.php3?submit=Submit Query&query=
-post:https://myboss.vulnelab.testbed.emulab.net/login.php3?password=EinE_tmp&uid=testuser
-https://myboss.vulnelab.testbed.emulab.net/archive_tag.php3?exptidx=1
-https://myboss.vulnelab.testbed.emulab.net/archive_tags.php3?exptidx=1
-https://myboss.vulnelab.testbed.emulab.net/archive_missing.php3?exptidx=1
-post:https://myboss.vulnelab.testbed.emulab.net/boot.php3?confirmed=Confirm&node_id=pc4
-post:https://myboss.vulnelab.testbed.emulab.net/editexp.php3?formfields[mem_usage]=0&formfields[batchmode]=1&formfields[idleswap_timeout]=4&submit=Submit&formfields[autoswap]=1&formfields[autoswap_timeout]=10&formfields[noidleswap_reason]=Testing.&eid=hwdown&formfields[cpu_usage]=3&formfields[idleswap]=0&formfields[linktest_level]=0&formfields[description]=Descriptive text.&pid=emulab-ops
-post:https://myboss.vulnelab.testbed.emulab.net/editgroup.php3?testuser$$trust=local_root&add_testuser=permit&gid=testgroup&pid=testproj
-post:https://myboss.vulnelab.testbed.emulab.net/editimageid.php3?formfields[path]=/proj/testbed/images/FBSD-RON.ndz&formfields[mtype_pc850]=Yep&submit=Submit&imageid=emulab-ops-FBSD-RON&formfields[description]=Descriptive text.
-https://myboss.vulnelab.testbed.emulab.net/feedback.php3?mode=clear&confirmed=Confirm&clear_last=1&eid=testexp1&clear_bootstrap=1&pid=testproj
+https://myboss.vulnelab.testbed.emulab.net/kb-search.php3?query_type=and&submit=Submit Query&query_which=both&query=what
+https://myboss.vulnelab.testbed.emulab.net/archive_tag.php3?exptidx=7
+https://myboss.vulnelab.testbed.emulab.net/archive_tags.php3?exptidx=7
+https://myboss.vulnelab.testbed.emulab.net/archive_missing.php3?exptidx=7
+post:https://myboss.vulnelab.testbed.emulab.net/boot.php3?confirmed=Confirm&node_id=pc32
+post:https://myboss.vulnelab.testbed.emulab.net/editimageid.php3?formfields[path]=/proj/testbed/images/testimg.ndz&formfields[mtype_pc850]=Yep&submit=Submit&imageid=emulab-ops-FBSD-RON&formfields[description]=Descriptive text.
+https://myboss.vulnelab.testbed.emulab.net/feedback.php3?mode=clear&confirmed=Confirm&clear_last=1&eid=testexp1&clear_bootstrap=1&pid=testbed
 post:https://myboss.vulnelab.testbed.emulab.net/gensslcert.php3?formfields[passphrase1]=EinE_tmp&submit=Create SSL Cert&formfields[passphrase2]=EinE_tmp&formfields[target_uid]=testuser
 post:https://myboss.vulnelab.testbed.emulab.net/kb-manage.php3?formfields[xref_tag]=test_tag&formfields[title]=Test title.&submit=Submit&formfields[section]=none&formfields[body]=Test body.&formfields[faq_entry]=0&formfields[new_section]=test_section
-post:https://myboss.vulnelab.testbed.emulab.net/loadimage.php3?node=pc4&submit=Go!&imageid=emulab-ops-RHL90-STD
-post:https://myboss.vulnelab.testbed.emulab.net/modifyexp.php3?nsdata=&MAX_FILE_SIZE=1024&go=1&formfields[exp_localnsfile]=/users/fish/shaped-2-nodes.ns&eid=testexp1&pid=testbed
+post:https://myboss.vulnelab.testbed.emulab.net/loadimage.php3?node=pc32&submit=Go!&imageid=testbed-testimg
 post:https://myboss.vulnelab.testbed.emulab.net/moduserinfo.php3?formfields[usr_country]=USA&formfields[user_interface]=plab&formfields[usr_city]=Salt Lake Silly&formfields[usr_affil]=Emulab Scripts&formfields[usr_state]=UT&formfields[usr_URL]=http://www.emulab.net&formfields[usr_name]=Test User&submit=Submit&formfields[usr_addr]=Silly&formfields[target_uid]=testuser&formfields[notes]=&formfields[password1]=EinE_tmp&formfields[usr_email]=fish@flux.utah.edu&formfields[password2]=EinE_tmp&formfields[usr_phone]=801-123-4567&formfields[w_password1]=;lkjasdf&formfields[usr_zip]=12345&formfields[w_password2]=&formfields[usr_shell]=sh&formfields[usr_addr2]=Address&formfields[usr_title]=Tester
-post:https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3?log_type=misc&log_entry=Test log entry.&node_id=pc4
+post:https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3?log_type=misc&log_entry=Test log entry.&node_id=pc32
 https://myboss.vulnelab.testbed.emulab.net/newnodes_list.php3?remap[4]=&remap[5]=&newprefix=&remap[6]=&newtype=&create=Create selected nodes&remap[0]=&remap[1]=&remap[2]=&remap[3]=&addnumber=
-post:https://myboss.vulnelab.testbed.emulab.net/nodecontrol.php3?rpms=&def_boot_osid=CONSUME&startupcmd=&node_type=cisco6509&tarballs=&refer=&def_boot_cmd_line=&node_id=pc4
+post:https://myboss.vulnelab.testbed.emulab.net/nodecontrol.php3?rpms=&def_boot_osid=CONSUME&startupcmd=&node_type=cisco6509&tarballs=&refer=&def_boot_cmd_line=&node_id=pc32
 post:https://myboss.vulnelab.testbed.emulab.net/nscheck.php3?MAX_FILE_SIZE=1024&formfields[exp_localnsfile]=/users/fish/shaped-2-nodes.ns
 https://myboss.vulnelab.testbed.emulab.net/nsgen.php3?template=plabdevbox&templatevalues[ImageName]=PLAB-DEVBOX&templatevalues[NodeName]=devbox&templatevalues[HWType]=pc
 https://myboss.vulnelab.testbed.emulab.net/plab_ez.php3?formfields[count]=10&formfields[when]=52&submit=Create it&formfields[type]=pcplab&formfields[canfail]=Yep&formfields[units]=168&formfields[resusage]=3
-https://myboss.vulnelab.testbed.emulab.net/powertime.php3?nodes[]=pc4&poweron=Yep&confirmed=Confirm
+https://myboss.vulnelab.testbed.emulab.net/powertime.php3?nodes[]=pc32&poweron=Yep&confirmed=Confirm
 post:https://myboss.vulnelab.testbed.emulab.net/showpubkeys.php3?MAX_FILE_SIZE=1024&formfields[target_uid]=testuser&formfields[usr_key]=
 post:https://myboss.vulnelab.testbed.emulab.net/showsfskeys.php3?formfields[target_uid]=testuser&formfields[usr_key]=
 https://myboss.vulnelab.testbed.emulab.net/showsumstats.php3?sortby=pdays&range=mm/dd/yy-mm/dd/yy&showby=users
 post:https://myboss.vulnelab.testbed.emulab.net/showuser_list.php3?sortby=uid&searchfor=&showtype=loggedin
-post:https://myboss.vulnelab.testbed.emulab.net/swapexp.php3?confirmed=Confirm&eid=testexp1&inout=in&pid=testbed
-post:https://myboss.vulnelab.testbed.emulab.net/updateaccounts.php3?confirmed=Confirm&eid=opsnodes&nodeid=pc4&pid=emulab-ops
+post:https://myboss.vulnelab.testbed.emulab.net/updateaccounts.php3?confirmed=Confirm&eid=testexp1&nodeid=pc32&pid=testbed
diff --git a/www/sec-check/results/site_setup.urls b/www/sec-check/results/site_setup.urls
new file mode 100644
index 0000000000000000000000000000000000000000..102bf58a6a7f1dd73632b92459bf09976eeee402
--- /dev/null
+++ b/www/sec-check/results/site_setup.urls
@@ -0,0 +1,12 @@
+post:https://myboss.vulnelab.testbed.emulab.net/login.php3?password=EinE_tmp&uid=testuser3
+post:https://myboss.vulnelab.testbed.emulab.net/newproject.php3?formfields[proj_plabpcs]=checked&formfields[proj_funders]=none&formfields[usr_country]=USA&formfields[proj_linked]=checked&MAX_FILE_SIZE=1024&formfields[proj_name]=Testproj description.&formfields[usr_city]=Salt Lake Silly&formfields[usr_affil]=Emulab Scripts&formfields[wikiname]=TestUser&formfields[proj_why]=Scanning inputs.&formfields[proj_public]=checked&formfields[proj_URL]=http://myboss.vulnelab.testbed.emulab.net&formfields[pid]=testproj3&formfields[usr_state]=UT&formfields[usr_URL]=http://www.emulab.net&formfields[usr_name]=Test User&formfields[proj_head_uid]=fish&submit=Submit&formfields[proj_members]=1&formfields[usr_addr]=Silly&formfields[proj_ronpcs]=checked&formfields[proj_pcs]=3&formfields[password1]=EinE_tmp&formfields[usr_email]=fish@flux.utah.edu&formfields[proj_whynotpublic]=&formfields[password2]=EinE_tmp&formfields[usr_key]=&formfields[usr_phone]=801-123-4567&formfields[usr_zip]=12345&formfields[usr_addr2]=Address&formfields[usr_title]=Tester
+post:https://myboss.vulnelab.testbed.emulab.net/joinproject.php3?formfields[usr_country]=USA&MAX_FILE_SIZE=1024&formfields[usr_city]=Salt Lake Silly&formfields[usr_affil]=Emulab Scripts&formfields[wikiname]=TestUser&formfields[gid]=&formfields[pid]=testproj3&formfields[usr_state]=UT&formfields[usr_URL]=http://www.emulab.net&formfields[usr_name]=Test User&submit=Submit&formfields[usr_addr]=Silly&formfields[password1]=EinE_tmp&formfields[usr_email]=fish@flux.utah.edu&formfields[password2]=EinE_tmp&formfields[usr_key]=&formfields[usr_phone]=801-123-4567&formfields[usr_zip]=12345&formfields[joining_uid]=testuser3&formfields[usr_addr2]=Address&formfields[usr_title]=Tester
+post:https://myboss.vulnelab.testbed.emulab.net/beginexp_html.php3?formfields[exp_autoswap_timeout]=16&formfields[exp_noswap_reason]=&formfields[exp_id]=testexp3&beginexp=Submit&formfields[exp_noidleswap_reason]=Testing.&formfields[exp_idleswap_timeout]=4&MAX_FILE_SIZE=1024&formfields[exp_batched]=Yep&formfields[exp_swappable]=1&formfields[exp_preload]=Yep&formfields[exp_savedisk]=Yep&formfields[exp_description]=Test experiment.&formfields[exp_linktest]=0&formfields[exp_gid]=&formfields[exp_pid]=testproj3&formfields[exp_localnsfile]=/users/fish/shaped-2-nodes.ns&formfields[exp_autoswap]=0&formfields[exp_idleswap]=0
+post:https://myboss.vulnelab.testbed.emulab.net/modifyexp.php3?nsdata=&MAX_FILE_SIZE=1024&go=1&formfields[exp_localnsfile]=/users/fish/shaped-2-nodes.ns&eid=testexp3&pid=testproj3
+post:https://myboss.vulnelab.testbed.emulab.net/editexp.php3?formfields[mem_usage]=0&formfields[batchmode]=1&formfields[idleswap_timeout]=4&submit=Submit&formfields[autoswap]=0&formfields[autoswap_timeout]=10&formfields[noidleswap_reason]=Testing.&eid=testexp3&formfields[cpu_usage]=3&formfields[idleswap]=0&formfields[linktest_level]=0&formfields[description]=Descriptive text.&pid=testproj3
+post:https://myboss.vulnelab.testbed.emulab.net/newgroup.php3?group_id=testgroup3&group_description=&group_leader=fish&group_pid=testproj3
+post:https://myboss.vulnelab.testbed.emulab.net/editgroup.php3?testuser3$$trust=local_root&add_testuser3=permit&gid=testgroup3&pid=testproj3
+post:https://myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[os_feature_linktest]=checked&formfields[os_feature_ping]=checked&formfields[path]=/proj/testbed/images/testimg.ndz&formfields[mtype_pc850]=Yep&formfields[os_version]=&formfields[gid]=&formfields[pid]=testproj3&formfields[os_feature_ssh]=checked&submit=Submit&formfields[os_name]=none&formfields[loadpart]=X&formfields[node]=pc32&formfields[description]=Descriptive text.&formfields[imagename]=testimg&formfields[shared]=Yep&formfields[wholedisk]=Yep&formfields[os_feature_isup]=checked&formfields[os_feature_ipod]=checked&formfields[max_concurrent]=&formfields[op_mode]=none
+post:https://myboss.vulnelab.testbed.emulab.net/newmmlist.php3?formfields[listname]=&formfields[pid]=testproj3&submit=Submit&formfields[password1]=EinE_tmp&formfields[password2]=EinE_tmp&formfields[fullname]=
+post:https://myboss.vulnelab.testbed.emulab.net/newosid.php3?os_feature_isup=checked&os_magic=&os_path=&os_version=&os_feature_ping=checked&os_feature_ipod=checked&OS=Linux&os_feature_linktest=checked&op_mode=NORMALv2&description=&os_feature_ssh=checked&osname=&pid=testproj3
+post:https://myboss.vulnelab.testbed.emulab.net/template_create.php?MAX_FILE_SIZE=1024&formfields[tid]=&formfields[localnsfile]=&formfields[gid]=&formfields[pid]=testproj3&create=Create Template&formfields[description]=Descriptive text.
diff --git a/www/sec-check/site_teardown.urls b/www/sec-check/results/site_teardown.urls
similarity index 62%
rename from www/sec-check/site_teardown.urls
rename to www/sec-check/results/site_teardown.urls
index 97619691f60472757b3a1e122f095ccc36e46578..2326dee0da9a57420dfd74e86b7da79b9631a4f5 100644
--- a/www/sec-check/site_teardown.urls
+++ b/www/sec-check/results/site_teardown.urls
@@ -1,8 +1,9 @@
-post:https://myboss.vulnelab.testbed.emulab.net/deleteuser.php3?confirmed=Confirm&target_uid=testuser&target_pid=testproj
-post:https://myboss.vulnelab.testbed.emulab.net/deletegroup.php3?confirmed=Confirm&gid=testgroup&pid=testproj
-post:https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?confirmed=Confirm&imageid=emulab-ops-RHL90-STD
+post:https://myboss.vulnelab.testbed.emulab.net/swapexp.php3?confirmed=Confirm&eid=testexp3&inout=out&pid=testproj3
+post:https://myboss.vulnelab.testbed.emulab.net/deleteuser.php3?confirmed=Confirm&target_uid=testuser3&target_pid=testproj3
+post:https://myboss.vulnelab.testbed.emulab.net/deletegroup.php3?confirmed=Confirm&gid=testgroup3&pid=testproj3
+post:https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?confirmed=Confirm&imageid=testbed-testimg
 post:https://myboss.vulnelab.testbed.emulab.net/deleteosid.php3?confirmed=Confirm&osid=emulab-ops-RHL90-STD
-post:https://myboss.vulnelab.testbed.emulab.net/endexp.php3?confirmed=Confirm&exp_pideid=&eid=hwdown&pid=emulab-ops
+post:https://myboss.vulnelab.testbed.emulab.net/endexp.php3?confirmed=Confirm&exp_pideid=&eid=testexp3&pid=testproj3
 post:https://myboss.vulnelab.testbed.emulab.net/deletepubkey.php3?confirmed=Confirm&key=1&target_uid=fish
 post:https://myboss.vulnelab.testbed.emulab.net/freenode.php3?confirmed=Confirm&node_id=ops
-post:https://myboss.vulnelab.testbed.emulab.net/freezeuser.php3?confirmed=Confirm&target_uid=testuser&action=freeze
+post:https://myboss.vulnelab.testbed.emulab.net/freezeuser.php3?confirmed=Confirm&target_uid=testuser3&action=freeze
diff --git a/www/sec-check/src_files.list b/www/sec-check/results/src_files.list
similarity index 100%
rename from www/sec-check/src_files.list
rename to www/sec-check/results/src_files.list
diff --git a/www/sec-check/src_forms.list b/www/sec-check/results/src_forms.list
similarity index 100%
rename from www/sec-check/src_forms.list
rename to www/sec-check/results/src_forms.list
diff --git a/www/sec-check/teardown_cases.wget b/www/sec-check/results/teardown_cases.wget
similarity index 62%
rename from www/sec-check/teardown_cases.wget
rename to www/sec-check/results/teardown_cases.wget
index f24c0ef8473a691008762355a77a36c1487a3e20..407807c0b82dd7363041da34cbe6e356eff8a863 100644
--- a/www/sec-check/teardown_cases.wget
+++ b/www/sec-check/results/teardown_cases.wget
@@ -1,8 +1,9 @@
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O deleteuser.php3.html --post-data "confirmed=Confirm&target_uid=testuser&target_pid=testproj" "https://myboss.vulnelab.testbed.emulab.net/deleteuser.php3"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O deletegroup.php3.html --post-data "confirmed=Confirm&gid=testgroup&pid=testproj" "https://myboss.vulnelab.testbed.emulab.net/deletegroup.php3"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O deleteimageid.php3.html --post-data "confirmed=Confirm&imageid=emulab-ops-RHL90-STD" "https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O swapexp.php3.html --post-data "confirmed=Confirm&eid=testexp3&inout=out&pid=testproj3" "https://myboss.vulnelab.testbed.emulab.net/swapexp.php3"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O deleteuser.php3.html --post-data "confirmed=Confirm&target_uid=testuser3&target_pid=testproj3" "https://myboss.vulnelab.testbed.emulab.net/deleteuser.php3"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O deletegroup.php3.html --post-data "confirmed=Confirm&gid=testgroup3&pid=testproj3" "https://myboss.vulnelab.testbed.emulab.net/deletegroup.php3"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O deleteimageid.php3.html --post-data "confirmed=Confirm&imageid=testbed-testimg" "https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O deleteosid.php3.html --post-data "confirmed=Confirm&osid=emulab-ops-RHL90-STD" "https://myboss.vulnelab.testbed.emulab.net/deleteosid.php3"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O endexp.php3.html --post-data "confirmed=Confirm&exp_pideid=&eid=hwdown&pid=emulab-ops" "https://myboss.vulnelab.testbed.emulab.net/endexp.php3"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O endexp.php3.html --post-data "confirmed=Confirm&exp_pideid=&eid=testexp3&pid=testproj3" "https://myboss.vulnelab.testbed.emulab.net/endexp.php3"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O deletepubkey.php3.html --post-data "confirmed=Confirm&key=1&target_uid=fish" "https://myboss.vulnelab.testbed.emulab.net/deletepubkey.php3"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O freenode.php3.html --post-data "confirmed=Confirm&node_id=ops" "https://myboss.vulnelab.testbed.emulab.net/freenode.php3"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O freezeuser.php3.html --post-data "confirmed=Confirm&target_uid=testuser&action=freeze" "https://myboss.vulnelab.testbed.emulab.net/freezeuser.php3"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O freezeuser.php3.html --post-data "confirmed=Confirm&target_uid=testuser3&action=freeze" "https://myboss.vulnelab.testbed.emulab.net/freezeuser.php3"
diff --git a/www/sec-check/teardown_forms.list b/www/sec-check/results/teardown_forms.list
similarity index 91%
rename from www/sec-check/teardown_forms.list
rename to www/sec-check/results/teardown_forms.list
index c6708290c66bb8298fca6fce60736d07a21f0203..754032a25b4cc416cc8325738ce780bec0d69317 100644
--- a/www/sec-check/teardown_forms.list
+++ b/www/sec-check/results/teardown_forms.list
@@ -1,3 +1,4 @@
+swapexp.php3
 deleteuser.php3
 deletegroup.php3
 deleteimageid.php3
diff --git a/www/sec-check/sep-urls.gawk b/www/sec-check/sep-urls.gawk
index f1c402ed986cd9a829bc037043c59d636c3cd712..859433f3c3752bde93192f6bb31fabe2fdc89b49 100644
--- a/www/sec-check/sep-urls.gawk
+++ b/www/sec-check/sep-urls.gawk
@@ -15,6 +15,10 @@
 
 # Stash the desired URL's, indexed by their output order.
 {
+    # Change proj, group, user, exp ids to leave activation objs alone.
+    $0 = gensub("(test(proj|group|use?r|exp))[12]?", "\\13", "g", $0);
+    $0 = gensub("(pid\\]?=)testbed", "\\1testproj3", "g", $0);
+
     # Remove suffix after php filename first, then path prefix.
     fn = gensub(".*/", "", 1, gensub("(php3*).*", "\\1", 1, $0));
     if ( o = order[fn] ) urls[o] = $0;
diff --git a/www/sec-check/setup_cases.wget b/www/sec-check/setup_cases.wget
deleted file mode 100644
index 74f971ec1f06d4a80a8c5bbc29d5611ac2e25e7a..0000000000000000000000000000000000000000
--- a/www/sec-check/setup_cases.wget
+++ /dev/null
@@ -1,8 +0,0 @@
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O newproject.php3.html --post-data "formfields[proj_plabpcs]=checked&formfields[proj_funders]=none&formfields[usr_country]=USA&formfields[proj_linked]=checked&MAX_FILE_SIZE=1024&formfields[proj_name]=Testproj%20description.&formfields[usr_city]=Salt%20Lake%20Silly&formfields[usr_affil]=Emulab%20Scripts&formfields[wikiname]=TestUser&formfields[proj_why]=Scanning%20inputs.&formfields[proj_public]=checked&formfields[proj_URL]=http://myboss.vulnelab.testbed.emulab.net&formfields[pid]=testproj&formfields[usr_state]=UT&formfields[usr_URL]=http://www.emulab.net&formfields[usr_name]=Test%20User&formfields[proj_head_uid]=fish&submit=Submit&formfields[proj_members]=1&formfields[usr_addr]=Silly&formfields[proj_ronpcs]=checked&formfields[proj_pcs]=3&formfields[password1]=EinE_tmp&formfields[usr_email]=fish@flux.utah.edu&formfields[proj_whynotpublic]=Because.&formfields[password2]=EinE_tmp&formfields[usr_key]=&formfields[usr_phone]=801-123-4567&formfields[usr_zip]=12345&formfields[usr_addr2]=Address&formfields[usr_title]=Tester" "https://myboss.vulnelab.testbed.emulab.net/newproject.php3"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O joinproject.php3.html --post-data "formfields[usr_country]=USA&MAX_FILE_SIZE=1024&formfields[usr_city]=Salt%20Lake%20Silly&formfields[usr_affil]=Emulab%20Scripts&formfields[wikiname]=TestUser&formfields[gid]=&formfields[pid]=testproj&formfields[usr_state]=UT&formfields[usr_URL]=http://www.emulab.net&formfields[usr_name]=Test%20User&submit=Submit&formfields[usr_addr]=Silly&formfields[password1]=EinE_tmp&formfields[usr_email]=fish@flux.utah.edu&formfields[password2]=EinE_tmp&formfields[usr_key]=&formfields[usr_phone]=801-123-4567&formfields[usr_zip]=12345&formfields[joining_uid]=testuser&formfields[usr_addr2]=Address&formfields[usr_title]=Tester" "https://myboss.vulnelab.testbed.emulab.net/joinproject.php3"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O beginexp_html.php3.html --post-data "formfields[exp_autoswap_timeout]=16&formfields[exp_noswap_reason]=&formfields[exp_id]=testexp1&beginexp=Submit&formfields[exp_noidleswap_reason]=Testing.&formfields[exp_idleswap_timeout]=4&MAX_FILE_SIZE=1024&formfields[exp_batched]=Yep&formfields[exp_swappable]=1&formfields[exp_preload]=Yep&formfields[exp_savedisk]=Yep&formfields[exp_description]=Test%20experiment.&formfields[exp_linktest]=0&formfields[exp_gid]=&formfields[exp_pid]=testproj&formfields[exp_localnsfile]=/users/fish/shaped-2-nodes.ns&formfields[exp_autoswap]=1&formfields[exp_idleswap]=0" "https://myboss.vulnelab.testbed.emulab.net/beginexp_html.php3"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O newgroup.php3.html --post-data "group_id=&group_description=&group_leader=fish&group_pid=testproj" "https://myboss.vulnelab.testbed.emulab.net/newgroup.php3"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O newimageid_ez.php3.html --post-data "formfields[os_feature_linktest]=checked&formfields[os_feature_ping]=checked&formfields[path]=/proj/&formfields[mtype_pc850]=Yep&formfields[os_version]=&formfields[gid]=&formfields[pid]=testproj&formfields[os_feature_ssh]=checked&submit=Submit&formfields[os_name]=none&formfields[loadpart]=X&formfields[node]=pc4&formfields[description]=Descriptive%20text.&formfields[imagename]=&formfields[shared]=Yep&formfields[wholedisk]=Yep&formfields[os_feature_isup]=checked&formfields[os_feature_ipod]=checked&formfields[max_concurrent]=&formfields[op_mode]=none" "https://myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O newmmlist.php3.html --post-data "formfields[listname]=&formfields[pid]=testproj&submit=Submit&formfields[password1]=EinE_tmp&formfields[password2]=EinE_tmp&formfields[fullname]=" "https://myboss.vulnelab.testbed.emulab.net/newmmlist.php3"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O newosid.php3.html --post-data "os_feature_isup=checked&os_magic=&os_path=&os_version=&os_feature_ping=checked&os_feature_ipod=checked&OS=Linux&os_feature_linktest=checked&op_mode=NORMALv2&description=&os_feature_ssh=checked&osname=&pid=testproj" "https://myboss.vulnelab.testbed.emulab.net/newosid.php3"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O template_create.php.html --post-data "MAX_FILE_SIZE=1024&formfields[tid]=&formfields[localnsfile]=&formfields[gid]=&formfields[pid]=testproj&create=Create%20Template&formfields[description]=Descriptive%20text." "https://myboss.vulnelab.testbed.emulab.net/template_create.php"
diff --git a/www/sec-check/site_setup.urls b/www/sec-check/site_setup.urls
deleted file mode 100644
index 6a7e9eea1b67982a2797d130e6633337aabaaac4..0000000000000000000000000000000000000000
--- a/www/sec-check/site_setup.urls
+++ /dev/null
@@ -1,8 +0,0 @@
-post:https://myboss.vulnelab.testbed.emulab.net/newproject.php3?formfields[proj_plabpcs]=checked&formfields[proj_funders]=none&formfields[usr_country]=USA&formfields[proj_linked]=checked&MAX_FILE_SIZE=1024&formfields[proj_name]=Testproj description.&formfields[usr_city]=Salt Lake Silly&formfields[usr_affil]=Emulab Scripts&formfields[wikiname]=TestUser&formfields[proj_why]=Scanning inputs.&formfields[proj_public]=checked&formfields[proj_URL]=http://myboss.vulnelab.testbed.emulab.net&formfields[pid]=testproj&formfields[usr_state]=UT&formfields[usr_URL]=http://www.emulab.net&formfields[usr_name]=Test User&formfields[proj_head_uid]=fish&submit=Submit&formfields[proj_members]=1&formfields[usr_addr]=Silly&formfields[proj_ronpcs]=checked&formfields[proj_pcs]=3&formfields[password1]=EinE_tmp&formfields[usr_email]=fish@flux.utah.edu&formfields[proj_whynotpublic]=Because.&formfields[password2]=EinE_tmp&formfields[usr_key]=&formfields[usr_phone]=801-123-4567&formfields[usr_zip]=12345&formfields[usr_addr2]=Address&formfields[usr_title]=Tester
-post:https://myboss.vulnelab.testbed.emulab.net/joinproject.php3?formfields[usr_country]=USA&MAX_FILE_SIZE=1024&formfields[usr_city]=Salt Lake Silly&formfields[usr_affil]=Emulab Scripts&formfields[wikiname]=TestUser&formfields[gid]=&formfields[pid]=testproj&formfields[usr_state]=UT&formfields[usr_URL]=http://www.emulab.net&formfields[usr_name]=Test User&submit=Submit&formfields[usr_addr]=Silly&formfields[password1]=EinE_tmp&formfields[usr_email]=fish@flux.utah.edu&formfields[password2]=EinE_tmp&formfields[usr_key]=&formfields[usr_phone]=801-123-4567&formfields[usr_zip]=12345&formfields[joining_uid]=testuser&formfields[usr_addr2]=Address&formfields[usr_title]=Tester
-post:https://myboss.vulnelab.testbed.emulab.net/beginexp_html.php3?formfields[exp_autoswap_timeout]=16&formfields[exp_noswap_reason]=&formfields[exp_id]=testexp1&beginexp=Submit&formfields[exp_noidleswap_reason]=Testing.&formfields[exp_idleswap_timeout]=4&MAX_FILE_SIZE=1024&formfields[exp_batched]=Yep&formfields[exp_swappable]=1&formfields[exp_preload]=Yep&formfields[exp_savedisk]=Yep&formfields[exp_description]=Test experiment.&formfields[exp_linktest]=0&formfields[exp_gid]=&formfields[exp_pid]=testproj&formfields[exp_localnsfile]=/users/fish/shaped-2-nodes.ns&formfields[exp_autoswap]=1&formfields[exp_idleswap]=0
-post:https://myboss.vulnelab.testbed.emulab.net/newgroup.php3?group_id=&group_description=&group_leader=fish&group_pid=testproj
-post:https://myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[os_feature_linktest]=checked&formfields[os_feature_ping]=checked&formfields[path]=/proj/&formfields[mtype_pc850]=Yep&formfields[os_version]=&formfields[gid]=&formfields[pid]=testproj&formfields[os_feature_ssh]=checked&submit=Submit&formfields[os_name]=none&formfields[loadpart]=X&formfields[node]=pc4&formfields[description]=Descriptive text.&formfields[imagename]=&formfields[shared]=Yep&formfields[wholedisk]=Yep&formfields[os_feature_isup]=checked&formfields[os_feature_ipod]=checked&formfields[max_concurrent]=&formfields[op_mode]=none
-post:https://myboss.vulnelab.testbed.emulab.net/newmmlist.php3?formfields[listname]=&formfields[pid]=testproj&submit=Submit&formfields[password1]=EinE_tmp&formfields[password2]=EinE_tmp&formfields[fullname]=
-post:https://myboss.vulnelab.testbed.emulab.net/newosid.php3?os_feature_isup=checked&os_magic=&os_path=&os_version=&os_feature_ping=checked&os_feature_ipod=checked&OS=Linux&os_feature_linktest=checked&op_mode=NORMALv2&description=&os_feature_ssh=checked&osname=&pid=testproj
-post:https://myboss.vulnelab.testbed.emulab.net/template_create.php?MAX_FILE_SIZE=1024&formfields[tid]=&formfields[localnsfile]=&formfields[gid]=&formfields[pid]=testproj&create=Create Template&formfields[description]=Descriptive text.
diff --git a/www/sec-check/success.txt b/www/sec-check/success.txt
index d5cc3a37c0587c3e820e929c898a4c92a1567d6b..7d370060c862d71e343f1d79dfc4c16029b75e64 100644
--- a/www/sec-check/success.txt
+++ b/www/sec-check/success.txt
@@ -10,6 +10,7 @@ was <b>granted</b> membership
 Starting experiment configuration
 You will be notified via email
 Attempting to reboot
+Successful
 Snapshot Node Disk into Existing Image Descriptor
 Knowledge Base Entry:
 Your new SSL certificate has been created
@@ -17,3 +18,11 @@ Log for node
 Commit/Tag Archive
 has been deleted
 let's be sure
+Are you REALLY REALLY sure
+Your NS file looks good
+This template is for creating
+To finish creating your slice
+public keys for user
+Knowledge Base search results
+Click to visit archive
+Done!