diff --git a/HIRS_Structs/src/test/java/hirs/structs/converters/TestEmbeddedStruct.java b/HIRS_Structs/src/test/java/hirs/structs/converters/TestEmbeddedStruct.java
index 44686f2dd..a0f0b000b 100644
--- a/HIRS_Structs/src/test/java/hirs/structs/converters/TestEmbeddedStruct.java
+++ b/HIRS_Structs/src/test/java/hirs/structs/converters/TestEmbeddedStruct.java
@@ -3,12 +3,14 @@
 import hirs.structs.elements.Struct;
 import hirs.structs.elements.StructElementLength;
 import hirs.structs.elements.StructElements;
+import lombok.Getter;
 
 import java.util.Arrays;
 
 /**
  * A struct to be embedded within TestStruct.
  */
+@Getter
 @StructElements(elements = {"embeddedSize", "embeddedShort", "embedded"})
 public class TestEmbeddedStruct implements Struct {
 
@@ -20,7 +22,6 @@ public class TestEmbeddedStruct implements Struct {
 
     private static final byte[] DEFAULT_ARRAY = new byte[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 0};
 
-
     @StructElementLength(fieldName = "embedded")
     private int embeddedSize = EMBEDDED_SIZE;
 
@@ -57,30 +58,4 @@ public final int hashCode() {
         return result;
     }
 
-    /**
-     * Getter.
-     *
-     * @return value
-     */
-    public byte[] getEmbedded() {
-        return embedded;
-    }
-
-    /**
-     * Getter.
-     *
-     * @return value
-     */
-    public short getEmbeddedShort() {
-        return embeddedShort;
-    }
-
-    /**
-     * Getter.
-     *
-     * @return value
-     */
-    public int getEmbeddedSize() {
-        return embeddedSize;
-    }
 }
diff --git a/HIRS_Structs/src/test/java/hirs/structs/converters/TestStruct.java b/HIRS_Structs/src/test/java/hirs/structs/converters/TestStruct.java
index 0e6428d5e..009a13de9 100644
--- a/HIRS_Structs/src/test/java/hirs/structs/converters/TestStruct.java
+++ b/HIRS_Structs/src/test/java/hirs/structs/converters/TestStruct.java
@@ -3,10 +3,12 @@
 import hirs.structs.elements.Struct;
 import hirs.structs.elements.StructElementLength;
 import hirs.structs.elements.StructElements;
+import lombok.Getter;
 
 /**
  * A Struct class designed to fully test the design of the converter being tested.
  */
+@Getter
 @StructElements(
         elements = {"testShort", "testEmbeddedStruct", "testByte", "testVariableStructLength",
                 "testVariableStruct"})
@@ -52,48 +54,4 @@ public final int hashCode() {
         return result;
     }
 
-    /**
-     * Getter.
-     *
-     * @return value
-     */
-    public byte getTestByte() {
-        return testByte;
-    }
-
-    /**
-     * Getter.
-     *
-     * @return value
-     */
-    public short getTestShort() {
-        return testShort;
-    }
-
-    /**
-     * Getter.
-     *
-     * @return value
-     */
-    public TestEmbeddedStruct getTestEmbeddedStruct() {
-        return testEmbeddedStruct;
-    }
-
-    /**
-     * Getter.
-     *
-     * @return value
-     */
-    public TestVariableStruct getTestVariableStruct() {
-        return testVariableStruct;
-    }
-
-    /**
-     * Getter.
-     *
-     * @return value
-     */
-    public int getTestVariableStructLength() {
-        return testVariableStructLength;
-    }
 }