Index: lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/service/TestToolSessionManager.java
===================================================================
diff -u -rdb180db20bcc6d746d8a5e9a173742a85eaeacee -rca8040f0b17bc00f1411dd785b1c973accb0545c
--- lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/service/TestToolSessionManager.java	(.../TestToolSessionManager.java)	(revision db180db20bcc6d746d8a5e9a173742a85eaeacee)
+++ lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/service/TestToolSessionManager.java	(.../TestToolSessionManager.java)	(revision ca8040f0b17bc00f1411dd785b1c973accb0545c)
@@ -149,14 +149,15 @@
 	        fail("An exception should not have been thrown");
 	        assertTrue(false);
 	    }
-	}
+	} 
 	/*
 	 * Error case: the default content is missing, throws ToolException
 	 */
 	
 	public void testCreateToolSessionDefaultContentMissing() throws ToolException
 	{
-	    nbService.removeNoticeboard(nbService.getToolDefaultContentIdBySignature(NoticeboardConstants.TOOL_SIGNATURE));
+		Long defaultContentId = nbService.getToolDefaultContentIdBySignature(NoticeboardConstants.TOOL_SIGNATURE);
+	    nbService.removeNoticeboard(defaultContentId);
 	    
 	    try
 	    {
@@ -169,8 +170,8 @@
 	        assertTrue(true);
 	    }
 	    
-	    this.restoreDefaultContent();
-	}
+	    restoreDefaultContent(defaultContentId);
+	} 
 	
 	/*
 	 * Normal case: