Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml
===================================================================
diff -u -r748079a1454fb5ce008b036ee9ce98f11a528478 -re0ff580c5c2981a84c4edf93bf950b59c1fcabbf
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml	(.../Group.hbm.xml)	(revision 748079a1454fb5ce008b036ee9ce98f11a528478)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml	(.../Group.hbm.xml)	(revision e0ff580c5c2981a84c4edf93bf950b59c1fcabbf)
@@ -102,6 +102,7 @@
         name="grouping"
         class="org.lamsfoundation.lams.learningdesign.Grouping"
         not-null="true"
+        update="false"
         cascade="none"
     >
         <meta attribute="field-description">
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml
===================================================================
diff -u -r748079a1454fb5ce008b036ee9ce98f11a528478 -re0ff580c5c2981a84c4edf93bf950b59c1fcabbf
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml	(.../Grouping.hbm.xml)	(revision 748079a1454fb5ce008b036ee9ce98f11a528478)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml	(.../Grouping.hbm.xml)	(revision e0ff580c5c2981a84c4edf93bf950b59c1fcabbf)
@@ -78,8 +78,7 @@
         			 class="org.lamsfoundation.lams.learningdesign.Group" 
         			 column="staff_group_id" 
         			 unique="true"
-        			 update="false"
-        			 cascade="delete"/>
+        			 cascade="all"/>
         <!-- 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 -r748079a1454fb5ce008b036ee9ce98f11a528478 -re0ff580c5c2981a84c4edf93bf950b59c1fcabbf
--- lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java	(.../LessonDataAccessTestCase.java)	(revision 748079a1454fb5ce008b036ee9ce98f11a528478)
+++ lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java	(.../LessonDataAccessTestCase.java)	(revision e0ff580c5c2981a84c4edf93bf950b59c1fcabbf)
@@ -165,14 +165,13 @@
      */
     protected void cleanUpLesson(Lesson lesson)
     {
-
         lessonDao.deleteLesson(lesson);
     }
     
     protected void cleanUpTestLesson() throws HibernateException
     {
         //super.initializeHibernateSession();
-
+        //super.getSession().lock(testLesson,LockMode.READ);
         this.cleanUpLesson(testLesson);
         
         //super.finalizeHibernateSession();
Index: lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestLearnerProgressDAO.java
===================================================================
diff -u -reebb8a769eaea86040e70ebfe1ee27adf3435148 -re0ff580c5c2981a84c4edf93bf950b59c1fcabbf
--- lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestLearnerProgressDAO.java	(.../TestLearnerProgressDAO.java)	(revision eebb8a769eaea86040e70ebfe1ee27adf3435148)
+++ lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestLearnerProgressDAO.java	(.../TestLearnerProgressDAO.java)	(revision e0ff580c5c2981a84c4edf93bf950b59c1fcabbf)
@@ -51,8 +51,9 @@
      */
     protected void tearDown() throws Exception
     {
-        super.tearDown();
         super.cleanUpTestLesson();
+        super.tearDown();
+
     }
 
     /**
@@ -70,31 +71,40 @@
         assertNull("should not get any progress data",progress);
     }
 
-    public void testSaveLearnerProgress()
+    public void testSaveLearnerProgress() throws HibernateException
     {
         super.learnerProgressDao.saveLearnerProgress(this.testLearnerProgress);
         
         LearnerProgress progress= learnerProgressDao.getLearnerProgressByLeaner(testUser,testLesson);
         assertLearnerProgressInitialization(progress);
+        
+        super.learnerProgressDao.deleteLearnerProgress(testLearnerProgress);
+        super.getSession().flush();
     }
-
-    public void testGetLearnerProgressByLeaner()
+    
+    public void testDeleteLearnerProgress() throws HibernateException
     {
         super.learnerProgressDao.saveLearnerProgress(this.testLearnerProgress);
-        LearnerProgress progress= learnerProgressDao.getLearnerProgressByLeaner(testUser,testLesson);
+
+        LearnerProgress progress = learnerProgressDao.getLearnerProgress(testLearnerProgress.getLearnerProgressId());
         assertLearnerProgressInitialization(progress);
+        
+        super.learnerProgressDao.deleteLearnerProgress(testLearnerProgress);
+        super.getSession().flush();
+        LearnerProgress nullProgress= learnerProgressDao.getLearnerProgressByLeaner(testUser,testLesson);
+        assertNull("should not get any progress data",nullProgress);
+
     }
-    
-    public void testGetLearnerProgress()
+    public void testGetLearnerProgressByLeaner() throws HibernateException
     {
         super.learnerProgressDao.saveLearnerProgress(this.testLearnerProgress);
-
-        LearnerProgress progress = learnerProgressDao.getLearnerProgress(testLearnerProgress.getLearnerProgressId());
+        LearnerProgress progress= learnerProgressDao.getLearnerProgressByLeaner(testUser,testLesson);
         assertLearnerProgressInitialization(progress);
+        super.learnerProgressDao.deleteLearnerProgress(testLearnerProgress);
+        super.getSession().flush();
     }
-
-
-    public void testDeleteLearnerProgress() throws HibernateException
+    
+    public void testGetLearnerProgress() throws HibernateException
     {
         super.learnerProgressDao.saveLearnerProgress(this.testLearnerProgress);
 
@@ -103,12 +113,12 @@
         
         super.learnerProgressDao.deleteLearnerProgress(testLearnerProgress);
         super.getSession().flush();
-        LearnerProgress nullProgress= learnerProgressDao.getLearnerProgressByLeaner(testUser,testLesson);
-        assertNull("should not get any progress data",nullProgress);
-
     }
 
-    public void testUpdateLearnerProgress()
+
+
+
+    public void testUpdateLearnerProgress() throws HibernateException
     {
         super.learnerProgressDao.saveLearnerProgress(this.testLearnerProgress);
         LearnerProgress progress= learnerProgressDao.getLearnerProgressByLeaner(testUser,testLesson);
@@ -126,6 +136,8 @@
         assertEquals("verify completed activity",2,updatedProgress.getCompletedActivities().size());
         assertEquals("verify attempted activity",1,updatedProgress.getAttemptedActivities().size());
         
+        super.learnerProgressDao.deleteLearnerProgress(testLearnerProgress);
+        super.getSession().flush();
     }
 
     /**