Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java
===================================================================
diff -u -r174fa126cd5cc9d88eb39d6596af0453a2b77e49 -re3ac07f9808b1feee9b3e3cf1a5c868f1ad37280
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java	(.../ToolActivity.java)	(revision 174fa126cd5cc9d88eb39d6596af0453a2b77e49)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java	(.../ToolActivity.java)	(revision e3ac07f9808b1feee9b3e3cf1a5c868f1ad37280)
@@ -6,6 +6,7 @@
 import java.util.Set;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
+import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.tool.GroupedToolSession;
 import org.lamsfoundation.lams.tool.NonGroupedToolSession;
 import org.lamsfoundation.lams.tool.Tool;
@@ -147,18 +148,20 @@
      * @param learner the user who should be using this tool session.
      * @return the new tool session.
      */
-    public ToolSession createToolSessionForActivity(User learner)
+    public ToolSession createToolSessionForActivity(User learner,Lesson lesson)
     {
         if(this.getTool().getSupportsGrouping())
             return new GroupedToolSession(this,
                                           new Date(System.currentTimeMillis()),
                                           ToolSession.STARTED_STATE,
-                                          this.getGroupFor(learner));
+                                          this.getGroupFor(learner),
+                                          lesson);
         else
             return new NonGroupedToolSession(this,
                                              new Date(System.currentTimeMillis()),
                                              ToolSession.STARTED_STATE,
-                                             learner);
+                                             learner,
+                                             lesson);
     }
     
     public String toString()
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java
===================================================================
diff -u -r6935a6aa9c04d7ef01ed59b9115e23bdbe7b337a -re3ac07f9808b1feee9b3e3cf1a5c868f1ad37280
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java	(.../ILamsToolService.java)	(revision 6935a6aa9c04d7ef01ed59b9115e23bdbe7b337a)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java	(.../ILamsToolService.java)	(revision e3ac07f9808b1feee9b3e3cf1a5c868f1ad37280)
@@ -10,6 +10,7 @@
 
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.learningdesign.ToolActivity;
+import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.tool.ToolSession;
 import org.lamsfoundation.lams.usermanagement.User;
 /**
@@ -35,7 +36,7 @@
      * @param learner
      * @param activity
      */
-    public ToolSession createToolSession(User learner, ToolActivity activity) throws LamsToolServiceException;
+    public ToolSession createToolSession(User learner, ToolActivity activity,Lesson lesson) throws LamsToolServiceException;
     
     
     /**
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java
===================================================================
diff -u -r6935a6aa9c04d7ef01ed59b9115e23bdbe7b337a -re3ac07f9808b1feee9b3e3cf1a5c868f1ad37280
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java	(.../LamsToolService.java)	(revision 6935a6aa9c04d7ef01ed59b9115e23bdbe7b337a)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java	(.../LamsToolService.java)	(revision e3ac07f9808b1feee9b3e3cf1a5c868f1ad37280)
@@ -24,6 +24,7 @@
 
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.learningdesign.ToolActivity;
+import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.tool.ToolContentIDGenerator;
 import org.lamsfoundation.lams.tool.ToolContentManager;
 import org.lamsfoundation.lams.tool.ToolSession;
@@ -89,9 +90,9 @@
     /**
      * @see org.lamsfoundation.lams.tool.service.ILamsToolService#createToolSession(org.lamsfoundation.lams.usermanagement.User, org.lamsfoundation.lams.learningdesign.Activity)
      */
-    public ToolSession createToolSession(User learner, ToolActivity activity) throws LamsToolServiceException
+    public ToolSession createToolSession(User learner, ToolActivity activity,Lesson lesson) throws LamsToolServiceException
     {
-        ToolSession toolSession = activity.createToolSessionForActivity(learner);
+        ToolSession toolSession = activity.createToolSessionForActivity(learner,lesson);
         
         toolSessionDAO.saveToolSession(toolSession);
         
Index: lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestCleanUpLesson.java
===================================================================
diff -u -rf686b51b897a2e4c136afba6f4ca9b896b493b87 -re3ac07f9808b1feee9b3e3cf1a5c868f1ad37280
--- lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestCleanUpLesson.java	(.../TestCleanUpLesson.java)	(revision f686b51b897a2e4c136afba6f4ca9b896b493b87)
+++ lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestCleanUpLesson.java	(.../TestCleanUpLesson.java)	(revision e3ac07f9808b1feee9b3e3cf1a5c868f1ad37280)
@@ -14,6 +14,7 @@
 
 import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.lesson.LessonDataAccessTestCase;
+import org.lamsfoundation.lams.tool.ToolDataAccessTestCase;
 
 
 /**
@@ -23,7 +24,6 @@
  */
 public class TestCleanUpLesson extends LessonDataAccessTestCase
 {
-    private static Long TEST_LESSON_ID = new Long(1);
     /**
      * @param name
      */
@@ -55,9 +55,10 @@
         for(Iterator i = lessons.iterator();i.hasNext();)
         {
             Lesson curLesson = (Lesson)i.next();
-            super.cleanUpLesson(curLesson);
+            if(curLesson.getLessonId().longValue()!=ToolDataAccessTestCase.TEST_LESSON_ID.longValue())
+                super.cleanUpLesson(curLesson);
         }
         List cleanedLessons = lessonDao.getAllLessons();
-        assertEquals("There should be a lesson in the db",0,cleanedLessons.size());
+        assertEquals("There should be only one lesson in the db",1,cleanedLessons.size());
     }
 }
Index: lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java
===================================================================
diff -u -raf2133eea2be056c211a5c29d6f68a3d8595a513 -re3ac07f9808b1feee9b3e3cf1a5c868f1ad37280
--- lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java	(.../ToolDataAccessTestCase.java)	(revision af2133eea2be056c211a5c29d6f68a3d8595a513)
+++ lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java	(.../ToolDataAccessTestCase.java)	(revision e3ac07f9808b1feee9b3e3cf1a5c868f1ad37280)
@@ -66,7 +66,7 @@
     private final static Long TEST_NON_GROUP_ACTIVITY_ID = new Long(20);
     private static final Long TEST_GROUPED_ACTIVITY_ID = new Long(19);
     private static final Long TEST_GROUP_ID = new Long(88);
-    private static final Long TEST_LESSON_ID = new Long(1);
+    public static final Long TEST_LESSON_ID = new Long(1);
     
     /*
      * @see AbstractLamsCommonTestCase#setUp()