Index: lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
===================================================================
diff -u -rc5018756255d88e04a69ac2a3055bd75083fec36 -r6faa51252d8f8117db65e0a58ff295def4cf7af9
--- lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java	(.../TestLearnerService.java)	(revision c5018756255d88e04a69ac2a3055bd75083fec36)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java	(.../TestLearnerService.java)	(revision 6faa51252d8f8117db65e0a58ff295def4cf7af9)
@@ -24,7 +24,7 @@
 import java.util.List;
 
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.AbstractLamsTestCase;
+import org.lamsfoundation.lams.test.AbstractLamsTestCase;
 
 import org.lamsfoundation.lams.learning.progress.ProgressException;
 import org.lamsfoundation.lams.learningdesign.Activity;
@@ -140,11 +140,11 @@
     }
     protected String[] getContextConfigLocation()
     {
-        return new String[] { "classpath:/org/lamsfoundation/lams/applicationContext.xml",
+        return new String[] { "classpath:/org/lamsfoundation/lams/localApplicationContext.xml",
                 "classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml",
                 "classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml",
                 "classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml",
-                "classpath:*/applicationContext.xml"};
+                "classpath:/org/lamsfoundation/lams/tool/survey/applicationContext.xml"};
 
 /*        return new String[] { "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml",
   			  				  "/org/lamsfoundation/lams/tool/toolApplicationContext.xml",
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/AbstractTestAction.java
===================================================================
diff -u
--- lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/AbstractTestAction.java	(revision 0)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/AbstractTestAction.java	(revision 6faa51252d8f8117db65e0a58ff295def4cf7af9)
@@ -0,0 +1,60 @@
+/*
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program 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.
+
+This program 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 this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+
+package org.lamsfoundation.lams.learning.web.action;
+
+import org.lamsfoundation.lams.test.AbstractLamsStrutsTestCase;
+
+public class AbstractTestAction extends AbstractLamsStrutsTestCase {
+
+	public AbstractTestAction(String testName) {
+		super(testName);
+	}
+
+	/*
+     * @see TestCase#setUp()
+     */
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+    }
+
+    /**
+     * @see org.lamsfoundation.lams.AbstractLamsStrutsTestCase#getContextConfigLocation()
+     */
+    protected String getContextConfigLocation()
+    {
+        return "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml "
+  			   +"/org/lamsfoundation/lams/tool/toolApplicationContext.xml "
+  			   +"/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml "
+  			   +"/org/lamsfoundation/lams/localapplicationContext.xml "
+  			   +"/WEB-INF/spring/learningApplicationContext.xml";
+    }
+    /**
+     * @see org.lamsfoundation.lams.AbstractLamsStrutsTestCase#getHibernateSessionFactoryBeanName()
+     */
+    protected String getHibernateSessionFactoryBeanName()
+    {
+        return "coreSessionFactory";
+    }
+
+
+}
\ No newline at end of file
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestDisplayActivityAction.java
===================================================================
diff -u -r455d2b55eaef30c9e68a0fb6bdef036320ec54bd -r6faa51252d8f8117db65e0a58ff295def4cf7af9
--- lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestDisplayActivityAction.java	(.../TestDisplayActivityAction.java)	(revision 455d2b55eaef30c9e68a0fb6bdef036320ec54bd)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestDisplayActivityAction.java	(.../TestDisplayActivityAction.java)	(revision 6faa51252d8f8117db65e0a58ff295def4cf7af9)
@@ -23,7 +23,6 @@
 package org.lamsfoundation.lams.learning.web.action;
 
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.AbstractLamsStrutsTestCase;
 import org.lamsfoundation.lams.learningdesign.OptionsActivity;
 import org.lamsfoundation.lams.learningdesign.ParallelActivity;
 import org.lamsfoundation.lams.lesson.LearnerProgress;
@@ -36,7 +35,7 @@
  * @version
  * 
  */
-public class TestDisplayActivityAction extends AbstractLamsStrutsTestCase
+public class TestDisplayActivityAction extends AbstractTestAction
 {
     //---------------------------------------------------------------------
     // Instance variables
@@ -57,25 +56,7 @@
         super(arg0);
     }
 
