diff --git a/ingestion/src/test/java/feast/ingestion/ImportJobTest.java b/ingestion/src/test/java/feast/ingestion/ImportJobTest.java
index 58ecae8f04..1148fa4042 100644
--- a/ingestion/src/test/java/feast/ingestion/ImportJobTest.java
+++ b/ingestion/src/test/java/feast/ingestion/ImportJobTest.java
@@ -32,14 +32,12 @@
 import feast.core.StoreProto.Store.Subscription;
 import feast.ingestion.options.BZip2Compressor;
 import feast.ingestion.options.ImportOptions;
-import feast.ingestion.options.OptionByteConverter;
 import feast.storage.RedisProto.RedisKey;
 import feast.test.TestUtil;
 import feast.test.TestUtil.LocalKafka;
 import feast.test.TestUtil.LocalRedis;
 import feast.types.FeatureRowProto.FeatureRow;
 import feast.types.ValueProto.ValueType.Enum;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -51,7 +49,6 @@
 import org.apache.beam.sdk.PipelineResult;
 import org.apache.beam.sdk.PipelineResult.State;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
-import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
 import org.apache.kafka.common.serialization.ByteArraySerializer;
 import org.joda.time.Duration;
 import org.junit.AfterClass;
@@ -166,11 +163,13 @@ public void runPipeline_ShouldWriteToRedisCorrectlyGivenValidSpecAndFeatureRow()
             .build();
 
     ImportOptions options = PipelineOptionsFactory.create().as(ImportOptions.class);
-    BZip2Compressor<FeatureSetSpec> compressor = new BZip2Compressor<>(option -> {
-      JsonFormat.Printer printer =
-          JsonFormat.printer().omittingInsignificantWhitespace().printingEnumsAsInts();
-      return printer.print(option).getBytes();
-    });
+    BZip2Compressor<FeatureSetSpec> compressor =
+        new BZip2Compressor<>(
+            option -> {
+              JsonFormat.Printer printer =
+                  JsonFormat.printer().omittingInsignificantWhitespace().printingEnumsAsInts();
+              return printer.print(option).getBytes();
+            });
     options.setFeatureSetJson(compressor.compress(spec));
     options.setStoreJson(Collections.singletonList(JsonFormat.printer().print(redis)));
     options.setProject("");
diff --git a/pom.xml b/pom.xml
index 3ba6a592cf..df0b4a85bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -372,6 +372,16 @@
                         <removeUnusedImports />
                     </java>
                 </configuration>
+                <executions>
+                  <!-- Move check to fail faster, but after compilation. Default is verify phase -->
+                  <execution>
+                      <id>spotless-check</id>
+                      <phase>process-test-classes</phase>
+                      <goals>
+                          <goal>check</goal>
+                      </goals>
+                  </execution>
+              </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/serving/src/main/java/feast/serving/specs/CachedSpecService.java b/serving/src/main/java/feast/serving/specs/CachedSpecService.java
index 1184f6da95..35119589b2 100644
--- a/serving/src/main/java/feast/serving/specs/CachedSpecService.java
+++ b/serving/src/main/java/feast/serving/specs/CachedSpecService.java
@@ -195,11 +195,7 @@ private Map<String, String> getFeatureToFeatureSetMapping(
     HashMap<String, String> mapping = new HashMap<>();
 
     featureSets.values().stream()
-        .collect(
-            groupingBy(
-                featureSet ->
-                    Pair.of(
-                        featureSet.getProject(), featureSet.getName())))
+        .collect(groupingBy(featureSet -> Pair.of(featureSet.getProject(), featureSet.getName())))
         .forEach(
             (group, groupedFeatureSets) -> {
               groupedFeatureSets =