diff --git a/spring-di/src/main/java/com/baeldung/dependency/ioc/Item.java b/spring-di/src/main/java/com/baeldung/dependency/ioc/Item.java
deleted file mode 100644
index 107560514f..0000000000
--- a/spring-di/src/main/java/com/baeldung/dependency/ioc/Item.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.baeldung.dependency.ioc;
-
-public interface Item {
-
-}
diff --git a/spring-di/src/main/java/com/baeldung/dependency/ioc/AppConfig.java b/spring-di/src/main/java/org/baeldung/store/AppConfig.java
similarity index 91%
rename from spring-di/src/main/java/com/baeldung/dependency/ioc/AppConfig.java
rename to spring-di/src/main/java/org/baeldung/store/AppConfig.java
index 9eb668df6c..80b6733dff 100644
--- a/spring-di/src/main/java/com/baeldung/dependency/ioc/AppConfig.java
+++ b/spring-di/src/main/java/org/baeldung/store/AppConfig.java
@@ -1,4 +1,4 @@
-package com.baeldung.dependency.ioc;
+package org.baeldung.store;
 
 import org.springframework.context.annotation.Bean;
 
diff --git a/spring-di/src/main/java/org/baeldung/store/Item.java b/spring-di/src/main/java/org/baeldung/store/Item.java
new file mode 100644
index 0000000000..1d7292fc35
--- /dev/null
+++ b/spring-di/src/main/java/org/baeldung/store/Item.java
@@ -0,0 +1,5 @@
+package org.baeldung.store;
+
+public interface Item {
+
+}
diff --git a/spring-di/src/main/java/com/baeldung/dependency/ioc/ItemImpl1.java b/spring-di/src/main/java/org/baeldung/store/ItemImpl1.java
similarity index 54%
rename from spring-di/src/main/java/com/baeldung/dependency/ioc/ItemImpl1.java
rename to spring-di/src/main/java/org/baeldung/store/ItemImpl1.java
index 877ccecb0a..8bda9f24c9 100644
--- a/spring-di/src/main/java/com/baeldung/dependency/ioc/ItemImpl1.java
+++ b/spring-di/src/main/java/org/baeldung/store/ItemImpl1.java
@@ -1,4 +1,4 @@
-package com.baeldung.dependency.ioc;
+package org.baeldung.store;
 
 public class ItemImpl1 implements Item {
 
diff --git a/spring-di/src/main/java/com/baeldung/dependency/ioc/Store.java b/spring-di/src/main/java/org/baeldung/store/Store.java
similarity index 90%
rename from spring-di/src/main/java/com/baeldung/dependency/ioc/Store.java
rename to spring-di/src/main/java/org/baeldung/store/Store.java
index e4ff03b30e..dcc2c3be48 100644
--- a/spring-di/src/main/java/com/baeldung/dependency/ioc/Store.java
+++ b/spring-di/src/main/java/org/baeldung/store/Store.java
@@ -1,4 +1,4 @@
-package com.baeldung.dependency.ioc;
+package org.baeldung.store;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/spring-di/src/main/resources/ioc-context.xml b/spring-di/src/main/resources/ioc-context.xml
index df1165f557..4ea97fe644 100644
--- a/spring-di/src/main/resources/ioc-context.xml
+++ b/spring-di/src/main/resources/ioc-context.xml
@@ -8,7 +8,7 @@
 
 	<bean id="item1" class="org.baeldung.store.ItemImpl1" />
 	<bean id="xml-store-by-constructor" class="org.baeldung.store.Store">
-		<constructor-arg type="ItemImpl1" index="0"	name="item" ref="item1" />
+		<constructor-arg type="Item" index="0"	name="item" ref="item1" />
 	</bean>
 	
 	<!-- Setter injection -->
diff --git a/spring-di/src/test/java/com/baeldung/dependency/ioc/XmlAppConfigTest.java b/spring-di/src/test/java/com/baeldung/dependency/ioc/XmlAppConfigTest.java
deleted file mode 100644
index c13074281f..0000000000
--- a/spring-di/src/test/java/com/baeldung/dependency/ioc/XmlAppConfigTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.baeldung.dependency.ioc;
-
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("classpath:/ioc-context.xml")
-public class XmlAppConfigTest {
-    
-    @Autowired
-    @Qualifier("xml-store-by-constructor")
-    private Store storeByConstructorInjection;
-
-    @Test
-    public void givenValidXmlConfig_WhenInjectStoreByConstructorInject_ThenBeanIsNotNull() {
-        assertNotNull(storeByConstructorInjection);
-    }
-}
diff --git a/spring-di/src/test/java/org/baeldung/store/AppConfigUnitTest.java b/spring-di/src/test/java/org/baeldung/store/AppConfigUnitTest.java
new file mode 100644
index 0000000000..54c2bc0b34
--- /dev/null
+++ b/spring-di/src/test/java/org/baeldung/store/AppConfigUnitTest.java
@@ -0,0 +1,36 @@
+package org.baeldung.store;
+
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = AppConfig.class)
+public class AppConfigUnitTest {
+
+    @Autowired
+    @Qualifier("storeThroughConstructorInjection")
+    private Store storeByConstructorInjection;
+    
+    @Autowired
+    @Qualifier("storeThroughSetterInjection")
+    private Store storeBySetterInjection;
+
+    @Test
+    public void givenValidXmlConfig_WhenInjectStoreByConstructorInjection_ThenBeanIsNotNull() {
+        assertNotNull(storeByConstructorInjection);
+        assertNotNull(storeByConstructorInjection.getItem());
+    }
+
+    @Test
+    public void givenValidXmlConfig_WhenInjectStoreBySetterInjection_ThenBeanIsNotNull() {
+        assertNotNull(storeBySetterInjection);
+        assertNotNull(storeByConstructorInjection.getItem());
+    }
+}
diff --git a/spring-di/src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java b/spring-di/src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java
new file mode 100644
index 0000000000..a032ae8df5
--- /dev/null
+++ b/spring-di/src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java
@@ -0,0 +1,46 @@
+package org.baeldung.store;
+
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("classpath:/ioc-context.xml")
+public class XmlAppConfigUnitTest {
+    
+    @Autowired
+    @Qualifier("xml-store-by-constructor")
+    private Store storeByConstructorInjection;
+    
+    @Autowired
+    @Qualifier("xml-store-by-setter")
+    private Store storeBySetterInjection;
+    
+    @Autowired
+    @Qualifier("xml-store-by-setter-lazy")
+    private Store storeBySetterInjectionLazy;
+
+    @Test
+    public void givenValidXmlConfig_WhenInjectStoreByConstructorInjection_ThenBeanIsNotNull() {
+        assertNotNull(storeByConstructorInjection);
+        assertNotNull(storeByConstructorInjection.getItem());
+    }
+
+    @Test
+    public void givenValidXmlConfig_WhenInjectStoreBySetterInjection_ThenBeanIsNotNull() {
+        assertNotNull(storeBySetterInjection);
+        assertNotNull(storeByConstructorInjection.getItem());
+    }
+
+    @Test
+    public void givenValidXmlConfig_WhenInjectStoreBySetterInjectionLazy_ThenBeanIsNotNull() {
+        assertNotNull(storeBySetterInjectionLazy);
+        assertNotNull(storeByConstructorInjection.getItem());
+    }
+}