-    /**
-     * @see org.lamsfoundation.lams.AbstractLamsStrutsTestCase#getContextConfigLocation()
-     */
-    protected String getContextConfigLocation()
-    {
-        return "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml "
-		   	   +"/org/lamsfoundation/lams/tool/toolApplicationContext.xml "
-		   	   +"/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml "
-		   	   +"applicationContext.xml "
-		   	   +"/WEB-INF/spring/learningApplicationContext.xml";
-    }
-    
-    /**
-     * @see org.lamsfoundation.lams.AbstractLamsStrutsTestCase#getHibernateSessionFactoryBeanName()
-     */
-    protected String getHibernateSessionFactoryBeanName()
-    {
-        return "coreSessionFactory";
-    }    
+
     /*
      * @see AbstractLamsStrutsTestCase#setUp()
      */
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGateAction.java
===================================================================
diff -u -r455d2b55eaef30c9e68a0fb6bdef036320ec54bd -r6faa51252d8f8117db65e0a58ff295def4cf7af9
--- lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGateAction.java	(.../TestGateAction.java)	(revision 455d2b55eaef30c9e68a0fb6bdef036320ec54bd)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGateAction.java	(.../TestGateAction.java)	(revision 6faa51252d8f8117db65e0a58ff295def4cf7af9)
@@ -23,7 +23,6 @@
 package org.lamsfoundation.lams.learning.web.action;
 
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.AbstractLamsStrutsTestCase;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.learning.web.util.LessonLearnerDataManager;
@@ -40,7 +39,7 @@
  * @version 1.1
  * 
  */
-public class TestGateAction extends AbstractLamsStrutsTestCase
+public class TestGateAction extends AbstractTestAction
 {
     //---------------------------------------------------------------------
     // Instance variables
@@ -62,24 +61,6 @@
     {
         super(testName);
     }
-    /**
-     * @see org.lamsfoundation.lams.AbstractLamsStrutsTestCase#getContextConfigLocation()
-     */
-    protected String getContextConfigLocation()
-    {
-        return "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml "
-  			   +"/org/lamsfoundation/lams/tool/toolApplicationContext.xml "
-  			   +"/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml "
-  			   +"/WEB-INF/spring/applicationContext.xml "
-  			   +"/WEB-INF/spring/learningApplicationContext.xml";
-    }
-    /**
-     * @see org.lamsfoundation.lams.AbstractLamsStrutsTestCase#getHibernateSessionFactoryBeanName()
-     */
-    protected String getHibernateSessionFactoryBeanName()
-    {
-        return "coreSessionFactory";
-    }
     /*
      * @see AbstractLamsStrutsTestCase#setUp()
      */
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGroupingAction.java
===================================================================
diff -u -r455d2b55eaef30c9e68a0fb6bdef036320ec54bd -r6faa51252d8f8117db65e0a58ff295def4cf7af9
--- lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGroupingAction.java	(.../TestGroupingAction.java)	(revision 455d2b55eaef30c9e68a0fb6bdef036320ec54bd)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGroupingAction.java	(.../TestGroupingAction.java)	(revision 6faa51252d8f8117db65e0a58ff295def4cf7af9)
@@ -24,7 +24,6 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.AbstractLamsStrutsTestCase;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.learning.web.util.LessonLearnerDataManager;
@@ -42,7 +41,7 @@
  * @version
  * 
  */
-public class TestGroupingAction extends AbstractLamsStrutsTestCase
+public class TestGroupingAction extends AbstractTestAction
 {
 
     private static final String TEST_LERNER_PROGRESS_ID = "1";
@@ -60,25 +59,6 @@
         super(testName);
     }
 
-    /**
-     * @see org.lamsfoundation.lams.AbstractLamsStrutsTestCase#getContextConfigLocation()
-     */
-    protected String getContextConfigLocation()
-    {
-        return "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml "
-  			   +"/org/lamsfoundation/lams/tool/toolApplicationContext.xml "
-  			   +"/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml "
-  			   +"/WEB-INF/spring/applicationContext.xml "
-  			   +"/WEB-INF/spring/learningApplicationContext.xml";
-    }
-    
-    /**
-     * @see org.lamsfoundation.lams.AbstractLamsStrutsTestCase#getHibernateSessionFactoryBeanName()
-     */
-    protected String getHibernateSessionFactoryBeanName()
-    {
-        return "coreSessionFactory";
-    }
     /*
      * @see AbstractLamsStrutsTestCase#setUp()
      */
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestLearnerAction.java
===================================================================
diff -u -r455d2b55eaef30c9e68a0fb6bdef036320ec54bd -r6faa51252d8f8117db65e0a58ff295def4cf7af9
--- lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestLearnerAction.java	(.../TestLearnerAction.java)	(revision 455d2b55eaef30c9e68a0fb6bdef036320ec54bd)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestLearnerAction.java	(.../TestLearnerAction.java)	(revision 6faa51252d8f8117db65e0a58ff295def4cf7af9)
@@ -23,7 +23,6 @@
 package org.lamsfoundation.lams.learning.web.action;
 
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.AbstractLamsStrutsTestCase;
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.lesson.LearnerProgress;
 
@@ -35,7 +34,7 @@
  * @version
  * 
  */
-public class TestLearnerAction extends AbstractLamsStrutsTestCase
+public class TestLearnerAction extends AbstractTestAction
 {
     //---------------------------------------------------------------------
     // Instance variables
@@ -67,19 +66,8 @@
         super.tearDown();
     }
 
+
     /**
-     * @see org.lamsfoundation.lams.AbstractLamsStrutsTestCase#getContextConfigLocation()
-     */
-    protected String getContextConfigLocation()
-    {
-        return "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml "
-  			   +"/org/lamsfoundation/lams/tool/toolApplicationContext.xml "
-  			   +"/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml "
-  			   +"applicationContext.xml "
-  			   +"/WEB-INF/spring/learningApplicationContext.xml";
-    }
-    
-    /**
      * Constructor for TestLearnerAction.
      * @param testName
      */
@@ -153,11 +141,4 @@
         verifyNoActionErrors();
     }
 
