Index: lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
===================================================================
diff -u -r8bad300543fcb9835328a90421398ce890566880 -r455d2b55eaef30c9e68a0fb6bdef036320ec54bd
--- lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java	(.../TestLearnerService.java)	(revision 8bad300543fcb9835328a90421398ce890566880)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java	(.../TestLearnerService.java)	(revision 455d2b55eaef30c9e68a0fb6bdef036320ec54bd)
@@ -392,4 +392,12 @@
         assertEquals("verify the completed activities",numberOfCompletedActivities,testProgress.getCompletedActivities().size());
         assertEquals("verify the attempted activities",numberOfAttemptedActivities,testProgress.getAttemptedActivities().size());
     }
+
+    /**
+     * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
+     */
+    protected String getHibernateSessionFactoryName()
+    {
+        return "coreSessionFactory";
+    }
 }
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestDisplayActivityAction.java
===================================================================
diff -u -r06dd563d92f6e9e88c76b708f5d9aeb3a61d4dcb -r455d2b55eaef30c9e68a0fb6bdef036320ec54bd
--- lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestDisplayActivityAction.java	(.../TestDisplayActivityAction.java)	(revision 06dd563d92f6e9e88c76b708f5d9aeb3a61d4dcb)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestDisplayActivityAction.java	(.../TestDisplayActivityAction.java)	(revision 455d2b55eaef30c9e68a0fb6bdef036320ec54bd)
@@ -54,13 +54,13 @@
      */
     public TestDisplayActivityAction(String arg0)
     {
-        super(arg0,getContextConfigLocation());
+        super(arg0);
     }
 
     /**
      * @see org.lamsfoundation.lams.AbstractLamsStrutsTestCase#getContextConfigLocation()
      */
-    private static String getContextConfigLocation()
+    protected String getContextConfigLocation()
     {
         return "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml "
 		   	   +"/org/lamsfoundation/lams/tool/toolApplicationContext.xml "
@@ -69,6 +69,13 @@
 		   	   +"/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 -r715f8fde307b93cafb4b879577610d159684aaf6 -r455d2b55eaef30c9e68a0fb6bdef036320ec54bd
--- lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGateAction.java	(.../TestGateAction.java)	(revision 715f8fde307b93cafb4b879577610d159684aaf6)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGateAction.java	(.../TestGateAction.java)	(revision 455d2b55eaef30c9e68a0fb6bdef036320ec54bd)
@@ -60,20 +60,26 @@
      */
     public TestGateAction(String testName)
     {
-        super(testName,getContextConfigLocation());
+        super(testName);
     }
     /**
      * @see org.lamsfoundation.lams.AbstractLamsStrutsTestCase#getContextConfigLocation()
      */
-    private static String 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 -r715f8fde307b93cafb4b879577610d159684aaf6 -r455d2b55eaef30c9e68a0fb6bdef036320ec54bd
--- lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGroupingAction.java	(.../TestGroupingAction.java)	(revision 715f8fde307b93cafb4b879577610d159684aaf6)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGroupingAction.java	(.../TestGroupingAction.java)	(revision 455d2b55eaef30c9e68a0fb6bdef036320ec54bd)
@@ -57,20 +57,28 @@
      */
     public TestGroupingAction(String testName)
     {
-        super(testName, getContextConfigLocation());
+        super(testName);
     }
 
     /**
      * @see org.lamsfoundation.lams.AbstractLamsStrutsTestCase#getContextConfigLocation()
      */
-    private static String 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 -r715f8fde307b93cafb4b879577610d159684aaf6 -r455d2b55eaef30c9e68a0fb6bdef036320ec54bd
--- lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestLearnerAction.java	(.../TestLearnerAction.java)	(revision 715f8fde307b93cafb4b879577610d159684aaf6)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestLearnerAction.java	(.../TestLearnerAction.java)	(revision 455d2b55eaef30c9e68a0fb6bdef036320ec54bd)
@@ -70,7 +70,7 @@
     /**
      * @see org.lamsfoundation.lams.AbstractLamsStrutsTestCase#getContextConfigLocation()
      */
-    private static String getContextConfigLocation()
+    protected String getContextConfigLocation()
     {
         return "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml "
   			   +"/org/lamsfoundation/lams/tool/toolApplicationContext.xml "
@@ -85,7 +85,7 @@
      */
     public TestLearnerAction(String testName)
     {
-        super(testName,getContextConfigLocation());
+        super(testName);
     }
 
     public void testGetActiveLessons()
@@ -152,4 +152,12 @@
         
         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 -rb763be8a2bbb86f0b8589ae2a51f64f69e9208c1 -r455d2b55eaef30c9e68a0fb6bdef036320ec54bd
--- lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java	(.../TestMonitoringService.java)	(revision b763be8a2bbb86f0b8589ae2a51f64f69e9208c1)
+++ lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java	(.../TestMonitoringService.java)	(revision 455d2b55eaef30c9e68a0fb6bdef036320ec54bd)
@@ -116,6 +116,13 @@
                               "/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml",        					  
         					  "applicationContext.xml"};
     }
+    /**
+     * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
+     */
+    protected String getHibernateSessionFactoryName()
+    {
+        return "coreSessionFactory";
+    }
     
     public void testInitializeLesson()
     {
@@ -173,23 +180,15 @@
 
     public void testOpenGate()
     {
-        Activity scheduleGate = activityDao.getActivityByActivityId(TEST_SCHEDULE_GATE_ID);
-        
-        monitoringService.openGate((GateActivity)scheduleGate);
-        
+        monitoringService.openGate(TEST_SCHEDULE_GATE_ID);
         Activity openedScheduleGate = activityDao.getActivityByActivityId(TEST_SCHEDULE_GATE_ID);
-        
         assertTrue("the gate should be opened",((GateActivity)openedScheduleGate).getGateOpen().booleanValue());
     }
 
     public void testCloseGate()
     {
-        Activity scheduleGate = activityDao.getActivityByActivityId(TEST_SCHEDULE_GATE_ID);
-        
-        monitoringService.closeGate((GateActivity)scheduleGate);
-        
+        monitoringService.closeGate(TEST_SCHEDULE_GATE_ID);
         Activity closedScheduleGate = activityDao.getActivityByActivityId(TEST_SCHEDULE_GATE_ID);
-        
         assertTrue("the gate should be closed",!((GateActivity)closedScheduleGate).getGateOpen().booleanValue());
     }
     
@@ -207,4 +206,5 @@
         testLearner = usermanageService.getUserById(TEST_LEARNER_ID);        
         testOrganisation = usermanageService.getOrganisationById(TEST_ORGANIZATION_ID);
     }
+
 }