diff --git a/build.gradle b/build.gradle
index fff65a9..cbb0919 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,12 +11,13 @@ buildscript {
 }
 
 apply plugin: 'java'
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot'
 
 jar {
 	baseName = 'conditional'
 	version = '0.0.1-SNAPSHOT'
 }
+
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
@@ -26,7 +27,6 @@ repositories {
 
 
 dependencies {
-	compile('org.projectlombok:lombok')
 	compile('org.springframework.boot:spring-boot-starter')
 	testCompile('org.springframework.boot:spring-boot-starter-test') 
 }
@@ -34,3 +34,7 @@ dependencies {
 task wrapper(type: Wrapper) {
 	gradleVersion = '4.4'
 }
+
+bootRepackage {
+	enabled = false
+}
diff --git a/src/main/java/com/ennovate/condition/ActiveOnProfilesCondition.java b/src/main/java/com/ennovate/condition/ActiveOnProfilesCondition.java
index 42bdb44..cc3fcaf 100644
--- a/src/main/java/com/ennovate/condition/ActiveOnProfilesCondition.java
+++ b/src/main/java/com/ennovate/condition/ActiveOnProfilesCondition.java
@@ -1,10 +1,8 @@
 package com.ennovate.condition;
 
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Condition;
 import org.springframework.context.annotation.ConditionContext;
-import org.springframework.core.env.Environment;
 import org.springframework.core.type.AnnotatedTypeMetadata;
 
 import java.util.Arrays;
@@ -13,9 +11,6 @@
 
 public class ActiveOnProfilesCondition implements Condition {
 
-    @Autowired
-    Environment environment;
-
     @Override
     public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
         Map<String, Object> attributes
diff --git a/src/main/java/com/ennovate/ConditionalApplication.java b/src/test/java/com/ennovate/ConditionalApplication.java
similarity index 100%
rename from src/main/java/com/ennovate/ConditionalApplication.java
rename to src/test/java/com/ennovate/ConditionalApplication.java
diff --git a/src/test/java/com/ennovate/ConditionalBeanOnProfilesABActiveTests.java b/src/test/java/com/ennovate/ConditionalBeanOnProfilesABActiveTests.java
index 9588061..9126abe 100644
--- a/src/test/java/com/ennovate/ConditionalBeanOnProfilesABActiveTests.java
+++ b/src/test/java/com/ennovate/ConditionalBeanOnProfilesABActiveTests.java
@@ -5,7 +5,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.core.env.Environment;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
@@ -14,18 +13,15 @@
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-@ActiveProfiles({"A","B"})
+@ActiveProfiles({"A", "B"})
 public class ConditionalBeanOnProfilesABActiveTests {
 
-	@Autowired
-	Environment environment;
+    @Autowired
+    private ConditionalBean conditionalBean;
 
-	@Autowired
-	ConditionalBean conditionalBean;
-
-	@Test
-	public void generatesConditionalBeanAB_onlyWhenBothProfilesAreActive() {
-		assertThat(conditionalBean.getValue(), equalTo("AB"));
-	}
+    @Test
+    public void generatesConditionalBeanAB_onlyWhenBothProfilesAreActive() {
+        assertThat(conditionalBean.getValue(), equalTo("AB"));
+    }
 
 }
diff --git a/src/test/java/com/ennovate/DefaultSpringProfileBehaviorTests.java b/src/test/java/com/ennovate/DefaultSpringProfileBehaviorTests.java
index c95ff6a..89d0e42 100644
--- a/src/test/java/com/ennovate/DefaultSpringProfileBehaviorTests.java
+++ b/src/test/java/com/ennovate/DefaultSpringProfileBehaviorTests.java
@@ -17,9 +17,6 @@
 @ActiveProfiles({"A"})
 public class DefaultSpringProfileBehaviorTests {
 
-	@Autowired
-	Environment environment;
-
 	@Autowired
 	ConditionalBean conditionalBean;
 
diff --git a/src/main/java/com/ennovate/service/ConditionalBean.java b/src/test/java/com/ennovate/service/ConditionalBean.java
similarity index 100%
rename from src/main/java/com/ennovate/service/ConditionalBean.java
rename to src/test/java/com/ennovate/service/ConditionalBean.java