Index: trunk/bin/systemstart_dev_practice_session.bat
===================================================================
--- trunk/bin/systemstart_dev_practice_session.bat	(revision 661)
+++ trunk/bin/systemstart_dev_practice_session.bat	(revision 663)
@@ -11,5 +11,5 @@
 REM Start the CAD server
 cd ..
-start java -DCONFIG_DIR=config\dev -DPROP_FILE=cad_simulator_practice.properties -jar deploy\CADserver.jar
+start java -DCONFIG_DIR=config/dev -DPROP_FILE=cad_server_practice.properties -jar deploy\CADserver.jar
 
 REM sleep for 5 seconds
Index: trunk/bin/systemstart_systest.bat
===================================================================
--- trunk/bin/systemstart_systest.bat	(revision 392)
+++ trunk/bin/systemstart_systest.bat	(revision 663)
@@ -11,5 +11,5 @@
 
 REM Start the CAD server
-start java -DPROP_FILE=cad_simulator_systest.properties -jar deploy/CADserver.jar
+start java -DPROP_FILE=cad_server_systest.properties -jar deploy/CADserver.jar
 
 REM sleep for 5 seconds
Index: trunk/bin/systemstart_dev_practice_session.sh
===================================================================
--- trunk/bin/systemstart_dev_practice_session.sh	(revision 648)
+++ trunk/bin/systemstart_dev_practice_session.sh	(revision 663)
@@ -5,9 +5,7 @@
 sleep 1
 cd ..
-java -DPROP_FILE=cad_simulator_practice.properties -jar deploy/CADserver.jar &
+java -DPROP_FILE=cad_server_practice.properties -jar deploy/CADserver.jar &
 sleep 7
 java -jar deploy/SimManager.jar practice_script_2016.xml &
-# Manual step for now, until it's integrated into Sim Mgr
-#cp scripts/practice_script_2016.xml webapps/dynamicdata/incident_script.xml
 
 # Start Unified Logger Service
Index: trunk/bin/systemstart_systest.sh
===================================================================
--- trunk/bin/systemstart_systest.sh	(revision 389)
+++ trunk/bin/systemstart_systest.sh	(revision 663)
@@ -1,3 +1,8 @@
 #!/bin/sh
+
+# Kill any process leftover from previous run
+kill $(ps  aux | grep "[p]ython -m CGIHTTPServer 8080" | awk '{print $2}')
+kill $(ps  aux | grep "[p]ython deploy/unifiedlogger.zip" | awk '{print $2}')
+
 # Start the Simulator System with the system test script
 cd ../webapps
@@ -5,8 +10,11 @@
 sleep 1
 cd ..
-java -DPROP_FILE=cad_simulator_systest.properties -jar deploy/CADserver.jar &
+java -DPROP_FILE=cad_server_systest.properties -jar deploy/CADserver.jar &
 sleep 7
 java -jar deploy/SimManager.jar system_test_script.xml &
 # Manual step for now, until it's integrated into Sim Mgr
-cp scripts/system_test_script.xml webapps/dynamicdata/incident_script.xml
+#cp Scenarios/system_test_script.xml webapps/dynamicdata/incident_script.xml
 
+# Start a browser and run the web applications
+firefox localhost:8080/einotebook  localhost:8080/cptms 
+#localhost:8080/unifiedlogmonitor.html &
Index: trunk/bin/systemstart_production_practice_session.bat
===================================================================
--- trunk/bin/systemstart_production_practice_session.bat	(revision 514)
+++ trunk/bin/systemstart_production_practice_session.bat	(revision 663)
@@ -7,5 +7,5 @@
 REM Start the CAD server
 cd ..
-start java -DPROP_FILE=cad_simulator_practice.properties -jar deploy/CADserver.jar
+start java -DPROP_FILE=cad_server_practice.properties -jar deploy/CADserver.jar
 
 REM sleep for 5 seconds