Add tests and fix for package name override.

java/src/processing/mode/java/preproc/PdeParseTreeListener.java

@@ -771,15 +771,15 @@ public class PdeParseTreeListener extends ProcessingBaseListener {
   protected void writeHeaderContents(PrintWriterWithEditGen decoratedWriter,
         RewriteResultBuilder resultBuilder) {
 
-    if (!isTesting) {
-      writePreprocessorComment(decoratedWriter, resultBuilder);
-    }
-
     if (destinationPackageName.isPresent()) {
       decoratedWriter.addCodeLine("package " + destinationPackageName.get() + ";");
       decoratedWriter.addEmptyLine();
     }
 
+    if (!isTesting) {
+      writePreprocessorComment(decoratedWriter, resultBuilder);
+    }
+
     writeImports(decoratedWriter, resultBuilder);
 
     boolean requiresClassHeader = mode == PdePreprocessor.Mode.STATIC;

java/src/processing/mode/java/preproc/PdePreprocessor.java

@@ -191,7 +191,7 @@ public class PdePreprocessor {
         tokens,
         sketchName,
         tabSize,
-        Optional.empty()
+        destinationPackage
     );
     listener.setTesting(isTesting);
     listener.setCoreImports(coreImports);