diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/TestServer/ConnectionHandling.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/TestServer/ConnectionHandling.java
index 4675cb794f806bb58f65ee254cf0bb2864c14769..7a61a050eaee14d35729fefa5f80878bada81523 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/TestServer/ConnectionHandling.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/TestServer/ConnectionHandling.java
@@ -7,7 +7,8 @@ public class ConnectionHandling {
     public static void main(String[] args) throws IOException {
         Client client = new Client();
         client.startConnection("localhost", 45371);
-        String response = client.sendMessage("hello server");
-        System.out.println("Response: " + response);
+        String response = client.sendMessage("hello");
+        System.out.println(response);
+
     }
 }
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/TestServer/Server.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/TestServer/Server.java
index e1ad2301f1498e14a91d6f96274736c8b9d56504..5c14c36e43349a1a25cf964c99cd6d4132607373 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/TestServer/Server.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/TestServer/Server.java
@@ -33,11 +33,14 @@ public class Server {
         in = new BufferedReader(new InputStreamReader(clientSocket.getInputStream()));
 
         String greeting = in.readLine();
-        if ("hello server".equals(greeting)) {
-            out.println("hello client");
+
+        String message =  "Your Message was: " + greeting;
+
+        if ("hello".equals(greeting)) {
+            out.println("hello client " + message);
         }
         else {
-            out.println("unrecognised greeting");
+            out.println("unrecognised greeting " + message);
         }
     }