Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml
===================================================================
diff -u -r873a301c0dec70b20a9c31aa7183e5848f8d653f -r748079a1454fb5ce008b036ee9ce98f11a528478
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml	(.../Group.hbm.xml)	(revision 873a301c0dec70b20a9c31aa7183e5848f8d653f)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml	(.../Group.hbm.xml)	(revision 748079a1454fb5ce008b036ee9ce98f11a528478)
@@ -102,6 +102,7 @@
         name="grouping"
         class="org.lamsfoundation.lams.learningdesign.Grouping"
         not-null="true"
+        cascade="none"
     >
         <meta attribute="field-description">
            @hibernate.many-to-one
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml
===================================================================
diff -u -r873a301c0dec70b20a9c31aa7183e5848f8d653f -r748079a1454fb5ce008b036ee9ce98f11a528478
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml	(.../Grouping.hbm.xml)	(revision 873a301c0dec70b20a9c31aa7183e5848f8d653f)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml	(.../Grouping.hbm.xml)	(revision 748079a1454fb5ce008b036ee9ce98f11a528478)
@@ -78,7 +78,8 @@
         			 class="org.lamsfoundation.lams.learningdesign.Group" 
         			 column="staff_group_id" 
         			 unique="true"
-        			 cascade="all"/>
+        			 update="false"
+        			 cascade="delete"/>
         <!-- bi-directional one-to-one association to Lesson -->
         <one-to-one name="lesson"
         	class="org.lamsfoundation.lams.lesson.Lesson"
Index: lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java
===================================================================
diff -u -rffa7af2bba64347997658f2eab6c8cebd9280cec -r748079a1454fb5ce008b036ee9ce98f11a528478
--- lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java	(.../LessonDataAccessTestCase.java)	(revision ffa7af2bba64347997658f2eab6c8cebd9280cec)
+++ lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java	(.../LessonDataAccessTestCase.java)	(revision 748079a1454fb5ce008b036ee9ce98f11a528478)
@@ -16,6 +16,7 @@
 import junit.framework.TestCase;
 
 import net.sf.hibernate.HibernateException;
+import net.sf.hibernate.LockMode;
 
 import org.lamsfoundation.lams.AbstractLamsTestCase;
 import org.lamsfoundation.lams.learningdesign.Group;
@@ -145,10 +146,10 @@
     {
         this.initLessonClassData();
         lessonClassDao.saveLessonClass(this.testLessonClass);
-        
+
         this.setUpGroupsForClass();
         lessonClassDao.updateLessonClass(this.testLessonClass);
-        
+
         this.initLessonData();
         lessonDao.saveLesson(testLesson);
         
@@ -164,18 +165,17 @@
      */
     protected void cleanUpLesson(Lesson lesson)
     {
-        lesson.getLessonClass().getGroups().clear();
+
         lessonDao.deleteLesson(lesson);
     }
     
     protected void cleanUpTestLesson() throws HibernateException
     {
-        super.initializeHibernateSession();
+        //super.initializeHibernateSession();
+
+        this.cleanUpLesson(testLesson);
         
-        Lesson lesson = lessonDao.getLesson(this.testLesson.getLessonId());
-        this.cleanUpLesson(lesson);
-        
-        super.finalizeHibernateSession();
+        //super.finalizeHibernateSession();
     }
     /**
      * Create a lesson class with empty group information.
@@ -217,7 +217,9 @@
                                             new HashSet());//tool session, should be empty now
 
         learnergroups.add(learnerClassGroup);
+        learnergroups.add(staffGroup);
         testLessonClass.setGroups(learnergroups);
+
     }
     
     /**
Index: lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestLessonDAO.java
===================================================================
diff -u -rffa7af2bba64347997658f2eab6c8cebd9280cec -r748079a1454fb5ce008b036ee9ce98f11a528478
--- lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestLessonDAO.java	(.../TestLessonDAO.java)	(revision ffa7af2bba64347997658f2eab6c8cebd9280cec)
+++ lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestLessonDAO.java	(.../TestLessonDAO.java)	(revision 748079a1454fb5ce008b036ee9ce98f11a528478)
@@ -42,8 +42,9 @@
      */
     protected void tearDown() throws Exception
     {
-        super.tearDown();
         super.cleanUpTestLesson();
+        super.tearDown();
+
     }
     
     public void testGetLessonWithEagerlyFetchedProgress()
@@ -52,6 +53,7 @@
         
         //assert the data retrieved.
         super.assertLesson(createdLesson);
+        
     }
 
     public void testUpdateLesson()