diff --git a/spring-core-3/src/test/java/com/baeldung/spring/patterns/factory/AnnotationConfigApplicationContextUnitTest.java b/spring-core-3/src/test/java/com/baeldung/spring/patterns/factory/AnnotationConfigApplicationContextUnitTest.java
new file mode 100644
index 0000000000..66e01f261f
--- /dev/null
+++ b/spring-core-3/src/test/java/com/baeldung/spring/patterns/factory/AnnotationConfigApplicationContextUnitTest.java
@@ -0,0 +1,36 @@
+package com.baeldung.spring.patterns.factory;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+
+public class AnnotationConfigApplicationContextUnitTest {
+
+    @Test
+    @SuppressWarnings("resource")
+    public void whenGetSimpleBean_thenReturnConstructedBean() {
+        
+        ApplicationContext context = new AnnotationConfigApplicationContext(ApplicationConfig.class);
+        
+        Foo foo = context.getBean(Foo.class);
+        
+        assertNotNull(foo);
+    }
+
+    @Test
+    @SuppressWarnings("resource")
+    public void whenGetPrototypeBean_thenReturnConstructedBean() {
+        
+        String expectedName = "Some name";
+        ApplicationContext context = new AnnotationConfigApplicationContext(ApplicationConfig.class);
+        
+        Bar bar = context.getBean(Bar.class, expectedName);
+        
+        assertNotNull(bar);
+        assertThat(bar.getName(), is(expectedName));
+    }
+}
diff --git a/spring-core-3/src/test/java/com/baeldung/spring/patterns/factory/AnnotationConfigApplicationContextTest.java b/spring-core-3/src/test/java/com/baeldung/spring/patterns/factory/ClassPathXmlApplicationContextUnitTest.java
similarity index 55%
rename from spring-core-3/src/test/java/com/baeldung/spring/patterns/factory/AnnotationConfigApplicationContextTest.java
rename to spring-core-3/src/test/java/com/baeldung/spring/patterns/factory/ClassPathXmlApplicationContextUnitTest.java
index 074818a639..bb9988317e 100644
--- a/spring-core-3/src/test/java/com/baeldung/spring/patterns/factory/AnnotationConfigApplicationContextTest.java
+++ b/spring-core-3/src/test/java/com/baeldung/spring/patterns/factory/ClassPathXmlApplicationContextUnitTest.java
@@ -6,34 +6,9 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-public class AnnotationConfigApplicationContextTest {
-
-    @Test
-    @SuppressWarnings("resource")
-    public void whenGetSimpleBean_thenReturnConstructedBean() {
-        
-        ApplicationContext context = new AnnotationConfigApplicationContext(ApplicationConfig.class);
-        
-        Foo foo = context.getBean(Foo.class);
-        
-        assertNotNull(foo);
-    }
-
-    @Test
-    @SuppressWarnings("resource")
-    public void whenGetPrototypeBean_thenReturnConstructedBean() {
-        
-        String expectedName = "Some name";
-        ApplicationContext context = new AnnotationConfigApplicationContext(ApplicationConfig.class);
-        
-        Bar bar = context.getBean(Bar.class, expectedName);
-        
-        assertNotNull(bar);
-        assertThat(bar.getName(), is(expectedName));
-    }
+public class ClassPathXmlApplicationContextUnitTest {
     
     @Test
     @SuppressWarnings("resource")