Index: lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/dao/ForumDAOTest.java
===================================================================
diff -u -ra95235508798fd78a88bd54a8f067b4936a1d8fa -r5f8e80cc34c22efcf4eb952bd0f6d7a05f6a702c
--- lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/dao/ForumDAOTest.java	(.../ForumDAOTest.java)	(revision a95235508798fd78a88bd54a8f067b4936a1d8fa)
+++ lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/dao/ForumDAOTest.java	(.../ForumDAOTest.java)	(revision 5f8e80cc34c22efcf4eb952bd0f6d7a05f6a702c)
@@ -45,7 +45,6 @@
 		Forum forum = TestUtils.getForumA();
 		forumDao.saveOrUpdate(forum);
 			
-		//remove test data
 		forumDao.delete(forum);
 		
 		assertNull(forumDao.getById(forum.getUid()));
@@ -57,6 +56,10 @@
 		forumDao.saveOrUpdate(forum);
 		Forum tforum = forumDao.getByContentId(forum.getContentId());
 		assertEquals(tforum, forum);
+		
+		//remove test data
+		forumDao.delete(forum);
+		
 	}
 
 }
Index: lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/dao/MessageDAOTest.java
===================================================================
diff -u -ra95235508798fd78a88bd54a8f067b4936a1d8fa -r5f8e80cc34c22efcf4eb952bd0f6d7a05f6a702c
--- lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/dao/MessageDAOTest.java	(.../MessageDAOTest.java)	(revision a95235508798fd78a88bd54a8f067b4936a1d8fa)
+++ lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/dao/MessageDAOTest.java	(.../MessageDAOTest.java)	(revision 5f8e80cc34c22efcf4eb952bd0f6d7a05f6a702c)
@@ -151,6 +151,7 @@
 		//remove test data
 		messageDao.delete(msgB.getUid());
 		messageDao.delete(msgA.getUid());
+		forumToolSessionDao.delete(sessionA);
 	}
 	public void testGetChildrenTopics(){
 		Message msgA = TestUtils.getMessageA();
Index: lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/service/ForumServiceTest.java
===================================================================
diff -u -ra95235508798fd78a88bd54a8f067b4936a1d8fa -r5f8e80cc34c22efcf4eb952bd0f6d7a05f6a702c
--- lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/service/ForumServiceTest.java	(.../ForumServiceTest.java)	(revision a95235508798fd78a88bd54a8f067b4936a1d8fa)
+++ lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/service/ForumServiceTest.java	(.../ForumServiceTest.java)	(revision 5f8e80cc34c22efcf4eb952bd0f6d7a05f6a702c)
@@ -51,7 +51,7 @@
 	}
 	public void testUpdateForum(){
 		ForumUser user = TestUtils.getUserA();
-		forumService.createUser(user);
+		forumUserDao.save(user);
 		
 		Forum forum = TestUtils.getForumA();
 		forum.setCreatedBy(user);
@@ -202,5 +202,9 @@
 		forumService.createUser(userA);
 		ForumUser user = forumService.getUser(userA.getUid());
 		assertEquals(userA,user);
+		
+		
+//		remove test data
+		forumUserDao.delete(userA);
 	}
 }