-    /**
-     * @see org.lamsfoundation.lams.AbstractLamsStrutsTestCase#getHibernateSessionFactoryBeanName()
-     */
-    protected String getHibernateSessionFactoryBeanName()
-    {
-        return "coreSessionFactory";
-    }
-}
+ }
Index: lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java
===================================================================
diff -u -r7004e007a05141f613649b0833e32a9989d04eda -r6faa51252d8f8117db65e0a58ff295def4cf7af9
--- lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java	(.../TestMonitoringService.java)	(revision 7004e007a05141f613649b0833e32a9989d04eda)
+++ lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java	(.../TestMonitoringService.java)	(revision 6faa51252d8f8117db65e0a58ff295def4cf7af9)
@@ -25,7 +25,7 @@
 
 import javax.sql.DataSource;
 
-import org.lamsfoundation.lams.AbstractLamsTestCase;
+import org.lamsfoundation.lams.test.AbstractLamsTestCase;
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.learningdesign.GateActivity;
 import org.lamsfoundation.lams.learningdesign.Grouping;
@@ -123,7 +123,7 @@
     protected String[] getContextConfigLocation()
     {
         return new String[] { 
-        		"/org/lamsfoundation/lams/applicationContext.xml",
+        		"/org/lamsfoundation/lams/localApplicationContext.xml",
         		"/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml",
         		"/org/lamsfoundation/lams/tool/toolApplicationContext.xml",
           		"/org/lamsfoundation/lams/learning/learningApplicationContext.xml",        					  
Index: lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/web/TestGateAction.java
===================================================================
diff -u -rbded5f003fed0807016eb890b55c227956f3cf6d -r6faa51252d8f8117db65e0a58ff295def4cf7af9
--- lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/web/TestGateAction.java	(.../TestGateAction.java)	(revision bded5f003fed0807016eb890b55c227956f3cf6d)
+++ lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/web/TestGateAction.java	(.../TestGateAction.java)	(revision 6faa51252d8f8117db65e0a58ff295def4cf7af9)
@@ -22,7 +22,7 @@
 
 package org.lamsfoundation.lams.monitoring.web;
 
-import org.lamsfoundation.lams.AbstractLamsStrutsTestCase;
+import org.lamsfoundation.lams.test.AbstractLamsStrutsTestCase;
 
 
 /**
@@ -72,7 +72,7 @@
      */
     protected String getContextConfigLocation()
     {
-        return 	"/org/lamsfoundation/lams/applicationContext.xml "+
+        return 	"/org/lamsfoundation/lams/localApplicationContext.xml "+
 		"/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml "+
 		"/org/lamsfoundation/lams/tool/toolApplicationContext.xml "+
   		"/org/lamsfoundation/lams/learning/learningApplicationContext.xml "+        					  
Index: lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/web/TestMonitoringAction.java
===================================================================
diff -u -r0f7e37f5aaf3d96fa1b617b88ad35256cdcdbb6e -r6faa51252d8f8117db65e0a58ff295def4cf7af9
--- lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/web/TestMonitoringAction.java	(.../TestMonitoringAction.java)	(revision 0f7e37f5aaf3d96fa1b617b88ad35256cdcdbb6e)
+++ lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/web/TestMonitoringAction.java	(.../TestMonitoringAction.java)	(revision 6faa51252d8f8117db65e0a58ff295def4cf7af9)
@@ -22,7 +22,7 @@
 
 package org.lamsfoundation.lams.monitoring.web;
 
-import org.lamsfoundation.lams.AbstractLamsStrutsTestCase;
+import org.lamsfoundation.lams.test.AbstractLamsStrutsTestCase;
 
 /**
  * 
@@ -58,7 +58,7 @@
      */
     protected String getContextConfigLocation()
     {
-        return 	"/org/lamsfoundation/lams/applicationContext.xml "+
+        return 	"/org/lamsfoundation/lams/localApplicationContext.xml "+
 		"/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml "+
 		"/org/lamsfoundation/lams/tool/toolApplicationContext.xml "+
   		"/org/lamsfoundation/lams/learning/learningApplicationContext.xml "+