Index: lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/service/TestToolContentManager.java
===================================================================
diff -u -rdb180db20bcc6d746d8a5e9a173742a85eaeacee -rf670c262772909e06e1bef7793bd748c82f1baf6
--- lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/service/TestToolContentManager.java	(.../TestToolContentManager.java)	(revision db180db20bcc6d746d8a5e9a173742a85eaeacee)
+++ lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/service/TestToolContentManager.java	(.../TestToolContentManager.java)	(revision f670c262772909e06e1bef7793bd748c82f1baf6)
@@ -82,6 +82,7 @@
 	     	cleanNbContentData(TEST_COPYNB_ID);
 	     }
      }
+	
 	/*
 	 * Normal Use case
 	 */
@@ -166,9 +167,10 @@
 	public void testCopyToolContentWithDefaultContentMissing() throws ToolException
 	{
 	   // cleanCopyContent = true;
-	    
+		Long defaultContentId = nbService.getToolDefaultContentIdBySignature(NoticeboardConstants.TOOL_SIGNATURE);
+			    
 	    //remove the default content so it will trigger the exception
-	    nbService.removeNoticeboard(nbService.getToolDefaultContentIdBySignature(NoticeboardConstants.TOOL_SIGNATURE));
+	    nbService.removeNoticeboard(defaultContentId);
 	    
 	    try
 	    {
@@ -182,8 +184,8 @@
 	        assertTrue(true); //an exception should not have been thrown since default content is there
 	    }
 	    
-	    this.restoreDefaultContent();
-	}
+	    restoreDefaultContent(defaultContentId);
+	} 
 	
 	/*
 	 * Normal case: 
@@ -361,5 +363,4 @@
   
 	}
 	
-	
 }