Index: lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java
===================================================================
diff -u -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 -rd1b5a741bb40c5bf60ff7d55fa11322ed769644f
--- lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java	(.../ToolDataAccessTestCase.java)	(revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7)
+++ lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java	(.../ToolDataAccessTestCase.java)	(revision d1b5a741bb40c5bf60ff7d55fa11322ed769644f)
@@ -53,6 +53,11 @@
     
     //Test tool id - survey tool
     protected final Long TEST_TOOL_ID = new Long(6);
+    protected final String TEST_TOOL_SIG = "survey_signature";
+    protected final String TEST_TOOL_SERVICE_NAME = "surveyService";
+    protected final String TEST_TOOL_DISPLAY_NAME = "Survey";
+    protected final long TEST_TOOL_DEFAULT_CONTENT_ID = 6;
+
     protected Tool testTool;
     protected ToolSession ngToolSession;
     protected ToolSession gToolSession;
Index: lams_common/test/java/org/lamsfoundation/lams/tool/dao/TestToolDAO.java
===================================================================
diff -u -raa08b1215054e853665848e2e59db391c672679b -rd1b5a741bb40c5bf60ff7d55fa11322ed769644f
--- lams_common/test/java/org/lamsfoundation/lams/tool/dao/TestToolDAO.java	(.../TestToolDAO.java)	(revision aa08b1215054e853665848e2e59db391c672679b)
+++ lams_common/test/java/org/lamsfoundation/lams/tool/dao/TestToolDAO.java	(.../TestToolDAO.java)	(revision d1b5a741bb40c5bf60ff7d55fa11322ed769644f)
@@ -51,17 +51,17 @@
 
     public void testGetToolBySignature()
     {
-    	Tool Tool = toolDao.getToolBySignature("chat_signature");
-        assertEquals(new Long(8),testTool.getToolId());
+    	testTool = toolDao.getToolBySignature(TEST_TOOL_SIG);
+        assertEquals(TEST_TOOL_ID,testTool.getToolId());
     }
 
     public void testGetToolByID()
     {
         testTool = toolDao.getToolByID(super.TEST_TOOL_ID);
-        assertEquals("verify signature","survey_signature",testTool.getToolSignature());
-        assertEquals("verify service name","surveyService",testTool.getServiceName());
-        assertEquals("verify display name","Survey",testTool.getToolDisplayName());
-        assertEquals("verify default content id",6,testTool.getDefaultToolContentId());
+        assertEquals("verify signature",TEST_TOOL_SIG,testTool.getToolSignature());
+        assertEquals("verify service name",TEST_TOOL_SERVICE_NAME,testTool.getServiceName());
+        assertEquals("verify display name",TEST_TOOL_DISPLAY_NAME,testTool.getToolDisplayName());
+        assertEquals("verify default content id",TEST_TOOL_DEFAULT_CONTENT_ID,testTool.getDefaultToolContentId());
         assertTrue("verify support define later",testTool.getSupportsDefineLater());
     }