Index: lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/NbDataAccessTestCase.java
===================================================================
diff -u -r89ec1520b85c8244b79c0a2f139a9bfc298e0046 -rf6cce2077fd9f31c46dffd8be3c234ea4f89dfdc
--- lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/NbDataAccessTestCase.java	(.../NbDataAccessTestCase.java)	(revision 89ec1520b85c8244b79c0a2f139a9bfc298e0046)
+++ lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/NbDataAccessTestCase.java	(.../NbDataAccessTestCase.java)	(revision f6cce2077fd9f31c46dffd8be3c234ea4f89dfdc)
@@ -142,9 +142,9 @@
     protected String[] getContextConfigLocation() {
     	return new String[] {
     	        "org/lamsfoundation/lams/localApplicationContext.xml",
-    			//"org/lamsfoundation/lams/lesson/lessonApplicationContext.xml",
-    			//"org/lamsfoundation/lams/tool/toolApplicationContext.xml",
-    			//"org/lamsfoundation/lams/learning/learningApplicationContext.xml",
+    			"org/lamsfoundation/lams/lesson/lessonApplicationContext.xml",
+    			"org/lamsfoundation/lams/tool/toolApplicationContext.xml",
+    			"org/lamsfoundation/lams/learning/learningApplicationContext.xml",
     			"org/lamsfoundation/lams/tool/noticeboard/testApplicationContext.xml"};
     }
     
@@ -240,27 +240,22 @@
     	initNbUserData();
     }
     
-    protected void restoreDefaultContent()
+    protected void restoreDefaultContent(Long defaultContentId)
     {
-        nbContent = new NoticeboardContent(DEFAULT_CONTENT_ID,	
+        nbContent = new NoticeboardContent(defaultContentId,	
                 DEFAULT_TITLE,
                 DEFAULT_CONTENT,
                 DEFAULT_ONLINE_INSTRUCTIONS,
                 DEFAULT_OFFLINE_INSTRUCTIONS,
                 DEFAULT_DEFINE_LATER,
                 DEFAULT_FORCE_OFFLINE,
                 DEFAULT_CONTENT_IN_USE,
-				DEFAULT_CREATOR_USER_ID,
+				null,
 				TEST_DATE_CREATED,
-				TEST_DATE_UPDATED);
+				null);
 
         noticeboardDAO.saveNbContent(nbContent);
-        
-        nbSession = new NoticeboardSession(DEFAULT_SESSION_ID,
-                							nbContent,
-                							TEST_DATE_CREATED,
-                							DEFAULT_SESSION_STATUS);
-        nbSessionDAO.saveNbSession(nbSession);
+ 
     }
     
     //===========================