diff --git a/spring-data-rest/src/main/test/com/baeldung/validator/SpringDataRestValidatorTest.java b/spring-data-rest/src/test/java/com/baeldung/validator/SpringDataRestValidatorTest.java
similarity index 75%
rename from spring-data-rest/src/main/test/com/baeldung/validator/SpringDataRestValidatorTest.java
rename to spring-data-rest/src/test/java/com/baeldung/validator/SpringDataRestValidatorTest.java
index b185c6d5ab..300fc081d3 100644
--- a/spring-data-rest/src/main/test/com/baeldung/validator/SpringDataRestValidatorTest.java
+++ b/spring-data-rest/src/test/java/com/baeldung/validator/SpringDataRestValidatorTest.java
@@ -1,100 +1,86 @@
-package com.baeldung.validator;
-
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.redirectedUrl;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.http.MediaType;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.ResultActions;
-import org.springframework.test.web.servlet.ResultMatcher;
-import org.springframework.web.context.WebApplicationContext;
-
-import com.baeldung.SpringDataRestApplication;
-import com.baeldung.models.WebsiteUser;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = SpringDataRestApplication.class)
-@WebAppConfiguration
-public class SpringDataRestValidatorTest {
-    public static final String URL = "http://localhost";
-
-    private MockMvc mockMvc;
-
-    @Autowired
-    protected WebApplicationContext wac;
-
-    @Before
-    public void setup() {
-        mockMvc = webAppContextSetup(wac).build();
-    }
-
-    @Test
-    public void whenStartingApplication_thenCorrectStatusCode() throws Exception {
-        mockMvc.perform(get("/users")).andExpect(status().is2xxSuccessful());
-    };
-
-    @Test
-    public void whenAddingNewCorrectUser_thenCorrectStatusCodeAndResponse() throws Exception {
-        WebsiteUser user = new WebsiteUser();
-        user.setEmail("john.doe@john.com");
-        user.setName("John Doe");
-
-        mockMvc.perform(post("/users", user).contentType(MediaType.APPLICATION_JSON).content(new ObjectMapper().writeValueAsString(user)))
-        .andExpect(status().is2xxSuccessful())
-        .andExpect(redirectedUrl("http://localhost/users/1"));
-    }
-    
-    @Test
-    public void whenAddingNewUserWithoutName_thenErrorStatusCodeAndResponse() throws Exception {
-        WebsiteUser user = new WebsiteUser();
-        user.setEmail("john.doe@john.com");
-
-        mockMvc.perform(post("/users", user).contentType(MediaType.APPLICATION_JSON).content(new ObjectMapper().writeValueAsString(user)))
-        .andExpect(status().isNotAcceptable())
-        .andExpect(redirectedUrl(null));
-    }
-    
-    @Test
-    public void whenAddingNewUserWithEmptyName_thenErrorStatusCodeAndResponse() throws Exception {
-        WebsiteUser user = new WebsiteUser();
-        user.setEmail("john.doe@john.com");
-        user.setName("");
-        mockMvc.perform(post("/users", user).contentType(MediaType.APPLICATION_JSON).content(new ObjectMapper().writeValueAsString(user)))
-        .andExpect(status().isNotAcceptable())
-        .andExpect(redirectedUrl(null));
-    }
-    
-    @Test
-    public void whenAddingNewUserWithoutEmail_thenErrorStatusCodeAndResponse() throws Exception {
-        WebsiteUser user = new WebsiteUser();
-        user.setName("John Doe");
-        
-        mockMvc.perform(post("/users", user).contentType(MediaType.APPLICATION_JSON).content(new ObjectMapper().writeValueAsString(user)))
-        .andExpect(status().isNotAcceptable())
-        .andExpect(redirectedUrl(null));
-    }
-    
-    @Test
-    public void whenAddingNewUserWithEmptyEmail_thenErrorStatusCodeAndResponse() throws Exception {
-        WebsiteUser user = new WebsiteUser();
-        user.setName("John Doe");
-        user.setEmail("");
-        mockMvc.perform(post("/users", user).contentType(MediaType.APPLICATION_JSON).content(new ObjectMapper().writeValueAsString(user)))
-        .andExpect(status().isNotAcceptable())
-        .andExpect(redirectedUrl(null));
-    }
-
-}
+package com.baeldung.validator;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.redirectedUrl;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.web.context.WebApplicationContext;
+
+import com.baeldung.SpringDataRestApplication;
+import com.baeldung.models.WebsiteUser;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = SpringDataRestApplication.class)
+@WebAppConfiguration
+public class SpringDataRestValidatorTest {
+    public static final String URL = "http://localhost";
+
+    private MockMvc mockMvc;
+
+    @Autowired
+    protected WebApplicationContext wac;
+
+    @Before
+    public void setup() {
+        mockMvc = webAppContextSetup(wac).build();
+    }
+
+    @Test
+    public void whenStartingApplication_thenCorrectStatusCode() throws Exception {
+        mockMvc.perform(get("/users")).andExpect(status().is2xxSuccessful());
+    };
+
+    @Test
+    public void whenAddingNewCorrectUser_thenCorrectStatusCodeAndResponse() throws Exception {
+        WebsiteUser user = new WebsiteUser();
+        user.setEmail("john.doe@john.com");
+        user.setName("John Doe");
+
+        mockMvc.perform(post("/users", user).contentType(MediaType.APPLICATION_JSON).content(new ObjectMapper().writeValueAsString(user))).andExpect(status().is2xxSuccessful()).andExpect(redirectedUrl("http://localhost/users/1"));
+    }
+
+    @Test
+    public void whenAddingNewUserWithoutName_thenErrorStatusCodeAndResponse() throws Exception {
+        WebsiteUser user = new WebsiteUser();
+        user.setEmail("john.doe@john.com");
+
+        mockMvc.perform(post("/users", user).contentType(MediaType.APPLICATION_JSON).content(new ObjectMapper().writeValueAsString(user))).andExpect(status().isNotAcceptable()).andExpect(redirectedUrl(null));
+    }
+
+    @Test
+    public void whenAddingNewUserWithEmptyName_thenErrorStatusCodeAndResponse() throws Exception {
+        WebsiteUser user = new WebsiteUser();
+        user.setEmail("john.doe@john.com");
+        user.setName("");
+        mockMvc.perform(post("/users", user).contentType(MediaType.APPLICATION_JSON).content(new ObjectMapper().writeValueAsString(user))).andExpect(status().isNotAcceptable()).andExpect(redirectedUrl(null));
+    }
+
+    @Test
+    public void whenAddingNewUserWithoutEmail_thenErrorStatusCodeAndResponse() throws Exception {
+        WebsiteUser user = new WebsiteUser();
+        user.setName("John Doe");
+
+        mockMvc.perform(post("/users", user).contentType(MediaType.APPLICATION_JSON).content(new ObjectMapper().writeValueAsString(user))).andExpect(status().isNotAcceptable()).andExpect(redirectedUrl(null));
+    }
+
+    @Test
+    public void whenAddingNewUserWithEmptyEmail_thenErrorStatusCodeAndResponse() throws Exception {
+        WebsiteUser user = new WebsiteUser();
+        user.setName("John Doe");
+        user.setEmail("");
+        mockMvc.perform(post("/users", user).contentType(MediaType.APPLICATION_JSON).content(new ObjectMapper().writeValueAsString(user))).andExpect(status().isNotAcceptable()).andExpect(redirectedUrl(null));
+    }
+
+}