diff --git a/nbproject/project.properties b/nbproject/project.properties
index c8b94ae5b53485ce2789a05ec07c037fa5bd54ad..e87c2e57d8b6dca07566b6d7fa3710bf8c0b0c89 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -72,7 +72,8 @@ javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
     ${file.reference.junit-jupiter-api-5.7.0.jar}:\
-    ${file.reference.junit-jupiter-engine-5.7.0.jar}
+    ${file.reference.junit-jupiter-engine-5.7.0.jar}:\
+    ${libs.junit_5.classpath}
 javac.test.modulepath=\
     ${javac.modulepath}
 javac.test.processorpath=\
diff --git a/src-generated/edu/nps/moves/dis7/entities/EntityTypeFactory.java b/src-generated/edu/nps/moves/dis7/entities/EntityTypeFactory.java
index dff3317bb98491709090a72b359c39bbeed74219..c03ae7bc6e39a71c13bb34066b7dd187670f3668 100644
--- a/src-generated/edu/nps/moves/dis7/entities/EntityTypeFactory.java
+++ b/src-generated/edu/nps/moves/dis7/entities/EntityTypeFactory.java
@@ -31,7 +31,7 @@ public class EntityTypeFactory
       return null;
     
     try {
-      Class cls = Class.forName(name);
+      Class<?> cls = Class.forName(name);
       Constructor<EntityType> constr = (Constructor<EntityType>) cls.getConstructors()[0];
       return constr.newInstance();
     }
diff --git a/src-generated/edu/nps/moves/dis7/pdus/EntityStatePdu.java b/src-generated/edu/nps/moves/dis7/pdus/EntityStatePdu.java
index a0627930aaaa518122f3633ced9617f4107fd94b..e2b568dd5f4a6f982ba1d6b898a94f0764657efd 100644
--- a/src-generated/edu/nps/moves/dis7/pdus/EntityStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/pdus/EntityStatePdu.java
@@ -10,7 +10,7 @@ import java.io.*;
 import edu.nps.moves.dis7.enumerations.*;
 
 /**
- *  7.2.2. Represents the postion and state of one entity in the world. See 5.3.2.
+ *  7.2.2. Represents the position and state of one entity in the world. See 5.3.2.
  * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
  */
 public class EntityStatePdu extends EntityInformationFamilyPdu implements Serializable
diff --git a/src-generated/edu/nps/moves/dis7/pdus/FastEntityStatePdu.java b/src-generated/edu/nps/moves/dis7/pdus/FastEntityStatePdu.java
index 90da811a6aec292420a51914af86f35398ed9ca3..094973f3cc49d0f5446402561f4f668d88a2897c 100644
--- a/src-generated/edu/nps/moves/dis7/pdus/FastEntityStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/pdus/FastEntityStatePdu.java
@@ -10,7 +10,7 @@ import java.io.*;
 import edu.nps.moves.dis7.enumerations.*;
 
 /**
- * Represents the postion and state of one entity in the world. This is identical in function to entity state pdu, but generates less garbage to collect in the Java world. Section 7.2.2.
+ * Represents the position and state of one entity in the world. This is identical in function to entity state pdu, but generates less garbage to collect in the Java world. Section 7.2.2.
  * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
  */
 public class FastEntityStatePdu extends EntityInformationFamilyPdu implements Serializable
diff --git a/src-generated/edu/nps/moves/dis7/pdus/VariableDatum.java b/src-generated/edu/nps/moves/dis7/pdus/VariableDatum.java
index 135cb4f469c120444a4425fad3c6854e326522a9..a0b3fd833f8885d9042e9fa77b8eb60d8c072330 100644
--- a/src-generated/edu/nps/moves/dis7/pdus/VariableDatum.java
+++ b/src-generated/edu/nps/moves/dis7/pdus/VariableDatum.java
@@ -4,8 +4,9 @@
  */
 package edu.nps.moves.dis7.pdus;
 
-import java.io.*;
 import edu.nps.moves.dis7.enumerations.*;
+
+import java.io.*;
 import java.util.Arrays;
 
 /**
@@ -197,7 +198,7 @@ public class VariableDatum extends Object implements Serializable
       //uPosition += padding.length;
     }
     catch (Exception e) {
-      System.out.println(e);
+      System.err.println(e);
     }
     return getMarshalledSize();
   }