diff --git a/YACOSTest/src/org/yacos/tests/core/ConferenceManagerTest.java b/YACOSTest/src/org/yacos/tests/core/ConferenceManagerTest.java
index 61f3540..9de0089 100644
--- a/YACOSTest/src/org/yacos/tests/core/ConferenceManagerTest.java
+++ b/YACOSTest/src/org/yacos/tests/core/ConferenceManagerTest.java
@@ -84,7 +84,7 @@ public class ConferenceManagerTest {
 	
 	@Test
 	public void addRoleForUserTest(){
-		cm.addRole(Role.RoleType.AUTHOR, "max" , id);	
+		cm.addRole(Role.RoleType.AUTHOR, "max" , id);
 	}
 		
 	@Test
diff --git a/YACOSTest/src/org/yacos/tests/core/EvaluationManagerTest.java b/YACOSTest/src/org/yacos/tests/core/EvaluationManagerTest.java
index 652998c..1424093 100644
--- a/YACOSTest/src/org/yacos/tests/core/EvaluationManagerTest.java
+++ b/YACOSTest/src/org/yacos/tests/core/EvaluationManagerTest.java
@@ -1,7 +1,6 @@
 package org.yacos.tests.core;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.*;
 
 import java.util.Date;
 import java.util.List;
@@ -43,7 +42,8 @@ public class EvaluationManagerTest {
 	public void addCriterionsTest(){
 		Criterion crit;
 		crit = em.addCriterion("name", 0, 4, confId);
-		assertEquals(crit.getName(), "");
+		assertNotNull(crit);
+		assertEquals(crit.getName(), em.getCriterion(crit.getId()));
 	}
 	
 	@Test