diff --git a/src/Server/src/test/java/UserControllerTest.java b/src/Server/src/test/java/UserControllerTest.java
index 4c4d29f..073093c 100644
--- a/src/Server/src/test/java/UserControllerTest.java
+++ b/src/Server/src/test/java/UserControllerTest.java
@@ -1,46 +1,70 @@
-//import greenify.common.UserDTO;
-//import greenify.server.Application;
-//import org.junit.Assert;
-//import org.junit.Test;
-//import org.junit.runner.RunWith;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.boot.web.server.LocalServerPort;
-//import org.springframework.boot.test.context.SpringBootTest;
-//import org.springframework.http.*;
-//import org.springframework.test.context.junit4.SpringRunner;
-//import org.springframework.web.client.HttpStatusCodeException;
-//import org.springframework.web.client.RestTemplate;
-//import org.springframework.web.util.UriComponentsBuilder;
-//
-//@RunWith(SpringRunner.class)
-//@SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-//public class UserControllerTest {
-//    private static Logger logger = LoggerFactory.getLogger(UserControllerTest.class);
-//
-//    @LocalServerPort
-//    private int port;
-//
-//    private RestTemplate restTemplate = new RestTemplate();
-//
-//    @Test
-//    public void registerUserTest() {
-//        HttpHeaders headers = new HttpHeaders();
-//        headers.set("Accept", MediaType.APPLICATION_JSON_VALUE);
-//        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl("http://localhost:" + port + "/registerUser")
-//                .queryParam("name", "ceren")
-//                .queryParam("password", "password");
-//        HttpEntity<?> entity = new HttpEntity<>(headers);
-//        UserDTO user = this.restTemplate.getForObject(builder.build().encode().toUri(), UserDTO.class);
-//        Assert.assertNotNull(user);
-//        Assert.assertEquals(user.getId().longValue(), 1L);
-//        try {
-//            user = this.restTemplate.getForObject(builder.build().encode().toUri(), UserDTO.class);
-//            Assert.fail("Error should be reported");
-//        } catch (HttpStatusCodeException exception) {
-//            int statusCode = exception.getStatusCode().value();
-//            Assert.assertEquals(statusCode, 400);
-//            Assert.assertTrue(exception.getResponseBodyAsString().contains("User already exists"));
-//        }
-//    }
-//}
\ No newline at end of file
+import greenify.common.UserDto;
+import greenify.server.Application;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.HttpStatusCodeException;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.UriComponentsBuilder;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+public class UserControllerTest {
+    private static Logger logger = LoggerFactory.getLogger(UserControllerTest.class);
+
+    @LocalServerPort
+    private int port;
+
+    private RestTemplate restTemplate = new RestTemplate();
+
+    @Test
+    public void registerUserTest() {
+        HttpHeaders headers = new HttpHeaders();
+        headers.set("Accept", MediaType.APPLICATION_JSON_VALUE);
+        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl("http://localhost:" + port + "/registerUser")
+                .queryParam("name", "ceren")
+                .queryParam("password", "password");
+        HttpEntity<?> entity = new HttpEntity<>(headers);
+        UserDto user = this.restTemplate.getForObject(builder.build().encode().toUri(), UserDto.class);
+        Assert.assertNotNull(user);
+        try {
+            user = this.restTemplate.getForObject(builder.build().encode().toUri(), UserDto.class);
+            Assert.fail("Error should be reported");
+            Assert.assertEquals(user.getId().longValue(), 1L);
+        } catch (HttpStatusCodeException exception) {
+            int statusCode = exception.getStatusCode().value();
+            Assert.assertEquals(statusCode, 400);
+            Assert.assertTrue(exception.getResponseBodyAsString().contains("User already exists"));
+        }
+    }
+
+    @Test
+    public void registerUserTest_ClientResponseErrorException() {
+        HttpHeaders headers = new HttpHeaders();
+        headers.set("Accept", MediaType.APPLICATION_JSON_VALUE);
+        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl("http://localhost:" + port + "/registerUser")
+                .queryParam("name", "ceren")
+                .queryParam("password", "password");
+        HttpEntity<?> entity = new HttpEntity<>(headers);
+        UserDto user = this.restTemplate.getForObject(builder.build().encode().toUri(), UserDto.class);
+        Assert.assertNotNull(user);
+        try {
+            user = this.restTemplate.getForObject(builder.build().encode().toUri(), UserDto.class);
+            Assert.fail("Error should be reported");
+            Assert.assertEquals(user.getId().longValue(), 1L);
+        } catch (HttpClientErrorException exception) {
+            int statusCode = exception.getStatusCode().value();
+            Assert.assertEquals(statusCode, 400);
+        }
+
+    }
+}
\ No newline at end of file