diff --git a/spring-all/src/main/java/org/baeldung/controller/config/WebConfig.java b/spring-all/src/main/java/org/baeldung/controller/config/WebConfig.java
index 22a0671be8..f55af69c88 100644
--- a/spring-all/src/main/java/org/baeldung/controller/config/WebConfig.java
+++ b/spring-all/src/main/java/org/baeldung/controller/config/WebConfig.java
@@ -11,7 +11,7 @@ import org.springframework.web.servlet.view.InternalResourceViewResolver;
 
 @Configuration
 @EnableWebMvc
-@ComponentScan(basePackages= {"org.baledung.controller.controller","org.baledung.controller.config" }) 
+@ComponentScan(basePackages= {"org.baeldung.controller.controller","org.baeldung.controller.config" })
 public class WebConfig extends WebMvcConfigurerAdapter {
     @Override
     public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
diff --git a/spring-all/src/test/java/org/baeldung/controller/ControllerAnnotationTest.java b/spring-all/src/test/java/org/baeldung/controller/ControllerAnnotationTest.java
index acd80afa95..44f1767405 100644
--- a/spring-all/src/test/java/org/baeldung/controller/ControllerAnnotationTest.java
+++ b/spring-all/src/test/java/org/baeldung/controller/ControllerAnnotationTest.java
@@ -1,7 +1,6 @@
 package org.baeldung.controller;
 
-import javax.servlet.ServletContext;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.baeldung.controller.config.WebConfig;
 import org.baeldung.controller.student.Student;
 import org.junit.Assert;
@@ -11,7 +10,7 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.support.AnnotationConfigContextLoader;
+import org.springframework.test.context.web.AnnotationConfigWebContextLoader;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
@@ -19,23 +18,17 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
-@ContextConfiguration(classes={WebConfig.class},loader=AnnotationConfigContextLoader.class )
+@ContextConfiguration(classes={WebConfig.class}, loader=AnnotationConfigWebContextLoader.class )
 public class ControllerAnnotationTest {
 	
-	@Autowired
 	private MockMvc mockMvc;
 
     @Autowired
     private WebApplicationContext wac;
     
-    @Autowired
-    private ServletContext servletContext;
-
     private Student selectedStudent;
 
     @Before