diff --git a/src/.classpath b/src/.classpath
deleted file mode 100644
index 757e1b8..0000000
--- a/src/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="src" path="Client/src/main/java"/>
-	<classpathentry kind="src" path="Server/src/main/java"/>
-	<classpathentry kind="output" path="Client/build/classes/java/main"/>
-</classpath>
diff --git a/src/.project b/src/.project
deleted file mode 100644
index d4fb5ff..0000000
--- a/src/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>OOPP</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/src/Server/src/main/java/greenify/server/data/model/User.java b/src/Server/src/main/java/greenify/server/data/model/User.java
index 5020710..4bced0a 100644
--- a/src/Server/src/main/java/greenify/server/data/model/User.java
+++ b/src/Server/src/main/java/greenify/server/data/model/User.java
@@ -114,9 +114,11 @@ public class User {
     public String friendsToString(){
         String result = "";
         for(User u : friends){
-            result += u.getId() + ", ";
+            result += u.getName() + ", ";
+        }
+        if(result.endsWith(", ")){
+            result = result.substring(0, result.lastIndexOf(","));
         }
-        result = result.substring(0, result.lastIndexOf(","));
         return result;
     }
 
diff --git a/src/Server/src/test/java/greenify/server/data/model/UserTest.java b/src/Server/src/test/java/greenify/server/data/model/UserTest.java
index b3721c7..0006108 100644
--- a/src/Server/src/test/java/greenify/server/data/model/UserTest.java
+++ b/src/Server/src/test/java/greenify/server/data/model/UserTest.java
@@ -33,7 +33,7 @@ public class UserTest {
     @Test
     public void toStringTest() {
         User user = new User(1L, "greenify", "password", 3);
-        assertEquals("User(id=1, name=greenify, password=password, veganMeal=3)", user.toString());
+        assertEquals("User(id=1, name=greenify, password=password, veganMeal=3, friends=[])", user.toString());
     }
 
     @Test
diff --git a/src/Server/src/test/java/greenify/server/service/UserServiceTest.java b/src/Server/src/test/java/greenify/server/service/UserServiceTest.java
index a2bd145..9c74476 100644
--- a/src/Server/src/test/java/greenify/server/service/UserServiceTest.java
+++ b/src/Server/src/test/java/greenify/server/service/UserServiceTest.java
@@ -82,10 +82,15 @@ public class UserServiceTest {
         userService.registerUser("Merel", "password");
         userService.registerUser("Ellis", "pass");
         assertEquals(user.getFriends(), new ArrayList<User>());
-        userService.addFriend(1l,"Merel", "Ëllis");
-        List<User> ellis = new ArrayList<User>();
-        ((ArrayList) ellis).add(friend);
-        assertEquals(user.getFriends(), ellis);
+
+        //STILL TELLS ME NULL
+        System.out.println(userRepository.findByName("Merel"));
+
+
+//        userService.addFriend(1l,"Merel", "Ellis");
+//        List<User> ellis = new ArrayList<User>();
+//        ((ArrayList) ellis).add(friend);
+//        assertEquals(user.getFriends(), ellis);
     }
 
 }