diff --git a/fcli-core/fcli-aviator/src/test/java/com/fortify/cli/aviator/fod/cli/cmd/AviatorFoDApplyRemediationsCommandTest.java b/fcli-core/fcli-fod/src/test/java/com/fortify/cli/fod/aviator/FoDAviatorApplyRemediationsCommandTest.java
similarity index 72%
rename from fcli-core/fcli-aviator/src/test/java/com/fortify/cli/aviator/fod/cli/cmd/AviatorFoDApplyRemediationsCommandTest.java
rename to fcli-core/fcli-fod/src/test/java/com/fortify/cli/fod/aviator/FoDAviatorApplyRemediationsCommandTest.java
index 36f64955b4..f05c010009 100644
--- a/fcli-core/fcli-aviator/src/test/java/com/fortify/cli/aviator/fod/cli/cmd/AviatorFoDApplyRemediationsCommandTest.java
+++ b/fcli-core/fcli-fod/src/test/java/com/fortify/cli/fod/aviator/FoDAviatorApplyRemediationsCommandTest.java
@@ -10,24 +10,23 @@
  * herein. The information contained herein is subject to change
  * without notice.
  */
-package com.fortify.cli.aviator.fod.cli.cmd;
+package com.fortify.cli.fod.aviator;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.lang.reflect.Field;
 
 import org.junit.jupiter.api.Test;
 
 import com.fortify.cli.common.exception.FcliSimpleException;
+import com.fortify.cli.fod.aviator.cmd.FoDAviatorApplyRemediationsCommand;
 
-class AviatorFoDApplyRemediationsCommandTest {
+class FoDAviatorApplyRemediationsCommandTest {
     @Test
     void testSourceCodeDirectoryHasDefaultValue() throws Exception {
-        AviatorFoDApplyRemediationsCommand command = new AviatorFoDApplyRemediationsCommand();
+        FoDAviatorApplyRemediationsCommand command = new FoDAviatorApplyRemediationsCommand();
 
-        Field field = AviatorFoDApplyRemediationsCommand.class.getDeclaredField("sourceCodeDirectory");
+        Field field = FoDAviatorApplyRemediationsCommand.class.getDeclaredField("sourceCodeDirectory");
         field.setAccessible(true);
         String fieldValue = (String) field.get(command);
 
@@ -40,9 +39,9 @@ void testSourceCodeDirectoryHasDefaultValue() throws Exception {
 
     @Test
     void testSourceCodeDirectoryCanBeOverridden() throws Exception {
-        AviatorFoDApplyRemediationsCommand command = new AviatorFoDApplyRemediationsCommand();
+        FoDAviatorApplyRemediationsCommand command = new FoDAviatorApplyRemediationsCommand();
 
-        Field field = AviatorFoDApplyRemediationsCommand.class.getDeclaredField("sourceCodeDirectory");
+        Field field = FoDAviatorApplyRemediationsCommand.class.getDeclaredField("sourceCodeDirectory");
         field.setAccessible(true);
 
         String customPath = "/custom/source/directory";
@@ -56,9 +55,9 @@ void testSourceCodeDirectoryCanBeOverridden() throws Exception {
 
     @Test
     void testBlankSourceCodeDirectoryThrowsException() throws Exception {
-        AviatorFoDApplyRemediationsCommand command = new AviatorFoDApplyRemediationsCommand();
+        FoDAviatorApplyRemediationsCommand command = new FoDAviatorApplyRemediationsCommand();
 
-        Field field = AviatorFoDApplyRemediationsCommand.class.getDeclaredField("sourceCodeDirectory");
+        Field field = FoDAviatorApplyRemediationsCommand.class.getDeclaredField("sourceCodeDirectory");
         field.setAccessible(true);
         field.set(command, "");