diff --git a/checkin_notes b/checkin_notes
index 19e6bb28ae..89ff129a8d 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -371,11 +371,11 @@ Michael Gary	June 06, 2002
 	cs_scheduler.C
 	client_types.h
     test/
-	max_water_prefs.xml
-	min_water_prefs.xml
-	normal_water_prefs.xml
-	test_max_water_prefs.php
-	test_min_water_prefs.php
-	test_normal_water_prefs.php
+	max_water_prefs.xml (new)
+	min_water_prefs.xml (new)
+	normal_water_prefs.xml (new)
+	test_max_water_prefs.php (new)
+	test_min_water_prefs.php (new)
+	test_normal_water_prefs.php (new)
 
 
diff --git a/test/max_water_prefs.xml b/test/max_water_prefs.xml
new file mode 100644
index 0000000000..24bb1f1de8
--- /dev/null
+++ b/test/max_water_prefs.xml
@@ -0,0 +1,2 @@
+<hi_water_secs>2592000</hi_water_secs>
+<lo_water_secs>1</lo_water_secs>
diff --git a/test/min_water_prefs.xml b/test/min_water_prefs.xml
new file mode 100644
index 0000000000..d205a8787c
--- /dev/null
+++ b/test/min_water_prefs.xml
@@ -0,0 +1,2 @@
+<hi_water_secs>172800</hi_water_secs>
+<lo_water_secs>300</lo_water_secs>
diff --git a/test/normal_water_prefs.xml b/test/normal_water_prefs.xml
new file mode 100644
index 0000000000..d205a8787c
--- /dev/null
+++ b/test/normal_water_prefs.xml
@@ -0,0 +1,2 @@
+<hi_water_secs>172800</hi_water_secs>
+<lo_water_secs>300</lo_water_secs>
diff --git a/test/test_max_water_prefs.php b/test/test_max_water_prefs.php
new file mode 100755
index 0000000000..631ded971b
--- /dev/null
+++ b/test/test_max_water_prefs.php
@@ -0,0 +1,29 @@
+#! /usr/local/bin/php
+<?php
+    // test preferences
+    //
+
+    include_once("init.inc");
+
+    clear_db();
+    clear_data_dirs();
+    init_client_dirs("account1.xml");
+    copy_to_download_dir("small_input");
+    add_platform();
+    add_core_client();
+    add_user("max_water_prefs.xml");
+    add_app("uc_slow");
+    create_work("-appname uc_slow -wu_name ucs_wu -wu_template ucs_wu -result_template ucs_result -nresults 1 small_input");
+    //will automatically run client instead
+    //echo "Now run the client manually; start and stop it a few times.\n";
+    //run_client();
+    //compare_file("ucs_wu_0_0", "uc_small_correct_output");
+    echo "starting feeder\n";
+    start_feeder();
+    echo "started feeder\n";
+    run_client();
+    echo "ran client\n";
+    stop_feeder();
+    //not sure what correct results should be, so will have to figure 
+    //this out so can run diff
+?>
diff --git a/test/test_min_water_prefs.php b/test/test_min_water_prefs.php
new file mode 100755
index 0000000000..c412cbec3e
--- /dev/null
+++ b/test/test_min_water_prefs.php
@@ -0,0 +1,29 @@
+#! /usr/local/bin/php
+<?php
+    // test preferences
+    //
+
+    include_once("init.inc");
+
+    clear_db();
+    clear_data_dirs();
+    init_client_dirs("account1.xml");
+    copy_to_download_dir("small_input");
+    add_platform();
+    add_core_client();
+    add_user("min_water_prefs.xml");
+    add_app("uc_slow");
+    create_work("-appname uc_slow -wu_name ucs_wu -wu_template ucs_wu -result_template ucs_result -nresults 1 small_input");
+    //will automatically run client instead
+    //echo "Now run the client manually; start and stop it a few times.\n";
+    //run_client();
+    //compare_file("ucs_wu_0_0", "uc_small_correct_output");
+    echo "starting feeder\n";
+    start_feeder();
+    echo "started feeder\n";
+    run_client();
+    echo "ran client\n";
+    stop_feeder();
+    //not sure what correct results should be, so will have to figure 
+    //this out so can run diff
+?>
diff --git a/test/test_normal_water_prefs.php b/test/test_normal_water_prefs.php
new file mode 100755
index 0000000000..5f5c97c009
--- /dev/null
+++ b/test/test_normal_water_prefs.php
@@ -0,0 +1,30 @@
+#! /usr/local/bin/php
+<?php
+    // test preferences
+    //
+
+    include_once("init.inc");
+
+    clear_db();
+    clear_data_dirs();
+    init_client_dirs("account1.xml");
+    copy_to_download_dir("small_input");
+    add_platform();
+    add_core_client();
+    add_user("normal_water_prefs.xml");
+    add_app("upper_case");
+    create_work("-appname uc_slow -wu_name ucs_wu -wu_template ucs_wu -result_template ucs_result -nresults 1 small_input");
+    //echo "Now run the client manually; start and stop it a few times.\n";
+    //run_client();
+    //compare_file("ucs_wu_0_0", "uc_small_correct_output");
+    //This is so that the client will automatically run, instead of 
+    //manually running
+    echo "starting feeder\n";
+    start_feeder();
+    echo "started feeder\n";
+    run_client();
+    echo "ran client\n";
+    stop_feeder();
+    //not sure what correct results should be, so will have to figure 
+    //this out so can run diff
+?>