diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java b/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java
index d1079ff3d7..6a880fe155 100644
--- a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java
+++ b/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java
@@ -468,7 +468,7 @@ public void testProducesWithConfigProperty() throws Exception {
     @Test
     public void testConfigPropertiesInjection() throws Exception {
         Node bean = getBeanById("beanWithConfigurationProperties");
-        assertXpathEquals(bean, "@class", "org.apache.aries.blueprint.plugin.test.BeanWithConfigurationProperties");
+        assertXpathEquals(bean, "@class", "org.apache.aries.blueprint.plugin.test.configuration.BeanWithConfigurationProperties");
         assertXpathEquals(bean, "argument[1]/@ref", "testProps5");
         assertXpathEquals(bean, "argument[2]/@ref", "properties-aries-test6-false");
         assertXpathEquals(bean, "property[@name='prop1']/@ref", "properties-aries-test1-true");
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java b/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java
index e78157f0f1..7e9e744a2f 100644
--- a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java
+++ b/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java
@@ -27,7 +27,7 @@
 import org.apache.aries.blueprint.plugin.bad.BadFieldBean2;
 import org.apache.aries.blueprint.plugin.bad.BadFieldBean3;
 import org.apache.aries.blueprint.plugin.bad.FieldBean4;
-import org.apache.aries.blueprint.plugin.test.BeanWithConfig;
+import org.apache.aries.blueprint.plugin.test.configuration.BeanWithConfig;
 import org.apache.aries.blueprint.plugin.test.MyBean1;
 import org.apache.aries.blueprint.plugin.test.MyBean3;
 import org.apache.aries.blueprint.plugin.test.MyBean4;
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean5.java b/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean5.java
index cf1fe03551..743647a86f 100644
--- a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean5.java
+++ b/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean5.java
@@ -31,19 +31,6 @@
 @DependsOn("myBean6")
 public class MyBean5 {
 
-    ServiceA serviceA1;
-
-    ServiceA serviceA2;
-
-    ServiceB serviceB;
-
-    int bla;
-
-    ServiceC myReference;
-    ServiceC myReference2;
-
-    ServiceA serviceAAnnotated;
-
     @Inject
     public MyBean5(@Named("my2") ServiceA serviceA1,
                    ServiceA serviceA2,
@@ -53,13 +40,6 @@ public MyBean5(@Named("my2") ServiceA serviceA1,
                    @OsgiService(filter = "(mode=123)") @Named("ser2") ServiceC myReference2,
                    @AnnotatedService ServiceA serviceAAnnotated,
                    @Named("produced2") MyProduced myProduced) {
-        this.serviceA1 = serviceA1;
-        this.serviceA2 = serviceA2;
-        this.serviceB = serviceB;
-        this.bla = bla;
-        this.myReference = myReference;
-        this.myReference2 = myReference2;
-        this.serviceAAnnotated = serviceAAnnotated;
     }
 
     public MyBean5() {
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean6.java b/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean6.java
index b50e7e2389..3ecb53f48c 100644
--- a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean6.java
+++ b/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean6.java
@@ -27,10 +27,7 @@
 @DependsOn
 public class MyBean6 {
 
-    @SuppressWarnings("unused")
-    private final ServiceA serviceA1;
-
     public MyBean6(@Named("my2") ServiceA serviceA1) {
-        this.serviceA1 = serviceA1;
+
     }
 }
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryBeanAsService.java b/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryBeanAsService.java
index b1a5cab45c..297ff9ca6f 100644
--- a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryBeanAsService.java
+++ b/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryBeanAsService.java
@@ -42,6 +42,7 @@ public MyProduced createBeanWithServiceExpose1() {
     public MyProduced createBeanWithServiceExpose2() {
         return new MyProduced("My message");
     }
+
     @Produces
     @Named("producedForServiceWithTwoInterfaces")
     @OsgiServiceProvider(classes = {MyProduced.class, ServiceA.class})
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/CdiTransactionalAnnotatedBean.java b/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/cditransactional/CdiTransactionalAnnotatedBean.java
similarity index 93%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/CdiTransactionalAnnotatedBean.java
rename to blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/cditransactional/CdiTransactionalAnnotatedBean.java
index c022250941..3060df15e4 100644
--- a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/CdiTransactionalAnnotatedBean.java
+++ b/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/cditransactional/CdiTransactionalAnnotatedBean.java
@@ -16,8 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.blueprint.plugin.test;
+package org.apache.aries.blueprint.plugin.test.cditransactional;
 
+import org.apache.aries.blueprint.plugin.test.ParentBean;
 import org.springframework.context.annotation.Lazy;
 
 import javax.annotation.PostConstruct;
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/BeanWithConfig.java b/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/configuration/BeanWithConfig.java
similarity index 92%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/BeanWithConfig.java
rename to blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/configuration/BeanWithConfig.java
index 66d962144f..fcea162cb0 100644
--- a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/BeanWithConfig.java
+++ b/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/configuration/BeanWithConfig.java
@@ -16,11 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.blueprint.plugin.test;
+package org.apache.aries.blueprint.plugin.test.configuration;
 
 import org.apache.aries.blueprint.annotation.config.Config;
 import org.apache.aries.blueprint.annotation.config.ConfigProperty;
 import org.apache.aries.blueprint.annotation.config.DefaultProperty;
+import org.apache.aries.blueprint.plugin.test.MyProducedWithConstructor;
 
 import javax.enterprise.inject.Produces;
 import javax.inject.Named;
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/BeanWithConfigurationProperties.java b/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/configuration/BeanWithConfigurationProperties.java
similarity index 94%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/BeanWithConfigurationProperties.java
rename to blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/configuration/BeanWithConfigurationProperties.java
index d4c134c000..89db12299e 100644
--- a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/BeanWithConfigurationProperties.java
+++ b/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/configuration/BeanWithConfigurationProperties.java
@@ -16,9 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.blueprint.plugin.test;
+package org.apache.aries.blueprint.plugin.test.configuration;
 
 import org.apache.aries.blueprint.annotation.config.ConfigProperties;
+import org.apache.aries.blueprint.plugin.test.MyProducedWithConstructor;
 import org.ops4j.pax.cdi.api.OsgiService;
 
 import javax.enterprise.inject.Produces;