diff --git a/apache-rat-core/src/it/java/org/apache/rat/ReportTest.java b/apache-rat-core/src/it/java/org/apache/rat/ReportTest.java
index b695134a6..027619288 100644
--- a/apache-rat-core/src/it/java/org/apache/rat/ReportTest.java
+++ b/apache-rat-core/src/it/java/org/apache/rat/ReportTest.java
@@ -142,7 +142,7 @@ public void integrationTest(String testName, Document commandLineDoc) throws Exc
             try {
                 Object value = shell.run(groovyScript, new String[]{outputFile.getAbsolutePath(), logFile.getAbsolutePath()});
                 if (value != null) {
-                    fail(String.format("%s", value));
+                    fail(String.format("%s: %s", testName, value));
                 }
             } catch (AssertionError e) {
                 throw new AssertionError(String.format("%s: %s", testName, e.getMessage()), e);
diff --git a/apache-rat-core/src/it/resources/ReportTest/RAT_14/verify.groovy b/apache-rat-core/src/it/resources/ReportTest/RAT_14/verify.groovy
index 226394df0..c0027ba13 100644
--- a/apache-rat-core/src/it/resources/ReportTest/RAT_14/verify.groovy
+++ b/apache-rat-core/src/it/resources/ReportTest/RAT_14/verify.groovy
@@ -66,9 +66,9 @@ myArgs[3] = src.getAbsolutePath()
 
 ReportConfiguration configuration = OptionCollection.parseCommands(src, myArgs, { opts -> })
 assertNotNull(configuration)
-configuration.validate(DefaultLog.getInstance().&error)
+configuration.validate()
 Reporter reporter = new Reporter(configuration)
-ClaimStatistic statistic = reporter.execute()
+ClaimStatistic statistic = reporter.execute().getStatistic()
 
 assertEquals(3, statistic.getCounter(ClaimStatistic.Counter.APPROVED))
 assertEquals(2, statistic.getCounter(ClaimStatistic.Counter.ARCHIVES))
diff --git a/apache-rat-core/src/main/java/org/apache/rat/OptionCollection.java b/apache-rat-core/src/main/java/org/apache/rat/OptionCollection.java
index d04398080..9130d6258 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/OptionCollection.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/OptionCollection.java
@@ -34,7 +34,6 @@
 import java.util.stream.Collectors;
 
 import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
@@ -131,27 +130,22 @@ public static ReportConfiguration parseCommands(final File workingDirectory, fin
                                                     final Consumer<Options> helpCmd, final boolean noArgs) throws IOException {
 
         Options opts = buildOptions();
-        CommandLine commandLine;
+            ArgumentContext argumentContext;
         try {
-            commandLine = DefaultParser.builder().setDeprecatedHandler(DeprecationReporter.getLogReporter())
-                    .setAllowPartialMatching(true).build().parse(opts, args);
+            argumentContext = new ArgumentContext(workingDirectory, opts, args);
         } catch (ParseException e) {
-            DefaultLog.getInstance().error(e.getMessage());
-            DefaultLog.getInstance().error("Please use the \"--help\" option to see a list of valid commands and options.", e);
             System.exit(1);
             return null; // dummy return (won't be reached) to avoid Eclipse complaint about possible NPE
             // for "commandLine"
         }
-
-        ArgumentContext argumentContext = new ArgumentContext(workingDirectory, commandLine);
         Arg.processLogLevel(argumentContext, CLIOptionCollection.INSTANCE);
 
-        if (commandLine.hasOption(HELP)) {
+        if (argumentContext.getCommandLine().hasOption(HELP)) {
             helpCmd.accept(opts);
             return null;
         }
 
-        if (commandLine.hasOption(Arg.HELP_LICENSES.option())) {
+        if (argumentContext.getCommandLine().hasOption(Arg.HELP_LICENSES.option())) {
             new Licenses(createConfiguration(argumentContext), new PrintWriter(System.out, false, StandardCharsets.UTF_8)).printHelp();
             return null;
         }
@@ -183,8 +177,8 @@ public static ReportConfiguration createConfiguration(final ArgumentContext argu
         Optional<Option> dirOpt = CLIOptionCollection.INSTANCE.getSelected(Arg.DIR);
         if (dirOpt.isPresent()) {
             try {
-                configuration.addSource(getReportable(commandLine.getParsedOptionValue(
-                        dirOpt.get()), configuration));
+                DocumentName directoryName = commandLine.getParsedOptionValue(dirOpt.get());
+                configuration.addSource(getReportable(directoryName.asFile(), configuration));
             } catch (ParseException e) {
                 throw new ConfigurationException("Unable to set parse " + dirOpt.get(), e);
             }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/OptionCollectionParser.java b/apache-rat-core/src/main/java/org/apache/rat/OptionCollectionParser.java
index d40686c60..db75e3eec 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/OptionCollectionParser.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/OptionCollectionParser.java
@@ -76,8 +76,7 @@ public ArgumentContext parseCommands(final File workingDirectory, final String[]
      * @return the CommandLine
      * @throws ParseException on option parsing error.
      */
-    //@VisibleForTesting
-    CommandLine parseCommandLine(final Options opts, final String[] args) throws ParseException {
+    public static CommandLine parseCommandLine(final Options opts, final String[] args) throws ParseException {
         try {
             return DefaultParser.builder().setDeprecatedHandler(DeprecationReporter.getLogReporter())
                     .setAllowPartialMatching(true).build().parse(opts, args);
@@ -100,8 +99,7 @@ CommandLine parseCommandLine(final Options opts, final String[] args) throws Par
      */
     private ArgumentContext parseCommands(final File workingDirectory, final String[] args,
                                                                        final Options options) throws IOException, ParseException {
-        CommandLine commandLine = parseCommandLine(options, args);
-        ArgumentContext argumentContext = new ArgumentContext(workingDirectory, commandLine);
+        ArgumentContext argumentContext = new ArgumentContext(workingDirectory, options, args);
         Arg.processLogLevel(argumentContext, uiOptionCollection);
         populateConfiguration(argumentContext);
         if (uiOptionCollection.isSelected(Arg.HELP_LICENSES)) {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Report.java b/apache-rat-core/src/main/java/org/apache/rat/Report.java
index 5f5f4cb35..ce019b782 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Report.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Report.java
@@ -19,8 +19,14 @@
 package org.apache.rat;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.nio.charset.StandardCharsets;
 
 import org.apache.commons.cli.Options;
+import org.apache.commons.io.function.IOSupplier;
+import org.apache.rat.commandline.ArgumentContext;
 import org.apache.rat.document.RatDocumentAnalysisException;
 import org.apache.rat.help.Help;
 import org.apache.rat.utils.DefaultLog;
@@ -42,34 +48,66 @@ public final class Report {
     public static void main(final String[] args) throws Exception {
         DefaultLog.getInstance().info(new VersionInfo().toString());
 
+
         if (args == null || args.length == 0) {
             DefaultLog.getInstance().info("Please use the \"--help\" option to see a " +
                     "list of valid commands and options, as you did not provide any arguments.");
             System.exit(0);
         }
 
-        ReportConfiguration configuration = OptionCollection.parseCommands(new File("."), args, Report::printUsage);
-        if (configuration != null) {
-            configuration.validate(DefaultLog.getInstance()::error);
-            Reporter reporter = new Reporter(configuration);
-            reporter.output();
-            reporter.writeSummary(DefaultLog.getInstance().asWriter());
+        Reporter.Output result = generateReport(CLIOptionCollection.INSTANCE, new File("."), args);
+        if (result != null) {
+            result.writeSummary(DefaultLog.getInstance().asWriter());
 
-            if (configuration.getClaimValidator().hasErrors()) {
-                configuration.getClaimValidator().logIssues(reporter.getClaimsStatistic());
+            if (result.getConfiguration().getClaimValidator().hasErrors()) {
+                result.getConfiguration().getClaimValidator().logIssues(result.getStatistic());
                 throw new RatDocumentAnalysisException(format("Issues with %s",
                         String.join(", ",
-                                configuration.getClaimValidator().listIssues(reporter.getClaimsStatistic()))));
+                                result.getConfiguration().getClaimValidator().listIssues(result.getStatistic()))));
             }
         }
     }
 
     /**
-     * Prints the usage message on {@code System.out}.
-     * @param opts The defined options.
+     * Prints the usage message on the specified output stream.
+     * @param out The OutputStream supplier
      */
-    private static void printUsage(final Options opts) {
-        new Help(System.out).printUsage(opts);
+    private static void printUsage(final Options options, final IOSupplier<OutputStream> out) {
+        try (OutputStream stream = out.get();
+             PrintWriter writer = new PrintWriter(stream, false, StandardCharsets.UTF_8)) {
+            new Help(writer).printUsage(options);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Generates the report
+     * @param workingDirectory the directory that we are executing in
+     * @param args the arguments from the command line.
+     * @return The Client output.
+     * @throws Exception on error.
+     */
+    static Reporter.Output generateReport(final CLIOptionCollection optionCollection, final File workingDirectory, final String[] args) throws Exception {
+        Reporter.Output output = null;
+        OptionCollectionParser optionParser = new OptionCollectionParser(optionCollection);
+        ArgumentContext argumentContext = optionParser.parseCommands(workingDirectory, args);
+        ReportConfiguration configuration = argumentContext.getConfiguration();
+        if (configuration != null) {
+            if (argumentContext.getCommandLine().hasOption(CLIOptionCollection.HELP)) {
+                printUsage(optionCollection.getOptions(), argumentContext.getConfiguration().getOutput());
+            } else if (!configuration.hasSource()) {
+                String msg = "No directories or files specified for scanning. Did you forget to close a multi-argument option?";
+                DefaultLog.getInstance().error(msg);
+                printUsage(optionCollection.getOptions(), argumentContext.getConfiguration().getOutput());
+            } else {
+                configuration.validate();
+                Reporter reporter = new Reporter(configuration);
+                output = reporter.execute();
+                output.format(configuration);
+            }
+        }
+        return output;
     }
 
     private Report() {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
index 799dfaf53..f6b2ccf7c 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
@@ -34,18 +34,26 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.SortedSet;
-import java.util.function.Consumer;
 
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.apache.commons.collections4.set.UnmodifiableSortedSet;
 import org.apache.commons.io.function.IOSupplier;
 import org.apache.commons.io.output.CloseShieldOutputStream;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.api.RatException;
 import org.apache.rat.commandline.StyleSheets;
 import org.apache.rat.config.AddLicenseHeaders;
 import org.apache.rat.config.exclusion.ExclusionProcessor;
 import org.apache.rat.config.exclusion.StandardCollection;
 import org.apache.rat.config.results.ClaimValidator;
+import org.apache.rat.configuration.XMLConfigurationReader;
 import org.apache.rat.configuration.builders.AnyBuilder;
 import org.apache.rat.document.DocumentName;
 import org.apache.rat.document.DocumentNameMatcher;
@@ -55,11 +63,19 @@
 import org.apache.rat.license.LicenseSetFactory;
 import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.report.IReportable;
+import org.apache.rat.report.RatReport;
+import org.apache.rat.report.claim.ClaimStatistic;
+import org.apache.rat.report.xml.writer.IXmlWriter;
+import org.apache.rat.report.xml.writer.XmlWriter;
 import org.apache.rat.utils.DefaultLog;
 import org.apache.rat.utils.Log.Level;
 import org.apache.rat.utils.ReportingSet;
 import org.apache.rat.walker.FileListWalker;
 import org.apache.rat.walker.IReportableListWalker;
+import org.w3c.dom.Node;
+import org.xml.sax.SAXException;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
  * A configuration object is used by the front end to invoke the
@@ -68,6 +84,8 @@
  */
 public class ReportConfiguration {
 
+    /** The IODescriptor for System.out */
+    public static final IODescriptor<OutputStream> SYSTEM_OUT = new  IODescriptor<>("System.out", () -> CloseShieldOutputStream.wrap(System.out));
     /**
      * The styles of processing for various categories of documents.
      */
@@ -117,11 +135,11 @@ public String desc() {
     /**
      * The IOSupplier that provides the output stream to write the report to.
      */
-    private IOSupplier<OutputStream> out;
+    private IODescriptor<OutputStream> out;
     /**
      * The IOSupplier that provides the stylesheet to style the XML output.
      */
-    private IOSupplier<InputStream> styleSheet;
+    private IODescriptor<InputStream> styleSheet;
 
     /**
      * A list of files to read file names from.
@@ -176,6 +194,10 @@ public ReportConfiguration() {
         reportables = new ArrayList<>();
     }
 
+    public Serde serde() {
+        return new Serde();
+    }
+
     /**
      * Report the excluded files to the appendable object.
      * @param appendable the appendable object to write to.
@@ -427,7 +449,7 @@ public void addIncludedPatterns(final Iterable<String> patterns) {
     }
 
     /**
-     * Get the DocumentNameMatcher that excludes files found in the directory tree..
+     * Get the DocumentNameMatcher that excludes files found in the directory tree.
      * @param baseDir the DocumentName for the base directory.
      * @return the DocumentNameMatcher for the base directory.
      */
@@ -441,6 +463,15 @@ public DocumentNameMatcher getDocumentExcluder(final DocumentName baseDir) {
      * the report with.
      */
     public IOSupplier<InputStream> getStyleSheet() {
+        return styleSheet.ioSupplier();
+    }
+
+    /**
+     * Gets the IODescriptor of the style sheet.
+     * @return the Supplier of the InputStream that is the XSLT style sheet to style
+     * the report with.
+     */
+    public IODescriptor<InputStream> getStyleSheetDescriptor() {
         return styleSheet;
     }
 
@@ -450,7 +481,7 @@ public IOSupplier<InputStream> getStyleSheet() {
      * multiple times.
      * @param styleSheet the XSLT style sheet to style the report with.
      */
-    public void setStyleSheet(final IOSupplier<InputStream> styleSheet) {
+    public void setStyleSheet(final IODescriptor<InputStream> styleSheet) {
         this.styleSheet = styleSheet;
     }
 
@@ -462,7 +493,7 @@ public void setStyleSheet(final IOSupplier<InputStream> styleSheet) {
      */
     public void setFrom(final Defaults defaults) {
         licenseSetFactory.add(defaults.getLicenseSetFactory());
-        if (getStyleSheet() == null) {
+        if (getStyleSheetDescriptor() == null) {
             setStyleSheet(StyleSheets.PLAIN.getStyleSheet());
         }
         defaults.getStandardExclusion().forEach(this::addExcludedCollection);
@@ -498,19 +529,18 @@ public void setStyleSheet(final URI styleSheet) {
      */
     public void setStyleSheet(final URL styleSheet) {
         Objects.requireNonNull(styleSheet, "Stylesheet file must not be null");
-        setStyleSheet(styleSheet::openStream);
+        setStyleSheet(new IODescriptor<>(styleSheet.toString(), styleSheet::openStream));
     }
 
     /**
      * Sets the supplier for the output stream. The supplier may be called multiple
      * times to provide the stream. Suppliers should prepare streams that are
      * appended to and that can be closed. If an {@code OutputStream} should not be
-     * closed consider wrapping it in a {@code CloseShieldOutputStream}
+     * closed consider wrapping it in a {@code NoCloseOutputStream}
      * @param out The OutputStream supplier that provides the output stream to write
      * the report to. A null value will use System.out.
-     * @see CloseShieldOutputStream
      */
-    public void setOut(final IOSupplier<OutputStream> out) {
+    public void setOut(final IODescriptor<OutputStream> out) {
         this.out = out;
     }
 
@@ -518,7 +548,7 @@ public void setOut(final IOSupplier<OutputStream> out) {
      * Sets the OutputStream supplier to use the specified file. The file may be
      * opened and closed several times. File is deleted first and then may be
      * repeatedly opened in append mode.
-     * @see #setOut(IOSupplier)
+     * @see #setOut(IODescriptor)
      * @param file The file to create the supplier with.
      */
     public void setOut(final File file) {
@@ -534,7 +564,7 @@ public void setOut(final File file) {
         if (!parent.mkdirs() && !parent.isDirectory()) {
             DefaultLog.getInstance().warn("Unable to create directory: " + file.getParentFile());
         }
-        setOut(() -> new FileOutputStream(file, true));
+        setOut(new IODescriptor<>(file.toString(), () -> new FileOutputStream(file, true)));
     }
 
     /**
@@ -543,7 +573,15 @@ public void setOut(final File file) {
      * @return The supplier of the output stream to write the report to.
      */
     public IOSupplier<OutputStream> getOutput() {
-        return out == null ? () -> CloseShieldOutputStream.wrap(System.out) : out;
+        return getOutputDescriptor().ioSupplier();
+    }
+
+    /**
+     * Returns the output IODescriptor.
+     * @return The IODescriptor of the output stream to write the report to.
+     */
+    public IODescriptor<OutputStream> getOutputDescriptor() {
+        return out == null ? SYSTEM_OUT : out;
     }
 
     /**
@@ -671,7 +709,7 @@ public SortedSet<String> getLicenseCategories(final LicenseFilter filter) {
      * @param filter The LicenseFilter to filter the licenses by.
      * @return the Sorted set of approved license categories.
      */
-    public SortedSet<ILicense> getLicenses(final LicenseFilter filter) {
+    public UnmodifiableSortedSet<ILicense> getLicenses(final LicenseFilter filter) {
         return licenseSetFactory.getLicenses(filter);
     }
 
@@ -827,19 +865,162 @@ public LicenseSetFactory getLicenseSetFactory() {
 
     /**
      * Validates that the configuration is valid.
-     * @param logger String consumer to log warning messages to.
      * @throws ConfigurationException on configuration error.
      */
-    public void validate(final Consumer<String> logger) {
+    public void validate() {
         if (!hasSource()) {
             String msg = "At least one source must be specified";
-            logger.accept(msg);
+            DefaultLog.getInstance().error(msg);
             throw new ConfigurationException(msg);
         }
-        if (licenseSetFactory.getLicenses(LicenseFilter.ALL).isEmpty()) {
-            String msg = "You must specify at least one license";
-            logger.accept(msg);
-            throw new ConfigurationException(msg);
+        licenseSetFactory.validate();
+    }
+
+    /**
+     * Serializes the ReportConfiguration into an XML document that can be deserialzed by the Serde.
+     * Deserialized ReportConfigurations can not be executed as the reportable objects a simply named placeholders
+     * and do not have access to the original object.
+     */
+    @SuppressFBWarnings({"MALICIOUS_XSLT", "XXE_DOCUMENT"})
+    public class Serde {
+        /**
+         * Writes the configuration as an XML document to the appendable.
+         *
+         * @param appendable the Appendable to write to.
+         * @throws IOException on error.
+         */
+        public void serialize(final Appendable appendable) throws IOException {
+            try (IXmlWriter writer = new XmlWriter(appendable)) {
+                writer.openElement("ReportConfiguration")
+                        .attribute("addingLicenses", Boolean.toString(addingLicenses))
+                        .attribute("addingLicensesForced", Boolean.toString(addingLicensesForced))
+                        .attribute("listFamilies", listFamilies.name())
+                        .attribute("listLicenses", listLicenses.name())
+                        .attribute("dryRun", Boolean.toString(dryRun))
+                        .attribute("archiveProcessing", getArchiveProcessing().name())
+                        .attribute("standardProcessing", getStandardProcessing().name())
+                        .attribute("stylesheet", styleSheet.name())
+                        .attribute("output", out.name());
+                if (StringUtils.isNotEmpty(copyrightMessage)) {
+                    writer.openElement("copyrightMessage").content(copyrightMessage).closeElement();
+                }
+                writer.openElement("sources");
+                for (File f : sources) {
+                    writer.openElement("source").attribute("name", f.getName()).closeElement();
+                }
+                writer.closeElement("sources").openElement("reportables");
+                for (IReportable reportable : reportables) {
+                    writer.openElement("reportable")
+                            .attribute("baseName", reportable.name().getBaseName())
+                            .attribute("name", reportable.name().toString())
+                            .attribute("class", reportable.getClass().getName()).closeElement();
+                }
+                writer.closeElement();
+
+                exclusionProcessor.serde().serialize(writer);
+
+                writer.openElement("claimValidator");
+                for (ClaimStatistic.Counter counter : ClaimStatistic.Counter.values()) {
+                    writer.openElement("claimCounter")
+                            .attribute("name", counter.name()).attribute("min", Integer.toString(claimValidator.getMin(counter)))
+                            .attribute("max", Integer.toString(claimValidator.getMax(counter))).closeElement();
+                }
+                writer.closeElement();
+            } catch (IOException e) {
+                throw e;
+            } catch (Exception e) {
+                throw new IOException(e);
+            }
+        }
+
+        public void deserialize(final IOSupplier<InputStream> inputStreamSupplier, final DocumentName workingDirectory) throws IOException {
+            DocumentBuilder builder;
+            try {
+                builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+            } catch (ParserConfigurationException e) {
+                throw new ConfigurationException("Unable to create DOM builder", e);
+            }
+            org.w3c.dom.Document document;
+            try (InputStream stream = inputStreamSupplier.get()) {
+                document = builder.parse(stream);
+            } catch (SAXException e) {
+                throw new IOException("Unable to read input", e);
+            }
+            Node node = document.getDocumentElement();
+            if (!node.getNodeName().equals("ReportConfiguration")) {
+                throw new IOException("Invalid ReportConfiguration");
+            }
+            Map<String, String> attributes = XMLConfigurationReader.attributes(node);
+            addingLicensesForced = Boolean.parseBoolean(attributes.get("addingLicensesForced"));
+            listFamilies = LicenseFilter.valueOf(attributes.get("listFamilies"));
+            listLicenses = LicenseFilter.valueOf(attributes.get("listLicenses"));
+            dryRun = Boolean.parseBoolean(attributes.get("dryRun"));
+            archiveProcessing = Processing.valueOf(attributes.get("archiveProcessing"));
+            standardProcessing = Processing.valueOf(attributes.get("standardProcessing"));
+            String styleName = attributes.get("stylesheet");
+            if (styleName != null) {
+                styleSheet = StyleSheets.getStyleSheet(styleName, workingDirectory);
+            }
+            String outputName = attributes.get("output");
+            if (outputName != null) {
+                if (outputName.equals(ReportConfiguration.SYSTEM_OUT.name())) {
+                    out = ReportConfiguration.SYSTEM_OUT;
+                } else {
+                    out = IODescriptor.output(outputName, workingDirectory);
+                }
+            }
+
+            XMLConfigurationReader.nodeListConsumer(document.getElementsByTagName("source"), lNode -> {
+                Map<String, String> nAttributes = XMLConfigurationReader.attributes(lNode);
+                addSource(new File(nAttributes.get("name")));
+            });
+
+            // Deserialize the reportables.
+            XMLConfigurationReader.nodeListConsumer(document.getElementsByTagName("reportable"), lNode -> {
+                Map<String, String> nAttributes = XMLConfigurationReader.attributes(lNode);
+                DocumentName documentName = DocumentName.builder().setBaseName(nAttributes.get("baseName"))
+                        .setName(nAttributes.get("name")).build();
+                addSource(new DeserializedReportable(documentName));
+            });
+
+            exclusionProcessor.serde().deserialize(document.getElementsByTagName("ExclusionProcessor").item(0));
+
+            XMLConfigurationReader.nodeListConsumer(document.getElementsByTagName("claimCounter"), lNode -> {
+                Map<String, String> nAttributes = XMLConfigurationReader.attributes(lNode);
+                ClaimStatistic.Counter counter = ClaimStatistic.Counter.valueOf(nAttributes.get("name"));
+                claimValidator.setMin(counter, Integer.parseInt(nAttributes.get("min")));
+                claimValidator.setMax(counter, Integer.parseInt(nAttributes.get("max")));
+            });
         }
     }
+
+    /**
+     * A record that identifies a deserialized reportable.  Deserialized reportables are not executable.
+     * @param name the name of the reportable.
+     */
+    private record DeserializedReportable(DocumentName name) implements IReportable {
+        @Override
+        public void run(final RatReport report) throws RatException {
+            throw new RatException("Attempt to run a deserialized reportable");
+        }
+    }
+
+    /**
+     * An IODescriptor comprises a name and an IOSupplier.  The name should identify the contents of the stream.
+     * @param name the name of the supplier.
+     * @param ioSupplier the IOSupplier that provides either an InputStream or an OutputStream
+     * @param <T> either InputStream or OutputStream.
+     */
+    public record IODescriptor<T>(String name, IOSupplier<T> ioSupplier) {
+        /**
+         * Creates an output IODescriptor for the file name within the working directory.
+         * @param name the name of the file to open.
+         * @param workingDirectory the working directory for the file.
+         * @return the Output IODescriptor.
+         */
+        static IODescriptor<OutputStream> output(final String name, final DocumentName workingDirectory) {
+            DocumentName docName = workingDirectory.resolve(name);
+            return new IODescriptor<OutputStream>(name, () -> new FileOutputStream(docName.asFile()));
+        }
+    };
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Reporter.java b/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
index d387dd44f..edf9e3c92 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
@@ -18,16 +18,19 @@
  */
 package org.apache.rat;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.io.Writer;
+import java.io.StringReader;
 import java.nio.charset.StandardCharsets;
 
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
@@ -38,6 +41,7 @@
 
 import org.apache.commons.io.function.IOSupplier;
 import org.apache.rat.api.RatException;
+import org.apache.rat.document.DocumentName;
 import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.report.RatReport;
 import org.apache.rat.report.claim.ClaimStatistic;
@@ -46,6 +50,10 @@
 import org.apache.rat.report.xml.writer.XmlWriter;
 import org.apache.rat.utils.StandardXmlFactory;
 import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
  * Class that executes the report as defined in a {@link ReportConfiguration} and stores
@@ -56,15 +64,14 @@ public class Reporter {
     /**  Format used for listing licenses. */
     private static final String LICENSE_FORMAT = "%s:\t%s%n\t\t%s%n";
 
-    /** The XML output document */
-    private Document document;
-
-    /** Statistics generated as the report was built */
-    private ClaimStatistic statistic;
-
     /** The configuration for the report */
     private final ReportConfiguration configuration;
 
+    /**
+     * The output from the execution.
+     */
+    private Output output;
+
     /**
      * Create the reporter.
      *
@@ -76,83 +83,39 @@ public Reporter(final ReportConfiguration configuration) {
 
     /**
      * Executes the report and builds the output.
-     * This method will build the internal XML document if it does not already exist.
-     * If this method or either of the {@link #output()} methods have already been called this method will return
-     * the previous results.
-     * @return the claim statistics.
+     * @return the Output object.
      * @throws RatException on error.
      */
-    public ClaimStatistic execute() throws RatException  {
-        if (document == null || statistic == null) {
-            try {
-                if (configuration.hasSource()) {
-                    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-                    Writer outputWriter = new OutputStreamWriter(outputStream, StandardCharsets.UTF_8);
-                    try (IXmlWriter writer = new XmlWriter(outputWriter)) {
-                        statistic = new ClaimStatistic();
-                        RatReport report = XmlReportFactory.createStandardReport(writer, statistic, configuration);
-                        report.startReport();
-                        configuration.getSources().build().run(report);
-                        report.endReport();
-                    }
-                    InputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray());
-                    document = StandardXmlFactory.documentBuilder().parse(inputStream);
-                } else {
-                    document = StandardXmlFactory.documentBuilder().newDocument();
-                    statistic = new ClaimStatistic();
+    public Output execute() throws RatException {
+        try {
+            Output.Builder builder = Output.builder().configuration(configuration);
+            if (configuration.hasSource()) {
+                StringBuilder sb = new StringBuilder();
+                try (IXmlWriter writer = new XmlWriter(sb)) {
+                    writer.startDocument();
+                    ClaimStatistic statistic = new ClaimStatistic();
+                    builder.statistic(statistic);
+                    RatReport report = XmlReportFactory.createStandardReport(writer, statistic, configuration);
+                    report.startReport();
+                    configuration.getSources().build().run(report);
+                    report.endReport();
+                    InputSource inputSource = new InputSource(new StringReader(sb.toString()));
+                    builder.document(StandardXmlFactory.documentBuilder().parse(inputSource));
                 }
-            }  catch (Exception e) {
-                throw RatException.makeRatException(e);
             }
+            this.output = builder.build();
+            return output;
+        } catch (Exception e) {
+            throw RatException.makeRatException(e);
         }
-        return statistic;
     }
 
     /**
-     * Get the claim statistics from the run.
-     *
-     * @return the claim statistics.
+     * Gets the output from the last {@link #execute} call or {@code null} if {@link #execute} has not been called.
+     * @return the output
      */
-    public ClaimStatistic getClaimsStatistic() {
-        return statistic;
-    }
-
-    /**
-     * Outputs the report using the stylesheet and output specified in the configuration.
-     * @return the Claim statistic from the run.
-     * @throws RatException on error.
-     */
-    public ClaimStatistic output() throws RatException {
-        return output(configuration.getStyleSheet(), configuration.getOutput());
-    }
-
-    /**
-     * Outputs the report to the specified output using the stylesheet. It is safe to call this method more than once
-     * in order to generate multiple reports from the same run.
-     *
-     * @param stylesheet the style sheet to use for XSLT formatting.
-     * @param output the output stream to write to.
-     * @return the Claim statistic for the run.
-     * @throws RatException on error.
-     */
-    public ClaimStatistic output(final IOSupplier<InputStream> stylesheet, final IOSupplier<OutputStream> output) throws RatException {
-        ClaimStatistic result = execute();
-        TransformerFactory tf = TransformerFactory.newInstance();
-        Transformer transformer;
-        try (OutputStream out = output.get();
-             InputStream styleIn = stylesheet.get()) {
-            transformer = tf.newTransformer(new StreamSource(styleIn));
-            transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
-            transformer.setOutputProperty(OutputKeys.METHOD, "xml");
-            transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-            transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
-            transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
-            transformer.transform(new DOMSource(document),
-                    new StreamResult(new OutputStreamWriter(out, StandardCharsets.UTF_8)));
-            return result;
-        } catch (TransformerException | IOException e) {
-            throw new RatException(e);
-        }
+    public Output getOutput() {
+        return output;
     }
 
     /**
@@ -172,24 +135,174 @@ public static void listLicenses(final ReportConfiguration configuration, final L
     }
 
     /**
-     * Writes a text summary of issues with the run.
-     * @param appendable the appendable to write to.
-     * @throws IOException on error.
+     * The output from a report run.
      */
-    public void writeSummary(final Appendable appendable) throws IOException {
-        appendable.append("RAT summary:").append(System.lineSeparator());
-        for (ClaimStatistic.Counter counter : ClaimStatistic.Counter.values()) {
-            appendable.append("  ").append(counter.displayName()).append(":  ")
-                    .append(Integer.toString(getClaimsStatistic().getCounter(counter)))
-                    .append(System.lineSeparator());
+    public static final class Output {
+        /** The XML output document */
+        private final Document document;
+        /**
+         * The claim statics from the execution that generated the document.
+         * May be empty if the Document was read from disk.
+         */
+        private final ClaimStatistic statistic;
+        /**
+         * The configuration that generated the document
+         */
+        private final ReportConfiguration configuration;
+
+        /**
+         * Create an output with statistics.
+         * @param builder the Builder
+         */
+        private Output(final Builder builder) {
+            this.document = builder.document;
+            this.statistic = builder.statistic == null ? new ClaimStatistic() : builder.statistic;
+            this.configuration = builder.configuration == null ? new ReportConfiguration() : builder.configuration;
         }
-    }
 
-    /**
-     * Gets the document that was generated during execution.
-     * @return the document that was generated during execution.
-     */
-    public Document getDocument() {
-        return document;
+        public static Builder builder() {
+            return new Builder();
+        }
+
+        /**
+         * Gets the document that was generated during execution.
+         * @return the document that was generated during execution.
+         */
+        public Document getDocument() {
+            return document;
+        }
+
+        public ClaimStatistic getStatistic() {
+            return statistic;
+        }
+
+        public ReportConfiguration getConfiguration() {
+            return configuration;
+        }
+        /**
+         * Formats the report to the output and using the stylesheet found in the report configuration.
+         *
+         * @param config s RAT report configuration.
+         * @throws RatException on error.
+         */
+        public void format(final ReportConfiguration config) throws RatException {
+            format(config.getStyleSheet(), config.getOutput());
+        }
+
+        /**
+         * Formats the report to the specified output using the stylesheet. It is safe to call this method more than once
+         * in order to generate multiple reports from the same run.
+         *
+         * @param stylesheet the style sheet to use for XSLT formatting.
+         * @param output the output stream to write to.
+         * @throws RatException on error.
+         */
+        @SuppressFBWarnings({"MALICIOUS_XSLT", "XXE_DTD_TRANSFORM_FACTORY", " XXE_XSLT_TRANSFORM_FACTORY"})
+        public void format(final IOSupplier<InputStream> stylesheet, final IOSupplier<OutputStream> output) throws RatException {
+            TransformerFactory tf = TransformerFactory.newInstance();
+            Transformer transformer;
+            try (OutputStream out = output.get();
+                 InputStream styleIn = stylesheet.get()) {
+                transformer = tf.newTransformer(new StreamSource(styleIn));
+                transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
+                transformer.setOutputProperty(OutputKeys.METHOD, "xml");
+                transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+                transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+                transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
+                transformer.transform(new DOMSource(document),
+                        new StreamResult(new OutputStreamWriter(out, StandardCharsets.UTF_8)));
+            } catch (TransformerException | IOException e) {
+                throw new RatException(e);
+            }
+        }
+
+        /**
+         * Writes a text summary of issues with the run.
+         * @param appendable the appendable to write to.
+         * @throws IOException on error.
+         */
+        public void writeSummary(final Appendable appendable) throws IOException {
+            appendable.append("RAT summary:").append(System.lineSeparator());
+            for (ClaimStatistic.Counter counter : ClaimStatistic.Counter.values()) {
+                appendable.append("  ").append(counter.displayName()).append(":  ")
+                        .append(Integer.toString(statistic.getCounter(counter)))
+                        .append(System.lineSeparator());
+            }
+        }
+
+        @SuppressFBWarnings("EI_EXPOSE_REP2")
+        public static final class Builder {
+            /** The document that was generated */
+            private Document document;
+            /**
+             * The claim statistic from the execution that generated the document.
+             * May be empty if the Document was read from disk.
+             */
+            private ClaimStatistic statistic;
+            /**
+             * The configuration that generated the document
+             */
+            private ReportConfiguration configuration;
+
+            public Builder document(final Document document) {
+                this.document = document;
+                return this;
+            }
+            @SuppressFBWarnings("XXE_DOCUMENT")
+            public Builder document(final String fileName, final DocumentName workingDirectory) {
+                DocumentBuilder builder;
+                try {
+                    builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+                } catch (ParserConfigurationException e) {
+                    throw new ConfigurationException("Unable to create DOM builder", e);
+                }
+
+                File inputFile = workingDirectory.resolve(fileName).asFile();
+                try (InputStream inputStream = new FileInputStream(inputFile)) {
+                    this.document = builder.parse(inputStream);
+                } catch (SAXException | IOException e) {
+                    throw new ConfigurationException("Unable to read file: " + inputFile, e);
+                }
+                return this;
+            }
+
+            public Output build() {
+                return new Output(this);
+            }
+
+            public Builder statistic(final ClaimStatistic statistic) {
+                this.statistic = statistic;
+                return this;
+            }
+
+            public Builder statistic(final String fileName, final DocumentName workingDirectory) {
+                File sourceFile = workingDirectory.resolve(fileName).asFile();
+                try {
+                    ClaimStatistic statistic = new ClaimStatistic();
+                    statistic.serde().deserialize(() -> new FileInputStream(sourceFile));
+                    this.statistic = statistic;
+                    return this;
+                } catch (IOException e) {
+                    throw new ConfigurationException("Unable to read file: " + sourceFile, e);
+                }
+            }
+
+            public Builder configuration(final ReportConfiguration configuration) {
+                this.configuration = configuration;
+                return this;
+            }
+
+            public Builder configuration(final String fileName, final DocumentName workingDirectory) {
+                File configurationFile = workingDirectory.resolve(fileName).asFile();
+                try {
+                    ReportConfiguration config = new ReportConfiguration();
+                    config.serde().deserialize(() -> new FileInputStream(configurationFile), workingDirectory);
+                    this.configuration = config;
+                    return this;
+                } catch (IOException e) {
+                    throw new ConfigurationException("Unable to read file: " + configurationFile, e);
+                }
+            }
+        }
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/AnalyserFactory.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/AnalyserFactory.java
index f2eca190d..14a7dc84e 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/AnalyserFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/AnalyserFactory.java
@@ -18,10 +18,9 @@
  */
 package org.apache.rat.analysis;
 
-import java.util.Collection;
-import java.util.Set;
 import java.util.function.Predicate;
 
+import org.apache.commons.collections4.set.UnmodifiableSortedSet;
 import org.apache.rat.ConfigurationException;
 import org.apache.rat.Defaults;
 import org.apache.rat.ReportConfiguration;
@@ -80,7 +79,7 @@ public static DocumentAnalyser createMultiplexer(final DocumentAnalyser... analy
      */
     public static DocumentAnalyser createConfiguredAnalyser(final ReportConfiguration configuration) {
         LicenseSetFactory licenseSetFactory = configuration.getLicenseSetFactory();
-        Set<ILicense> licenses = licenseSetFactory.getLicenses(LicenseSetFactory.LicenseFilter.ALL);
+        UnmodifiableSortedSet<ILicense> licenses = licenseSetFactory.getLicenses(LicenseSetFactory.LicenseFilter.ALL);
         if (licenses.isEmpty()) {
             throw new ConfigurationException("At least one license must be defined");
         }
@@ -98,7 +97,7 @@ public static DocumentAnalyser createConfiguredAnalyser(final ReportConfiguratio
     private static final class DefaultAnalyser implements DocumentAnalyser {
 
         /** The licenses to analyze */
-        private final Collection<ILicense> licenses;
+        private final UnmodifiableSortedSet<ILicense> licenses;
         /** the Report Configuration */
         private final ReportConfiguration configuration;
         /** The matcher for generated files */
@@ -109,7 +108,7 @@ private static final class DefaultAnalyser implements DocumentAnalyser {
          * @param config the ReportConfiguration
          * @param licenses The licenses to analyse
          */
-        DefaultAnalyser(final ReportConfiguration config, final Collection<ILicense> licenses) {
+        DefaultAnalyser(final ReportConfiguration config, final UnmodifiableSortedSet<ILicense> licenses) {
             this.licenses = licenses;
             this.configuration = config;
             this.generatedMatcher = configuration.getGeneratedMatcher();
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java
index cec174f6f..3f99b7f87 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java
@@ -20,8 +20,8 @@
 
 import java.io.IOException;
 import java.io.Reader;
-import java.util.Collection;
 
+import org.apache.commons.collections4.set.UnmodifiableSortedSet;
 import org.apache.rat.api.Document;
 import org.apache.rat.document.DocumentAnalyser;
 import org.apache.rat.license.ILicense;
@@ -35,7 +35,7 @@
 class DocumentHeaderAnalyser implements DocumentAnalyser {
 
     /** The license to analyse */
-    private final Collection<ILicense> licenses;
+    private final UnmodifiableSortedSet<ILicense> licenses;
     /** The matcher for generated headers */
     private final IHeaderMatcher generatedMatcher;
 
@@ -43,7 +43,7 @@ class DocumentHeaderAnalyser implements DocumentAnalyser {
      * Constructs the HeaderAnalyser for the specific license.
      * @param licenses The licenses to analyse
      */
-    DocumentHeaderAnalyser(final IHeaderMatcher generatedMatcher, final Collection<ILicense> licenses) {
+    DocumentHeaderAnalyser(final IHeaderMatcher generatedMatcher, final UnmodifiableSortedSet<ILicense> licenses) {
         super();
         this.generatedMatcher = generatedMatcher;
         this.licenses = licenses;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java
index 30243bb07..122a5f512 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java
@@ -21,10 +21,10 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.Reader;
-import java.util.Collection;
 import java.util.Locale;
 import java.util.Objects;
 
+import org.apache.commons.collections4.set.UnmodifiableSortedSet;
 import org.apache.rat.ConfigurationException;
 import org.apache.rat.analysis.matchers.FullTextMatcher;
 import org.apache.rat.api.Document;
@@ -54,7 +54,7 @@ public final class HeaderCheckWorker {
     /** The BufferedReader used to read the lines */
     private final BufferedReader reader;
     /** The licenses to check for match */
-    private final Collection<ILicense> licenses;
+    private final UnmodifiableSortedSet<ILicense> licenses;
     /** The document being processed */
     private final Document document;
     /**  The matcher for generated headers */
@@ -108,7 +108,7 @@ public String toString() {
      * @param licenses The licenses to check against. Not null.
      * @param name The document that is being checked. Possibly null.
      */
-    public HeaderCheckWorker(final IHeaderMatcher generatedMatcher, final Reader reader, final Collection<ILicense> licenses, final Document name) {
+    public HeaderCheckWorker(final IHeaderMatcher generatedMatcher, final Reader reader, final UnmodifiableSortedSet<ILicense> licenses, final Document name) {
         this(generatedMatcher, reader, DEFAULT_NUMBER_OF_RETAINED_HEADER_LINES, licenses, name);
     }
 
@@ -123,7 +123,7 @@ public HeaderCheckWorker(final IHeaderMatcher generatedMatcher, final Reader rea
      * @param document The document that is being checked. Possibly null.
      */
     public HeaderCheckWorker(final IHeaderMatcher generatedMatcher, final Reader reader,
-                             final int numberOfRetainedHeaderLine, final Collection<ILicense> licenses,
+                             final int numberOfRetainedHeaderLine, final UnmodifiableSortedSet<ILicense> licenses,
                              final Document document) {
         Objects.requireNonNull(reader, "Reader may not be null");
         Objects.requireNonNull(licenses, "Licenses may not be null");
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java
index 21a3230ea..4032d01fb 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java
@@ -20,6 +20,7 @@
 
 import java.util.Arrays;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.rat.DeprecationReporter;
 import org.apache.rat.configuration.builders.AbstractBuilder;
 import org.apache.rat.configuration.builders.AnyBuilder;
@@ -31,6 +32,7 @@
  * @since Rat 0.8
  * @deprecated Use new configuration options
  */
+@SuppressFBWarnings("EI_EXPOSE_REP2")
 @Deprecated // Since 0.16
 @DeprecationReporter.Info(since = "0.16", forRemoval = true, use = "new configuration options")
 public class SimplePatternBasedLicense  extends BaseLicense {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java
index c77ddf096..2a5d46b51 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java
@@ -23,6 +23,8 @@
 import org.apache.rat.config.parameters.ComponentType;
 import org.apache.rat.config.parameters.ConfigComponent;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 /**
  * A simple text matching IHeaderMatcher implementation.
  */
@@ -44,11 +46,12 @@ public SimpleTextMatcher(final String simpleText) {
         this(null, simpleText);
     }
 
+    // no sonar and supress FI_USELESS because this is how we ensure that the finalize bug does not bite us
+    @SuppressFBWarnings("FI_USELESS")
     @Override
     protected final void finalize() throws Throwable { // NOSONAR
-        // no sonar because this is how we ensure that the finalize bug does not bite us
+        // finalizer attack remediation.
         super.finalize(); // NOSONAR
-      // finalizer attack remediation.
     }
 
     /**
diff --git a/apache-rat-core/src/main/java/org/apache/rat/commandline/Arg.java b/apache-rat-core/src/main/java/org/apache/rat/commandline/Arg.java
index 069009aa9..dc9911cf0 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/commandline/Arg.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/commandline/Arg.java
@@ -38,7 +38,6 @@
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.output.CloseShieldOutputStream;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.rat.ConfigurationException;
 import org.apache.rat.Defaults;
@@ -132,13 +131,13 @@ public enum Arg {
             .addOption(Option.builder().longOpt("config").hasArgs().argName("File")
                     .desc("File names for system configuration.")
                     .converter(Converters.FILE_CONVERTER)
-                    .type(File.class)
+                    .type(DocumentName.class)
                     .build())
             .addOption(Option.builder().longOpt("licenses").hasArgs().argName("File")
                     .desc("File names for system configuration.")
                     .deprecated(DeprecatedAttributes.builder().setSince("0.17").setForRemoval(true).setDescription(StdMsgs.useMsg("--config")).get())
                     .converter(Converters.FILE_CONVERTER)
-                    .type(File.class)
+                    .type(DocumentName.class)
                     .build()),
             Arg::doNotExecute
     ),
@@ -177,7 +176,7 @@ public enum Arg {
     LICENSES_APPROVED_FILE(new OptionGroup().addOption(Option.builder().longOpt("licenses-approved-file").hasArg().argName("File")
             .desc("Name of file containing comma separated lists of approved License IDs.")
             .converter(Converters.FILE_CONVERTER)
-            .type(File.class)
+            .type(DocumentName.class)
             .build()),
             (context, selected) ->
                     context.getConfiguration().addApprovedLicenseIds(processArrayFile(context, selected))),
@@ -198,7 +197,7 @@ public enum Arg {
     FAMILIES_APPROVED_FILE(new OptionGroup().addOption(Option.builder().longOpt("license-families-approved-file").hasArg().argName("File")
             .desc("Name of file containing comma separated lists of approved family IDs.")
             .converter(Converters.FILE_CONVERTER)
-            .type(File.class)
+            .type(DocumentName.class)
             .build()),
             (context, selected) -> context.getConfiguration().addApprovedLicenseCategories(processArrayFile(context, selected))
     ),
@@ -219,7 +218,7 @@ public enum Arg {
      * Option to read a file licenses to be removed from the approved list.
      */
     LICENSES_DENIED_FILE(new OptionGroup().addOption(Option.builder().longOpt("licenses-denied-file")
-            .hasArg().argName("File").type(File.class)
+            .hasArg().argName("File").type(DocumentName.class)
             .converter(Converters.FILE_CONVERTER)
             .desc("Name of file containing comma separated lists of the denied license IDs. " +
                     "These licenses will be removed from the list of approved licenses. " +
@@ -247,7 +246,7 @@ public enum Arg {
             .desc("Name of file containing comma separated lists of denied license IDs. " +
                     "These license families will be removed from the list of approved licenses. " +
                     "Once license families are removed they can not be added back.")
-            .type(File.class)
+            .type(DocumentName.class)
             .converter(Converters.FILE_CONVERTER)
             .build()),
             (context, selected) -> context.getConfiguration().removeApprovedLicenseCategories(processArrayFile(context, selected))),
@@ -294,12 +293,12 @@ public enum Arg {
                             "File names that do not start with '/' are relative to the directory where the " +
                             "argument is located.")
                     .converter(Converters.FILE_CONVERTER)
-                    .type(File.class)
+                    .type(DocumentName.class)
                     .build()),
             (context, selected) -> {
-                File[] files = getParsedOptionValues(selected, context.getCommandLine());
-                for (File f : files) {
-                    context.getConfiguration().addSource(f);
+                DocumentName[] documentNames = getParsedOptionValues(selected, context.getCommandLine());
+                for (DocumentName documentName : documentNames) {
+                    context.getConfiguration().addSource(documentName.asFile());
                 }
             }),
 
@@ -327,22 +326,22 @@ public enum Arg {
      */
     EXCLUDE_FILE(new OptionGroup()
             .addOption(Option.builder("E").longOpt("exclude-file")
-                    .argName("File").hasArg().type(File.class)
+                    .argName("File").hasArg().type(DocumentName.class)
                     .converter(Converters.FILE_CONVERTER)
                     .deprecated(DeprecatedAttributes.builder().setForRemoval(true).setSince("0.17")
                             .setDescription(StdMsgs.useMsg("--input-exclude-file")).get())
                     .desc("Reads <Expression> entries from a file. Entries will be excluded from processing.")
                     .build())
             .addOption(Option.builder().longOpt("input-exclude-file")
-                    .argName("File").hasArg().type(File.class)
+                    .argName("File").hasArg().type(DocumentName.class)
                     .converter(Converters.FILE_CONVERTER)
                     .desc("Reads <Expression> entries from a file. Entries will be excluded from processing.")
                     .build()),
             (context, selected) -> {
                 try {
-                    File excludeFileName = context.getCommandLine().getParsedOptionValue(selected);
+                    DocumentName excludeFileName = context.getCommandLine().getParsedOptionValue(selected);
                     if (excludeFileName != null) {
-                        context.getConfiguration().addExcludedPatterns(ExclusionUtils.asIterable(excludeFileName, "#"));
+                        context.getConfiguration().addExcludedPatterns(ExclusionUtils.asIterable(excludeFileName.asFile(), "#"));
                     }
                 } catch (Exception e) {
                     throw ConfigurationException.from(e);
@@ -409,12 +408,12 @@ public enum Arg {
      */
     INCLUDE_FILE(new OptionGroup()
             .addOption(Option.builder().longOpt("input-include-file")
-                    .argName("File").hasArg().type(File.class)
+                    .argName("File").hasArg().type(DocumentName.class)
                     .converter(Converters.FILE_CONVERTER)
                     .desc("Reads <Expression> entries from a file. Entries will override excluded files.")
                     .build())
             .addOption(Option.builder().longOpt("includes-file")
-                    .argName("File").hasArg().type(File.class)
+                    .argName("File").hasArg().type(DocumentName.class)
                     .converter(Converters.FILE_CONVERTER)
                     .desc("Reads <Expression> entries from a file. Entries will override excluded files.")
                     .deprecated(DeprecatedAttributes.builder().setForRemoval(true).setSince("0.17")
@@ -422,9 +421,9 @@ public enum Arg {
                     .build()),
             (context, selected) -> {
                 try {
-                    File includeFileName = context.getCommandLine().getParsedOptionValue(selected);
+                    DocumentName includeFileName = context.getCommandLine().getParsedOptionValue(selected);
                     if (includeFileName != null) {
-                        context.getConfiguration().addIncludedPatterns(ExclusionUtils.asIterable(includeFileName, "#"));
+                        context.getConfiguration().addIncludedPatterns(ExclusionUtils.asIterable(includeFileName.asFile(), "#"));
                     }
                 } catch (Exception e) {
                     throw ConfigurationException.from(e);
@@ -486,7 +485,8 @@ public enum Arg {
      * Stop processing an input stream and declare an input file.
      */
     DIR(new OptionGroup().addOption(Option.builder().option("d").longOpt("dir").hasArg()
-            .type(File.class)
+            .type(DocumentName.class)
+            .converter(Converters.FILE_CONVERTER)
             .desc("Used to indicate end of list when using options that take multiple arguments.").argName("DirOrArchive")
             .deprecated(DeprecatedAttributes.builder().setForRemoval(true).setSince("0.17")
                     .setDescription("Use the standard '--' to signal the end of arguments.").get()).build()),
@@ -518,14 +518,14 @@ public enum Arg {
                 if ("x".equals(key)) {
                     // display deprecated message.
                     context.getCommandLine().hasOption("x");
-                    context.getConfiguration().setStyleSheet(StyleSheets.getStyleSheet("xml"));
+                    context.getConfiguration().setStyleSheet(StyleSheets.getStyleSheet("xml", context.getWorkingDirectory()));
                 } else {
                     String[] style = context.getCommandLine().getOptionValues(selected);
                     if (style.length != 1) {
                         DefaultLog.getInstance().error("Please specify a single stylesheet");
                         throw new ConfigurationException("Please specify a single stylesheet");
                     }
-                    context.getConfiguration().setStyleSheet(StyleSheets.getStyleSheet(style[0]));
+                    context.getConfiguration().setStyleSheet(StyleSheets.getStyleSheet(style[0], context.getWorkingDirectory()));
                 }
             }),
 
@@ -605,26 +605,27 @@ public enum Arg {
             .addOption(Option.builder().option("o").longOpt("out").hasArg().argName("File")
                     .desc("Define the output file where to write a report to.")
                     .deprecated(DeprecatedAttributes.builder().setSince("0.17").setForRemoval(true).setDescription(StdMsgs.useMsg("--output-file")).get())
-                    .type(File.class)
+                    .type(DocumentName.class)
                     .converter(Converters.FILE_CONVERTER)
                     .build())
             .addOption(Option.builder().longOpt("output-file").hasArg().argName("File")
                     .desc("Define the output file where to write a report to.")
-                    .type(File.class)
+                    .type(DocumentName.class)
                     .converter(Converters.FILE_CONVERTER)
                     .build()),
             (context, selected) -> {
                 try {
-                    File file = context.getCommandLine().getParsedOptionValue(selected);
-                    File parent = file.getParentFile();
+                    DocumentName documentName = context.getCommandLine().getParsedOptionValue(selected);
+                    File document = documentName.asFile();
+                    File parent = document.getParentFile();
                     if (!parent.mkdirs() && !parent.isDirectory()) {
-                        DefaultLog.getInstance().error("Could not create report parent directory " + file);
+                        DefaultLog.getInstance().error("Could not create report parent directory " + documentName);
                     }
-                    context.getConfiguration().setOut(file);
+                    context.getConfiguration().setOut(document);
                 } catch (ParseException e) {
                     // we write to system out by default.
                     context.logParseException(e, selected, "System.out");
-                    context.getConfiguration().setOut(() -> CloseShieldOutputStream.wrap(System.out)); // NOSONAR
+                    context.getConfiguration().setOut(ReportConfiguration.SYSTEM_OUT);
                 }
             }),
 
@@ -821,7 +822,8 @@ private static List<String> processArrayArg(final ArgumentContext context, final
      * @return Option as a file.
      */
     private static File commandLineFile(final ArgumentContext context, final Option selected) throws ParseException {
-        return context.getCommandLine().getParsedOptionValue(selected);
+        DocumentName documentName = context.getCommandLine().getParsedOptionValue(selected);
+        return documentName.asFile();
     }
 
     /**
@@ -859,9 +861,9 @@ private static void processConfigurationArgs(final ArgumentContext context, fina
 
         optionCollection.getSelected(CONFIGURATION).ifPresent(
                 selected -> {
-                    File[] files = getParsedOptionValues(selected, context.getCommandLine());
-                    for (File file : files) {
-                        defaultBuilder.add(file);
+                    DocumentName[] documentNames = getParsedOptionValues(selected, context.getCommandLine());
+                    for (DocumentName documentName : documentNames) {
+                        defaultBuilder.add(documentName.asFile());
                     }
                 });
         optionCollection.getSelected(CONFIGURATION_NO_DEFAULTS).ifPresent(selected -> {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/commandline/ArgumentContext.java b/apache-rat-core/src/main/java/org/apache/rat/commandline/ArgumentContext.java
index d4374a57b..49917397d 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/commandline/ArgumentContext.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/commandline/ArgumentContext.java
@@ -22,7 +22,9 @@
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
+import org.apache.rat.OptionCollectionParser;
 import org.apache.rat.ReportConfiguration;
 import org.apache.rat.document.DocumentName;
 import org.apache.rat.ui.UIOptionCollection;
@@ -46,21 +48,26 @@ public final class ArgumentContext {
      * Creates a context with the specified configuration.
      * @param workingDirectory the directory from which relative file names will be resolved.
      * @param configuration The configuration that is being built.
-     * @param commandLine The command line that is building the configuration.
+     * @param opts the Options for the command line.
+     * @param args the arguments for the options.
+     * @throws ParseException if the options can not parse the arguments.
      */
-    public ArgumentContext(final File workingDirectory, final ReportConfiguration configuration, final CommandLine commandLine) {
+    public ArgumentContext(final File workingDirectory, final ReportConfiguration configuration, final Options opts, final String[] args)
+            throws ParseException {
         this.workingDirectory = DocumentName.builder(workingDirectory).build();
-        this.commandLine = commandLine;
+        this.commandLine = OptionCollectionParser.parseCommandLine(opts, args);
         this.configuration = configuration;
     }
 
     /**
      * Creates a context with an empty configuration.
      * @param workingDirectory The directory from which to resolve relative file names.
-     * @param commandLine The command line.
+     * @param opts the Options for the command line.
+     * @param args the arguments for the options.
+     * @throws ParseException if the options can not parse the arguments.
      */
-    public ArgumentContext(final File workingDirectory, final CommandLine commandLine) {
-        this(workingDirectory, new ReportConfiguration(), commandLine);
+    public ArgumentContext(final File workingDirectory, final Options opts, final String[] args) throws ParseException {
+        this(workingDirectory, new ReportConfiguration(), opts, args);
     }
 
     /**
diff --git a/apache-rat-core/src/main/java/org/apache/rat/commandline/Converters.java b/apache-rat-core/src/main/java/org/apache/rat/commandline/Converters.java
index 15836663e..15582168c 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/commandline/Converters.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/commandline/Converters.java
@@ -18,9 +18,8 @@
  */
 package org.apache.rat.commandline;
 
-import java.io.File;
-import java.io.IOException;
 import java.util.Arrays;
+import java.util.Optional;
 
 import org.apache.commons.cli.Converter;
 import org.apache.commons.lang3.tuple.Pair;
@@ -73,14 +72,15 @@ private Converters() {
     /**
      * A converter that can handle relative or absolute files.
      */
-    public static final class FileConverter implements Converter<File, NullPointerException> {
+    public static final class FileConverter implements Converter<DocumentName, NullPointerException> {
         /** The working directory to resolve relative files against. */
         private DocumentName workingDirectory;
 
         /**
          * The constructor.
+         * visible for testing
          */
-        private FileConverter() {
+        FileConverter() {
             // private construction only.
         }
 
@@ -95,24 +95,27 @@ public void setWorkingDirectory(final DocumentName workingDirectory) {
         /**
          * Applies the conversion function to the specified file name.
          * @param fileName the file name to create a file from.
-         * @return a File.
+         * @return the DocumentName
          * @throws NullPointerException if {@code fileName} is null.
          */
-        public File apply(final String fileName) throws NullPointerException {
-            File file = new File(fileName);
-            // is this a relative file?
-            if (!fileName.startsWith(File.separator)) {
-                // check for a root provided (e.g. C:\\)"
-                if (!DocumentName.FSInfo.getDefault().rootFor(fileName).isPresent()) {
-                    // no root, resolve against workingDirectory
-                    file = new File(workingDirectory.resolve(fileName).getName()).getAbsoluteFile();
+        public DocumentName apply(final String fileName) throws NullPointerException {
+            DocumentName.FSInfo fsInfo = workingDirectory.fsInfo();
+            DocumentName.Builder builder = DocumentName.builder(fsInfo);
+            String normalizedFileName = fsInfo.normalize(fileName.trim());
+
+            Optional<String> root = fsInfo.rootFor(normalizedFileName);
+            builder.setRoot(root.orElse(workingDirectory.getRoot()));
+            if (fsInfo.startsWithRootOrSeparator(normalizedFileName)) {
+                if (normalizedFileName.startsWith(workingDirectory.getName()) ||
+                        normalizedFileName.startsWith(workingDirectory.getName().substring(workingDirectory.getRoot().length()))) {
+                    builder.setBaseName(workingDirectory.getBaseDocumentName());
+                } else {
+                    builder.setBaseName(fsInfo.dirSeparator());
                 }
+            } else {
+                builder.setBaseName(workingDirectory);
             }
-            try {
-                return file.getCanonicalFile();
-            } catch (IOException e) {
-                return file.getAbsoluteFile();
-            }
+            return  builder.setName(normalizedFileName).build();
         }
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/commandline/StyleSheets.java b/apache-rat-core/src/main/java/org/apache/rat/commandline/StyleSheets.java
index c73a9e4ef..2e110a7db 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/commandline/StyleSheets.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/commandline/StyleSheets.java
@@ -21,12 +21,11 @@
 import java.io.InputStream;
 import java.net.URL;
 import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.Objects;
 
-import org.apache.commons.io.function.IOSupplier;
 import org.apache.rat.ConfigurationException;
+import org.apache.rat.ReportConfiguration;
+import org.apache.rat.document.DocumentName;
 
 import static java.lang.String.format;
 
@@ -49,7 +48,11 @@ public enum StyleSheets {
     /**
      * The plain style sheet. The current default.
      */
-    XML("xml", "Produces output in pretty-printed XML.");
+    XML("xml", "Produces output in pretty-printed XML."),
+    /**
+     * Official HTML5 stylesheet.
+     */
+    XHTML5("xhtml5", "Produces a HTML5 report");
     /**
      * The name of the style sheet. Must map to bundled resource xslt file
      */
@@ -70,29 +73,31 @@ public enum StyleSheets {
     }
 
     /**
-     * Gets the IOSupplier for a style sheet.
-     * @return an IOSupplier for the sheet.
+     * Gets the IODescriptor for a style sheet.
+     * @return an IODescriptor for the sheet.
      */
-    public IOSupplier<InputStream> getStyleSheet() {
-        return Objects.requireNonNull(StyleSheets.class.getClassLoader().getResource(format("org/apache/rat/%s.xsl", name)),
-                "missing stylesheet: " + name)::openStream;
+    public ReportConfiguration.IODescriptor<InputStream> getStyleSheet() {
+        URL url = StyleSheets.class.getClassLoader().getResource(format("org/apache/rat/%s.xsl", name));
+        Objects.requireNonNull(url, "missing stylesheet: " + name);
+        return new ReportConfiguration.IODescriptor<>(name, url::openStream);
     }
 
     /**
-     * Gets the IOSupplier for a style sheet.
+     * Gets the IODescriptor for a style sheet.
      * @param name the short name for or the path to a style sheet.
-     * @return the IOSupplier for the style sheet.
+     * @param workingDirectory the working directory to resolve the name against.
+     * @return the IODescriptor for the style sheet.
      */
-    public static IOSupplier<InputStream> getStyleSheet(final String name) {
+    public static ReportConfiguration.IODescriptor<InputStream> getStyleSheet(final String name, final DocumentName workingDirectory) {
         URL url = StyleSheets.class.getClassLoader().getResource(format("org/apache/rat/%s.xsl", name));
         if (url != null) {
-            return url::openStream;
+            return new ReportConfiguration.IODescriptor<>(name, url::openStream);
         }
-        Path p = Paths.get(name);
-        if (p.toFile().exists()) {
-            return () -> Files.newInputStream(p);
+        DocumentName xslt = workingDirectory.resolve(name);
+        if (xslt.asFile().exists()) {
+            return new ReportConfiguration.IODescriptor<>(xslt.toString(), () -> Files.newInputStream(xslt.asFile().toPath()));
         }
-        throw new ConfigurationException(format("Stylesheet file '%s' not found", name));
+        throw new ConfigurationException(format("Stylesheet file '%s' not found: %s", name, xslt.getName()));
     }
 
     /**
diff --git a/apache-rat-core/src/main/java/org/apache/rat/config/exclusion/ExclusionProcessor.java b/apache-rat-core/src/main/java/org/apache/rat/config/exclusion/ExclusionProcessor.java
index 7e7474b00..1ddce2e8a 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/config/exclusion/ExclusionProcessor.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/config/exclusion/ExclusionProcessor.java
@@ -22,15 +22,22 @@
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.NotImplementedException;
+import org.apache.rat.configuration.XMLConfigurationReader;
 import org.apache.rat.document.DocumentName;
 import org.apache.rat.document.DocumentNameMatcher;
+import org.apache.rat.report.xml.writer.IXmlWriter;
 import org.apache.rat.utils.DefaultLog;
 import org.apache.rat.utils.ExtendedIterator;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 
 import static java.lang.String.format;
 
@@ -74,7 +81,13 @@ public ExclusionProcessor() {
         excludedCollections = new HashSet<>();
     }
 
-    /** Reset the {@link #lastMatcher} and {@link #lastMatcherBaseDir} to start again */
+    public Serde serde() {
+        return new Serde();
+    }
+
+    /**
+     * Reset the {@link #lastMatcher} and {@link #lastMatcherBaseDir} to start again
+     */
     private void resetLastMatcher() {
         lastMatcher = null;
         lastMatcherBaseDir = null;
@@ -203,7 +216,7 @@ public ExclusionProcessor addExcludedCollection(final StandardCollection collect
     public DocumentNameMatcher getNameMatcher(final DocumentName basedir) {
         // if lastMatcher is not set or the basedir is not the same as the last one then
         // we have to regenerate the matching document.
-        // Otherwise we can just return the lastMatcher since there is no change.
+        // Otherwise, we can just return the lastMatcher since there is no change.
         if (lastMatcher == null || !basedir.equals(lastMatcherBaseDir)) {
             lastMatcherBaseDir = basedir;
 
@@ -337,4 +350,75 @@ private void extractPaths(final MatcherSet.Builder matcherBuilder) {
         }
     }
 
+    public class Serde {
+        public void serialize(final IXmlWriter writer) throws IOException {
+            writer.openElement("ExclusionProcessor");
+
+            for (String pattern : excludedPatterns) {
+                writer.openElement("excludedPattern").attribute("pattern", pattern).closeElement();
+            }
+            for (StandardCollection obj : excludedCollections) {
+                writer.openElement("excludedCollection").attribute("name", obj.name()).closeElement();
+            }
+            for (DocumentNameMatcher obj : excludedPaths) {
+                writer.openElement("excludedPath").attribute("name", obj.toString()).closeElement();
+            }
+
+            for (String pattern : includedPatterns) {
+                writer.openElement("includedPattern").attribute("pattern", pattern).closeElement();
+            }
+            for (StandardCollection obj : includedCollections) {
+                writer.openElement("includedCollection").attribute("name", obj.name()).closeElement();
+            }
+            for (DocumentNameMatcher obj : includedPaths) {
+                writer.openElement("includedPath").attribute("name", obj.toString()).closeElement();
+            }
+
+            for (StandardCollection obj : fileProcessors) {
+                writer.openElement("fileProcessor").attribute("name", obj.name()).closeElement();
+            }
+            writer.closeElement();
+
+        }
+
+        public void deserialize(final Node n) {
+            final NodeList children = n.getChildNodes();
+            for (int i = 0; i < children.getLength(); i++) {
+                Node child = children.item(i);
+                Map<String, String> attributes = XMLConfigurationReader.attributes(child);
+                StandardCollection collection;
+                switch (child.getNodeName()) {
+                    case "excludedPattern":
+                        excludedPatterns.add(attributes.get("pattern"));
+                        break;
+                    case "excludedCollection":
+                        collection = StandardCollection.valueOf(attributes.get("name"));
+                        excludedCollections.add(collection);
+                        break;
+                    case "excludedPath":
+                        excludedPaths.add(new DocumentNameMatcher(attributes.get("name"),
+                                (Predicate<DocumentName>) x -> {
+                                    throw new NotImplementedException("Deserialized ExclusionProcessor can not evaluate paths");
+                                }));
+                        break;
+                    case "includedPattern":
+                        includedPatterns.add(attributes.get("pattern"));
+                        break;
+                    case "includedCollection":
+                        collection = StandardCollection.valueOf(attributes.get("name"));
+                        includedCollections.add(collection);
+                        break;
+                    case "includedPath":
+                        includedPaths.add(new DocumentNameMatcher(attributes.get("name"),
+                                (Predicate<DocumentName>) x -> {
+                                    throw new NotImplementedException("Deserialized ExclusionProcessor can not evaluate paths");
+                                }));
+                        break;
+                    default:
+                        throw new NotImplementedException("Deserialization for %s is not implemented", child.getNodeName());
+                }
+
+            }
+        }
+    }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/config/parameters/Description.java b/apache-rat-core/src/main/java/org/apache/rat/config/parameters/Description.java
index 6aa20bd38..a4e579dab 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/config/parameters/Description.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/config/parameters/Description.java
@@ -37,7 +37,7 @@
 /**
  * A description of a component.
  */
-public class Description {
+public final class Description {
     /** The type of component this describes */
     private final ComponentType type;
     /**
diff --git a/apache-rat-core/src/main/java/org/apache/rat/config/results/ClaimValidator.java b/apache-rat-core/src/main/java/org/apache/rat/config/results/ClaimValidator.java
index f295f276b..b4f81da32 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/config/results/ClaimValidator.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/config/results/ClaimValidator.java
@@ -23,6 +23,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.mutable.MutableInt;
 import org.apache.rat.report.claim.ClaimStatistic;
 import org.apache.rat.utils.DefaultLog;
 
@@ -35,11 +36,11 @@ public final class ClaimValidator {
     /**
      * The map of  max counter limits.
      */
-    private final ConcurrentHashMap<ClaimStatistic.Counter, Integer> max = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<ClaimStatistic.Counter, MutableInt> max = new ConcurrentHashMap<>();
     /**
      * The map of  min counter limits.
      */
-    private final ConcurrentHashMap<ClaimStatistic.Counter, Integer> min = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<ClaimStatistic.Counter, MutableInt> min = new ConcurrentHashMap<>();
     /**
      * {@code true} if errors were detected in the claim.
      */
@@ -51,8 +52,8 @@ public final class ClaimValidator {
     public ClaimValidator() {
         for (ClaimStatistic.Counter counter : ClaimStatistic.Counter.values()) {
             max.put(counter,
-                    counter.getDefaultMaxValue() < 0 ? Integer.MAX_VALUE : counter.getDefaultMaxValue());
-            min.put(counter, counter.getDefaultMinValue());
+                    new MutableInt(counter.getDefaultMaxValue() < 0 ? Integer.MAX_VALUE : counter.getDefaultMaxValue()));
+            min.put(counter, new MutableInt(counter.getDefaultMinValue()));
         }
     }
 
@@ -70,22 +71,28 @@ public boolean hasErrors() {
      * @param value the value to set. A negative value specifies no maximum value.
      */
     public void setMax(final ClaimStatistic.Counter counter, final int value) {
-        if (value < 0) {
-            max.put(counter, Integer.MAX_VALUE);
-        } else {
-            max.put(counter, value);
-        }
-        min.compute(counter, (k, v) -> v != null && v > max.get(k) ? max.get(k) : v);
+        MutableInt maxValue = max.compute(counter, (k, v) -> {
+            v.setValue(value < 0 ? Integer.MAX_VALUE : value);
+            return v; });
+        min.compute(counter, (k, v) ->  {
+            if (v.intValue() > maxValue.intValue()) {
+                v.setValue(maxValue.intValue());
+            }
+            return v; });
     }
 
     /**
-     * Sets the max value for the specified counter.
+     * Sets the min value for the specified counter.
      * @param counter the counter to set the limit for.
      * @param value the value to set. A negative value specifies no maximum value.
      */
     public void setMin(final ClaimStatistic.Counter counter, final int value) {
-        min.put(counter, value);
-        max.compute(counter, (k, v) -> v == null || v < value ? value : v);
+        min.put(counter, new MutableInt(value));
+        max.compute(counter, (k, v) -> {
+            if (v.intValue() < value) {
+                v.setValue(value);
+            }
+            return v; });
     }
 
     /**
@@ -94,8 +101,7 @@ public void setMin(final ClaimStatistic.Counter counter, final int value) {
      * @return the limit for the counter or 0 if not set.
      */
     public int getMax(final ClaimStatistic.Counter counter) {
-        Integer result = max.get(counter);
-        return result == null ? 0 : result;
+        return max.get(counter).intValue();
     }
 
     /**
@@ -104,8 +110,7 @@ public int getMax(final ClaimStatistic.Counter counter) {
      * @return the limit for the counter or 0 if not set.
      */
     public int getMin(final ClaimStatistic.Counter counter) {
-        Integer result = min.get(counter);
-        return result == null ? 0 : result;
+        return min.get(counter).intValue();
     }
 
     /**
@@ -115,7 +120,7 @@ public int getMin(final ClaimStatistic.Counter counter) {
      * @return {@code true} if the count is within the limits, {@code false} otherwise.
      */
     public boolean isValid(final ClaimStatistic.Counter counter, final int count) {
-        boolean result = max.get(counter) >= count && min.get(counter) <= count;
+        boolean result = max.get(counter).intValue() >= count && min.get(counter).intValue() <= count;
         hasErrors |= !result;
         return result;
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
index ac11bdd5a..deb63c17e 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
@@ -61,6 +61,8 @@
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 /**
  * A class that reads the XML configuration file format.
  */
@@ -173,7 +175,7 @@ public void read(final URI... uris) {
      * @param list the NodeList to process
      * @param consumer the consumer to apply to each node in the list.
      */
-    private void nodeListConsumer(final NodeList list, final Consumer<Node> consumer) {
+    public static void nodeListConsumer(final NodeList list, final Consumer<Node> consumer) {
         for (int i = 0; i < list.getLength(); i++) {
             consumer.accept(list.item(i));
         }
@@ -199,7 +201,7 @@ public void add(final Document newDoc) {
      * @param node The node to process
      * @return the map of attributes on the node.
      */
-    private Map<String, String> attributes(final Node node) {
+    public static Map<String, String> attributes(final Node node) {
         NamedNodeMap nnm = node.getAttributes();
         Map<String, String> result = new HashMap<>();
         for (int i = 0; i < nnm.getLength(); i++) {
@@ -606,6 +608,7 @@ public void readMatcherBuilders() {
         nodeListConsumer(document.getElementsByTagName(XMLConfig.MATCHER), this::parseMatcherBuilder);
     }
 
+    @SuppressFBWarnings("URLCONNECTION_SSRF_FD")
     @Override
     public void addMatchers(final URI uri) {
         read(uri);
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationWriter.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationWriter.java
index 79e7da998..fb9ec018e 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationWriter.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationWriter.java
@@ -44,6 +44,8 @@
 import org.apache.rat.report.xml.writer.IXmlWriter;
 import org.apache.rat.report.xml.writer.XmlWriter;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 /**
  * Writes the XML configuration file format.
  */
@@ -59,6 +61,7 @@ public class XMLConfigurationWriter {
      * Constructor
      * @param configuration the configuration information to write.
      */
+    @SuppressFBWarnings("EI_EXPOSE_REP2")
     public XMLConfigurationWriter(final ReportConfiguration configuration) {
         this.configuration = configuration;
         this.matchers = new HashSet<>();
@@ -126,9 +129,8 @@ public void write(final IXmlWriter writer) throws RatException {
                 writer.closeElement(); // APPROVED
 
                 // matchers section
-                MatcherBuilderTracker tracker = MatcherBuilderTracker.instance();
                 writer.openElement(XMLConfig.MATCHERS);
-                for (Class<?> clazz : tracker.getClasses()) {
+                for (Class<?> clazz : MatcherBuilderTracker.instance().getClasses()) {
                     writer.openElement(XMLConfig.MATCHER).attribute(XMLConfig.ATT_CLASS_NAME, clazz.getCanonicalName())
                             .closeElement();
                 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/ChildContainerBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/ChildContainerBuilder.java
index d40a657d2..172314fbe 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/ChildContainerBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/ChildContainerBuilder.java
@@ -59,7 +59,7 @@ protected ChildContainerBuilder() {
      */
     public AbstractBuilder setResource(final String resourceName) {
         // this method is called by reflection
-        URL url = this.getClass().getResource(resourceName);
+        URL url = AbstractBuilder.class.getResource(resourceName);
         if (url == null) {
             throw new ConfigurationException("Unable to read matching text file: " + resourceName);
         }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/MatcherRefBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/MatcherRefBuilder.java
index 68598d4c7..1662220f3 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/MatcherRefBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/MatcherRefBuilder.java
@@ -27,6 +27,8 @@
 import org.apache.rat.config.parameters.ConfigComponent;
 import org.apache.rat.config.parameters.MatcherBuilder;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 /**
  * A reference matching Matcher builder.
  * <p>
@@ -62,6 +64,7 @@ public MatcherRefBuilder setRefId(final String refId) {
      * @param matchers the Map of ids to instances.
      * @return this builder for chaining.
      */
+    @SuppressFBWarnings(value = "EI_EXPOSE_REP2", justification = "Expected external update of matchers.")
     public MatcherRefBuilder setMatcherMap(final Map<String, IHeaderMatcher> matchers) {
         // this method is called by reflection
         this.matchers = matchers;
@@ -109,6 +112,7 @@ public static class IHeaderMatcherProxy implements IHeaderMatcher {
          * @param proxyId the id of the matcher to find.
          * @param matchers a mapping of matchers that have been found.
          */
+        @SuppressFBWarnings(value = "EI_EXPOSE_REP2", justification = "Expected external update of matchers.")
         public IHeaderMatcherProxy(final String proxyId, final Map<String, IHeaderMatcher> matchers) {
             this.proxyId = proxyId;
             this.matchers = matchers;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/document/ArchiveEntryDocument.java b/apache-rat-core/src/main/java/org/apache/rat/document/ArchiveEntryDocument.java
deleted file mode 100644
index dabc848bc..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/document/ArchiveEntryDocument.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */
-
-package org.apache.rat.document;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.SortedSet;
-
-import org.apache.rat.api.Document;
-
-/**
- * A Document that wraps an Archive entry.
- */
-public class ArchiveEntryDocument extends Document {
-
-    /** The contents of the entry */
-    private final byte[] contents;
-
-    /**
-     * Creates an Archive entry.
-     * @param entryName the name of this entry from outside the archive.
-     * @param contents the contents of the entry.
-     * @param nameMatcher the name matcher to filter contents with.
-     */
-    public ArchiveEntryDocument(final ArchiveEntryName entryName, final byte[] contents, final DocumentNameMatcher nameMatcher) {
-        super(entryName, nameMatcher);
-        this.contents = contents;
-    }
-
-    @Override
-    public InputStream inputStream() {
-        return new ByteArrayInputStream(contents);
-    }
-
-    @Override
-    public boolean isDirectory() {
-        return false;
-    }
-
-    @Override
-    public SortedSet<Document> listChildren() {
-        return Collections.emptySortedSet();
-    }
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/document/ArchiveEntryName.java b/apache-rat-core/src/main/java/org/apache/rat/document/ArchiveEntryName.java
index 13b4668e6..df079bf18 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/document/ArchiveEntryName.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/document/ArchiveEntryName.java
@@ -23,18 +23,33 @@
 import java.nio.file.Paths;
 import java.util.Collections;
 
+/**
+ * The DocumentName for an ArchiveEntry.
+ */
 public class ArchiveEntryName extends DocumentName {
     /** The name of the document that contains this entry. */
     private final DocumentName archiveFileName;
 
+    /**
+     * Sets the builder so that a propery DocumentName is constructed.
+     * @param archiveFileName the archvie file DocumentName
+     * @param archiveEntryName the entry name
+     * @return the DocumentName.Builder for the archive entry.
+     */
     private static DocumentName.Builder prepareBuilder(final DocumentName archiveFileName, final String archiveEntryName) {
-        String root = archiveFileName.getName() + "#";
+        String root = archiveFileName.getName() + "#/";
         FSInfo fsInfo = new FSInfo("archiveEntry", "/", true, Collections.singletonList(root));
         return DocumentName.builder(fsInfo)
                 .setRoot(root)
-                .setBaseName(root + "/")
+                .setBaseName("/")
                 .setName(archiveEntryName);
     }
+
+    /**
+     * Constucts an archive file name from an archive file document name and an entry name.
+     * @param archiveFileName the archive file document name.
+     * @param archiveEntryName the archive entry name.
+     */
     public ArchiveEntryName(final DocumentName archiveFileName, final String archiveEntryName) {
         super(prepareBuilder(archiveFileName, archiveEntryName));
         this.archiveFileName = archiveFileName;
@@ -60,25 +75,10 @@ public String getBaseName() {
         return archiveFileName.getName() + "#";
     }
 
-    @Override
-    boolean startsWithRootOrSeparator(final String candidate, final String root, final String separator) {
-        return super.startsWithRootOrSeparator(candidate, root, separator);
-    }
-
     @Override
     public String localized(final String dirSeparator) {
         String superLocal = super.localized(dirSeparator);
         superLocal = superLocal.substring(superLocal.lastIndexOf("#") + 1);
         return archiveFileName.localized(dirSeparator) + "#" + superLocal;
     }
-
-    @Override
-    public boolean equals(final Object other) {
-        return super.equals(other);
-    }
-
-    @Override
-    public int hashCode() {
-        return super.hashCode();
-    }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/document/DocumentName.java b/apache-rat-core/src/main/java/org/apache/rat/document/DocumentName.java
index c2c0510e9..5d004e673 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/document/DocumentName.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/document/DocumentName.java
@@ -27,17 +27,15 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.builder.CompareToBuilder;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
@@ -45,8 +43,8 @@
  * The name for a document. The {@code DocumentName} is an immutable structure that handles all the intricacies of file
  * naming on various operating systems. DocumentNames have several components:
  * <ul>
- *     <li>{@code root} - where in the file system the name starts (e.g C: on windows). May be empty but not null.</li>
- *     <li>{@code dirSeparator} - the separator between name segments (e.g. "\\" on windows, "/" on linux). May not be
+ *     <li>{@code root} - where in the file system the name starts (e.g C:\ on Microsoft Windows). May be empty but not null.</li>
+ *     <li>{@code dirSeparator} - the separator between name segments (e.g. "\" on MicroSoft Windows, "/" on linux). May not be
  *     empty or null.</li>
  *     <li>{@code name} - the name of the file relative to the {@code root}. May not be null. Does NOT begin with a {@code dirSeparator}</li>
  *     <li>{@code baseName} - the name of a directory or file from which this file is reported. A DocumentName with a
@@ -65,7 +63,7 @@ public class DocumentName implements Comparable<DocumentName> {
     private final DocumentName baseName;
     /** The file system info for this document. */
     private final FSInfo fsInfo;
-    /** The root for the DocumentName. May be empty but not null. */
+    /** The root for the DocumentName. May be empty but not null. Must be one of the roots in fsInfo*/
     private final String root;
 
     /**
@@ -126,7 +124,7 @@ public static Builder builder(final DocumentName documentName) {
     }
 
     /**
-     * Creates a file from the document name.
+     * Creates a file from the fully qualified document name.
      * @return a new File object.
      */
     public File asFile() {
@@ -134,7 +132,8 @@ public File asFile() {
     }
 
     /**
-     * Creates a path from the document name.
+     * Creates a path from the document name.  This method uses the fullyqualified name without the root.
+     * this results in a relative file name from the root.
      * @return a new Path object.
      */
     public Path asPath() {
@@ -144,9 +143,23 @@ public Path asPath() {
     /**
      * Creates a new DocumentName by adding the child to the current name.
      * Resulting documentName will have the same base name.
+     * Directory separator is normalized to the directory separator for this file system.
+     * If the child string:
+     * <dl>
+     *     <dt>Is blank</dt>
+     *     <dd>This DocumentName is returned.</dd>
+     *     <dt>Starts with the file system root</dt>
+     *     <dd>The root The root must match the root of this DocumentName and the directory structure
+     *     must start with the directory structure of the basename for this DocuemntName.</dd>
+     *     <dt>Starts with the directory separator character<dt>
+ *         <dd>Result will be a tree starting at the directory specified by the basename.</dd>
+     *     <dt>Does not start with a directory separator character</dt>
+     *     <dd>Result will be a tree starting at the directory specified by this DocumentName</dd>
+     * </dl>
      * @param child the child to add (must use directory separator from this document name).
      * @return the new document name with the same {@link #baseName}, directory sensitivity and case sensitivity as
      * this one.
+     * @throws IllegalArgumentException if the child specifies a different root from this document name.
      */
     public DocumentName resolve(final String child) {
         if (StringUtils.isBlank(child)) {
@@ -156,8 +169,25 @@ public DocumentName resolve(final String child) {
         String pattern = separator.equals("/") ? child.replace('\\', '/') :
                 child.replace('/', '\\');
 
+        Optional<String> expectedRoot = fsInfo.rootFor(child);
+        if (expectedRoot.isPresent()) {
+            if (!expectedRoot.get().equals(getRoot())) {
+                throw new IllegalArgumentException(String.format("%s does not start with %s", pattern, getName()));
+            }
+            if (!getRoot().equals(separator)) {
+                // we have something like C:\ as the root so convert the pattern to start with the separator.
+                pattern = separator + pattern.substring(getRoot().length());
+                if (pattern.startsWith(baseName.name)) {
+                    pattern = pattern.substring(baseName.name.length());
+                }
+            }
+        }
+
+        // patterns with separators either start with the name of this document plus a relative
+        // name, or are just directory off the baseName.  In either case the name is correct.
+        // so just handle the relative case.
         if (!pattern.startsWith(separator)) {
-             pattern = name + separator + pattern;
+            pattern = name + separator + pattern;
         }
 
         return new Builder(this).setName(fsInfo.normalize(pattern)).build();
@@ -168,7 +198,15 @@ public DocumentName resolve(final String child) {
      * @return the fully qualified name of the document.
      */
     public String getName() {
-        return root + fsInfo.dirSeparator() + name;
+        return root + name;
+    }
+
+    /**
+     * Gets the path of the document.  THis is the fully qualified name without the root but starting with a path separator.
+     * @return the path of the document.
+     */
+    public String getPath() {
+        return getDirectorySeparator() + name;
     }
 
     /**
@@ -203,6 +241,14 @@ public String getDirectorySeparator() {
         return fsInfo.dirSeparator();
     }
 
+    /**
+     * Returns the FSInfo for this document name.
+     * @return the FSInfo for this document name.
+     */
+    public FSInfo fsInfo() {
+        return fsInfo;
+    }
+
     /**
      * Determines if the candidate starts with the root or separator strings.
      * @param candidate the candidate to check. If blank method will return {@code false}.
@@ -210,7 +256,7 @@ public String getDirectorySeparator() {
      * @param separator the separator to check. If blank the check is skipped.
      * @return true if either the root or separator check returned {@code true}.
      */
-    boolean startsWithRootOrSeparator(final String candidate, final String root, final String separator) {
+    static boolean startsWithRootOrSeparator(final String candidate, final String root, final String separator) {
         if (StringUtils.isBlank(candidate)) {
             return false;
         }
@@ -287,19 +333,30 @@ public String toString() {
 
     @Override
     public int compareTo(final DocumentName other) {
-        return CompareToBuilder.reflectionCompare(this, other);
+        return new CompareToBuilder()
+                .append(this.root, other.root)
+                .append(this.getBaseName(), other.getBaseName())
+                .append(this.getName(), other.getName()).build();
     }
 
     @Override
-    public boolean equals(final Object other) {
-        return EqualsBuilder.reflectionEquals(this, other);
+    public final boolean equals(final Object other) {
+        if (other instanceof DocumentName otherDocumentName) {
+            return compareTo(otherDocumentName) == 0;
+        }
+        return false;
     }
 
     @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
+    public final int hashCode() {
+        return getName().hashCode();
     }
 
+    /**
+     * The File System Info Data for a DocumentName.
+     * Use to preserve data across DocumentNames without having to
+     * reconstruct the data for each DocumentName.
+     */
     private static final class FSInfoData {
         /** The case sensitivity flag */
         private final boolean isCaseSensitive;
@@ -468,6 +525,14 @@ public Optional<String> rootFor(final String name) {
             return Optional.empty();
         }
 
+        /**
+         * Gets the array of roots for this file system.
+         * @return an array of roots for this file system.
+         */
+        public String[] roots() {
+            return data.roots.toArray(new String[0]);
+        }
+
         /**
          * Tokenizes the string based on the directory separator of this DocumentName.
          * @param source the source to tokenize.
@@ -483,38 +548,97 @@ public String[] tokenize(final String source) {
          * @return the normalized file name.
          */
         public String normalize(final String pattern) {
-            if (StringUtils.isBlank(pattern)) {
+            if (StringUtils.isBlank(pattern) || pattern.trim().equals(".")) {
                 return "";
             }
-            List<String> parts = new ArrayList<>(Arrays.asList(tokenize(pattern)));
-            for (int i = 0; i < parts.size(); i++) {
+            String adjustedPattern = dirSeparator().equals("/") ? pattern.replace("\\", "/") : pattern.replace("/", "\\");
+            if (adjustedPattern.trim().equals(dirSeparator())) {
+                return adjustedPattern;
+            }
+            List<String> parts = new ArrayList<>(Arrays.asList(tokenize(adjustedPattern)));
+            int i = 0;
+            while (i < parts.size()) {
                 String part = parts.get(i);
                 if (part.equals("..")) {
                     if (i == 0) {
                         throw new IllegalStateException("Unable to create path before root");
                     }
-                    parts.set(i - 1, null);
-                    parts.set(i, null);
+                    parts.remove(i);
+                    parts.remove(i - 1);
+                    i--;
                 } else if (part.equals(".")) {
-                    parts.set(i, null);
+                    parts.remove(i);
+                } else {
+                    i++;
+                }
+            }
+            if (parts.isEmpty()) {
+                throw new IllegalStateException("Unable to create path before root");
+            }
+            return String.join(dirSeparator(), parts);
+        }
+
+        /**
+         * Creates a path separated by the directory separator.
+         * Starting with an empty string will cause the directory separator to appear at the beginning.
+         * @param segments the segments that make up the path.
+         * @return the path string.
+         */
+        public String mkPath(final String... segments) {
+            return String.join(dirSeparator(), segments);
+        }
+
+        /**
+         * Determines if the candidate string starts with a root or directory separator as defined in this
+         * FSInfo.
+         * @param candidate the candidate string to test.
+         * @return {@code true} if the candidate starts with a root or a directory separator.
+         */
+        public boolean startsWithRootOrSeparator(final String candidate) {
+            if (candidate == null) {
+                return false;
+            }
+            String target = candidate.trim();
+            if (StringUtils.isBlank(target)) {
+                return false;
+            }
+            for (String root : roots()) {
+                if (target.startsWith(root)) {
+                    return true;
                 }
             }
-            return parts.stream().filter(Objects::nonNull).collect(Collectors.joining(dirSeparator()));
+            return target.startsWith(dirSeparator());
+        }
+
+        private int compareData(final DocumentName.FSInfoData otherData) {
+            int result = Boolean.compare(this.data.isCaseSensitive, otherData.isCaseSensitive);
+            if (result == 0) {
+                result = this.data.separator.compareTo(otherData.separator);
+                if (result == 0) {
+                    if (new HashSet<>(this.data.roots).containsAll(otherData.roots)) {
+                        result = new HashSet<>(otherData.roots).containsAll(this.data.roots) ? 0 : 1;
+                    } else {
+                        result = -1;
+                    }
+                }
+            }
+            return result;
         }
 
         @Override
         public int compareTo(final FSInfo other) {
-            return CompareToBuilder.reflectionCompare(this, other);
+            int result = this.name.compareToIgnoreCase(other.name);
+            return result == 0 ? compareData(other.data) : result;
         }
 
         @Override
         public boolean equals(final Object other) {
-            return EqualsBuilder.reflectionEquals(this, other);
+            return other instanceof FSInfo oth && this.compareTo(oth) == 0;
         }
 
         @Override
         public int hashCode() {
-            return HashCodeBuilder.reflectionHashCode(this);
+            return name.hashCode();
         }
     }
 
@@ -538,7 +662,7 @@ public static final class Builder {
          */
         private Builder(final FSInfo fsInfo) {
             this.fsInfo = fsInfo;
-            root = "";
+            this.root = "";
         }
 
         /**
@@ -596,6 +720,16 @@ private void verify() {
             }
             if (!sameNameFlag) {
                 Objects.requireNonNull(baseName, "Basename must not be null");
+                if (this.root.isBlank()) {
+                    this.root = this.baseName.getRoot();
+                }
+            }
+            if (this.root.isBlank()) {
+                this.root = this.fsInfo.roots()[0];
+            } else {
+                if (!List.of(this.fsInfo.roots()).contains(this.root)) {
+                    throw new IllegalArgumentException(String.format("'%s' is not a valid root for %s", this.root, this.fsInfo));
+                }
             }
         }
 
@@ -622,15 +756,9 @@ public Builder setRoot(final String root) {
         public Builder setName(final String name) {
             Pair<String, String> pair = splitRoot(StringUtils.defaultIfBlank(name, ""));
             if (this.root.isEmpty()) {
-                this.root = pair.getLeft();
+                setRoot(pair.getLeft());
             }
             this.name = fsInfo.normalize(pair.getRight());
-            if (this.baseName != null && !baseName.name.isEmpty()) {
-                if (!this.name.startsWith(baseName.name)) {
-                    this.name = this.name.isEmpty() ? baseName.name :
-                            baseName.name + fsInfo.dirSeparator() + this.name;
-                }
-            }
             return this;
         }
 
@@ -644,19 +772,11 @@ public Builder setName(final String name) {
          */
         Pair<String, String> splitRoot(final String name) {
             String workingName = name;
-            Optional<String> maybeRoot = fsInfo.rootFor(name);
-            String root = maybeRoot.orElse("");
-            if (!root.isEmpty()) {
-                if (workingName.startsWith(root)) {
-                    workingName = workingName.substring(root.length());
-                    if (!workingName.startsWith(fsInfo.dirSeparator())) {
-                        if (root.endsWith(fsInfo.dirSeparator())) {
-                            root = root.substring(0, root.length() - fsInfo.dirSeparator().length());
-                        }
-                    }
-                }
+            String workingRoot = fsInfo.rootFor(name).orElse("");
+            if (!workingRoot.isEmpty() && workingName.startsWith(workingRoot)) {
+                workingName = workingName.substring(workingRoot.length());
             }
-            return ImmutablePair.of(root, workingName);
+            return ImmutablePair.of(workingRoot, workingName);
         }
 
         /**
@@ -745,12 +865,38 @@ public Builder setBaseName(final File file) {
             return this;
         }
 
+        // only called if basName is not null
+        private void verifyBaseName() {
+            if (!this.name.startsWith(baseName.name)) {
+                this.name = this.name.isEmpty() ? baseName.name :
+                        baseName.name + fsInfo.dirSeparator() + this.name;
+            }
+            if (!this.baseName.getRoot().equals(root)) {
+                Builder builder = new Builder(baseName).setRoot(root);
+                if (baseName.baseName != null && baseName.baseName != baseName) {
+                    builder.setBaseName(baseName.baseName);
+                } else {
+                    builder.baseName = null;
+                    builder.sameNameFlag = true;
+                }
+                this.baseName = builder.build();
+            }
+
+        }
+
         /**
          * Build a DocumentName from this builder.
          * @return A new DocumentName.
          */
         public DocumentName build() {
             verify();
+            if (this.baseName != null) {
+                verifyBaseName();
+            } else {
+                if (this.name.startsWith(root)) {
+                    this.name = this.name.substring(root.length());
+                }
+            }
             return new DocumentName(this);
         }
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/header/HeaderMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/header/HeaderMatcher.java
index 89b71b0a2..7f05afa3a 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/header/HeaderMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/header/HeaderMatcher.java
@@ -18,6 +18,7 @@
  */ 
 package org.apache.rat.header;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.rat.DeprecationReporter;
 
 import java.io.IOException;
@@ -35,6 +36,7 @@
  * <p><strong>Note:</strong> use only from a single thread.</p>
  *
  */
+@SuppressFBWarnings("EI_EXPOSE_REP2")
 @Deprecated // since 0.17
 @DeprecationReporter.Info(since = "0.17", forRemoval = true)
 public class HeaderMatcher {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/help/Licenses.java b/apache-rat-core/src/main/java/org/apache/rat/help/Licenses.java
index 0277186b0..bac55af54 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/help/Licenses.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/help/Licenses.java
@@ -43,6 +43,8 @@
 import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 import static java.lang.String.format;
 
 /**
@@ -64,6 +66,7 @@ public final class Licenses extends AbstractHelp {
      * @param config The configuration that contains the license information.
      * @param writer the writer to write the report to.
      */
+    @SuppressFBWarnings("EI_EXPOSE_REP2")
     public Licenses(final ReportConfiguration config, final Writer writer) {
         this.config = config;
         this.licenses = config.getLicenses(LicenseFilter.ALL);
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java b/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java
index 6fe00db5a..8da3b193e 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java
@@ -20,13 +20,19 @@
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Optional;
+import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
+import org.apache.commons.collections4.set.UnmodifiableSortedSet;
+import org.apache.rat.ConfigurationException;
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.IHeaders;
+import org.apache.rat.utils.DefaultLog;
 import org.apache.rat.utils.Log;
 import org.apache.rat.utils.ReportingSet;
 
@@ -121,6 +127,31 @@ public LicenseSetFactory(final SortedSet<ILicense> licenses) {
         licenses.forEach(l -> families.addIfNotPresent(l.getLicenseFamily()));
     }
 
+    public void validate() {
+        Log log = DefaultLog.getInstance();
+
+        // verify license definitions exist
+        if (getLicenses(LicenseFilter.ALL).isEmpty()) {
+            String msg = "At least one license must be defined";
+            log.error(msg);
+            throw new ConfigurationException(msg);
+        }
+
+        // verify that all approved license families exist
+        Set<String> exists = getLicenseFamilies(LicenseFilter.ALL)
+                .stream().map(ILicenseFamily::getFamilyCategory).collect(Collectors.toSet());
+        Set<String> approved = new HashSet<>(approvedLicenseCategories);
+        approved.removeIf(exists::contains);
+        approved.forEach(name -> log.warn(String.format("License category '%s' was approved but does not exist.", name)));
+
+        // verify that all approved licenses exist
+        exists = getLicenses(LicenseFilter.ALL)
+                .stream().map(ILicense::getId).collect(Collectors.toSet());
+        approved = new HashSet<>(approvedLicenseIds);
+        approved.removeIf(exists::contains);
+        approved.forEach(name -> log.warn(String.format("License '%s' was approved but does not exist.", name)));
+    }
+
     public void add(final LicenseSetFactory other) {
         this.families.addAll(other.families);
         this.licenses.addAll(other.licenses);
@@ -289,18 +320,21 @@ public Predicate<ILicense> getApprovedLicensePredicate() {
      * @param filter the types of LicenseFamily objects to return.
      * @return a SortedSet of ILicense objects.
      */
-    public SortedSet<ILicense> getLicenses(final LicenseFilter filter) {
+    public UnmodifiableSortedSet<ILicense> getLicenses(final LicenseFilter filter) {
+        SortedSet<ILicense> result = new TreeSet<>();
         switch (filter) {
         case ALL:
-            return Collections.unmodifiableSortedSet(licenses);
+            result = licenses;
+            break;
         case APPROVED:
-            SortedSet<ILicense> result = new TreeSet<>();
+            result = new TreeSet<>();
             licenses.stream().filter(getApprovedLicensePredicate()).forEach(result::add);
-            return result;
+            break;
         case NONE:
         default:
-            return Collections.emptySortedSet();
+            result = Collections.emptySortedSet();
         }
+        return (UnmodifiableSortedSet<ILicense>) UnmodifiableSortedSet.unmodifiableSortedSet(result);
     }
 
     /**
diff --git a/apache-rat-core/src/main/java/org/apache/rat/report/IReportable.java b/apache-rat-core/src/main/java/org/apache/rat/report/IReportable.java
index 2c108af6c..a92ba0599 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/report/IReportable.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/report/IReportable.java
@@ -33,5 +33,5 @@ public interface IReportable {
      * Returns the DocumentName for the reportable.
      * @return the DocumentName for the reportable.
      */
-    DocumentName getName();
+    DocumentName name();
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/report/claim/ClaimStatistic.java b/apache-rat-core/src/main/java/org/apache/rat/report/claim/ClaimStatistic.java
index 62572916c..d47f2e5b7 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/report/claim/ClaimStatistic.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/report/claim/ClaimStatistic.java
@@ -19,14 +19,26 @@
 
 package org.apache.rat.report.claim;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.apache.commons.io.function.IOSupplier;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.rat.ConfigurationException;
 import org.apache.rat.api.Document;
+import org.apache.rat.configuration.XMLConfigurationReader;
+import org.apache.rat.report.xml.writer.XmlWriter;
+import org.xml.sax.SAXException;
 
 /**
  * This class provides a numerical overview about
@@ -113,6 +125,9 @@ public String displayName() {
     /** Map of counter type to value */
     private final ConcurrentHashMap<ClaimStatistic.Counter, IntCounter> counterMap = new ConcurrentHashMap<>();
 
+    public Serde serde() {
+        return new Serde();
+    }
     /**
      * Converts null counter to 0.
      *
@@ -141,6 +156,15 @@ public void incCounter(final Counter counter, final int value) {
         counterMap.compute(counter, (k, v) -> v == null ? new IntCounter().increment(value) : v.increment(value));
     }
 
+    /**
+     * Increments the counts for the counter.
+     * @param counter the counter to increment.
+     * @param value the value to increment the counter by.
+     */
+    public void setCounter(final Counter counter, final int value) {
+        counterMap.put(counter, new IntCounter().increment(value));
+    }
+
     /**
      * Gets the counts for the Document.Type.
      * @param documentType the Document.Type to get the counter for.
@@ -288,5 +312,96 @@ public IntCounter increment(final int count) {
         public int value() {
             return value;
         }
+
+        @Override
+        public String toString() {
+            return String.valueOf(value);
+        }
+    }
+
+    /**
+     * Serialze and deserialze the claim Statistic.
+     */
+    public class Serde {
+
+        public void serialize(final Appendable appendable) throws IOException {
+            try (XmlWriter writer = new XmlWriter(appendable)) {
+                writer.startDocument().openElement("ClaimStatistic")
+                        .openElement("licenseNameMap");
+                for (Map.Entry<String, IntCounter> entry : licenseNameMap.entrySet()) {
+                    if (entry.getValue().value > 0) {
+                        writer.openElement("licenseName")
+                                .attribute("count", entry.getValue().toString())
+                                .attribute("name", entry.getKey()).closeElement();
+                    }
+                }
+                writer.closeElement()
+                        .openElement("licenseFamilyCategoryMap");
+                for (Map.Entry<String, IntCounter> entry : licenseFamilyCategoryMap.entrySet()) {
+                    if (entry.getValue().value > 0) {
+                        writer.openElement("familyCategory")
+                                .attribute("count", entry.getValue().toString())
+                                .attribute("name", entry.getKey()).closeElement();
+                    }
+                }
+                writer.closeElement()
+                        .openElement("documentTypeMap");
+                for (Map.Entry<Document.Type, IntCounter> entry : documentTypeMap.entrySet()) {
+                    if (entry.getValue().value > 0) {
+                        writer.openElement("documentType")
+                                .attribute("count", entry.getValue().toString())
+                                .attribute("name", entry.getKey().name()).closeElement();
+                    }
+                }
+                writer.closeElement()
+                        .openElement("counterMap");
+                for (Map.Entry<ClaimStatistic.Counter, IntCounter> entry : counterMap.entrySet()) {
+                    if (entry.getValue().value > 0) {
+                        writer.openElement("counter")
+                                .attribute("count", entry.getValue().toString())
+                                .attribute("name", entry.getKey().name()).closeElement();
+                    }
+                }
+                writer.closeElement();
+            }
+        }
+
+        public void deserialize(final IOSupplier<InputStream> inputStreamSupplier) throws IOException {
+            DocumentBuilder builder;
+            try {
+                builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+            } catch (ParserConfigurationException e) {
+                throw new ConfigurationException("Unable to create DOM builder", e);
+            }
+            org.w3c.dom.Document document;
+            try (InputStream stream = inputStreamSupplier.get()) {
+                document = builder.parse(stream);
+
+            } catch (SAXException e) {
+                throw new IOException("Unable to read input", e);
+            }
+
+            XMLConfigurationReader.nodeListConsumer(document.getElementsByTagName("licenseName"), node -> {
+                Map<String, String> attributes = XMLConfigurationReader.attributes(node);
+                incLicenseNameCount(attributes.get("name"), Integer.parseInt(attributes.get("count")));
+            });
+
+            XMLConfigurationReader.nodeListConsumer(document.getElementsByTagName("familyCategory"), node -> {
+                Map<String, String> attributes = XMLConfigurationReader.attributes(node);
+                incLicenseCategoryCount(attributes.get("name"), Integer.parseInt(attributes.get("count")));
+            });
+
+            XMLConfigurationReader.nodeListConsumer(document.getElementsByTagName("documentType"), node -> {
+                Map<String, String> attributes = XMLConfigurationReader.attributes(node);
+                Document.Type type = Document.Type.valueOf(attributes.get("name"));
+                incCounter(type, Integer.parseInt(attributes.get("count")));
+            });
+
+            XMLConfigurationReader.nodeListConsumer(document.getElementsByTagName("counter"), node -> {
+                Map<String, String> attributes = XMLConfigurationReader.attributes(node);
+                Counter type = Counter.valueOf(attributes.get("name"));
+                setCounter(type, Integer.parseInt(attributes.get("count")));
+            });
+        }
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/FileUtils.java b/apache-rat-core/src/main/java/org/apache/rat/utils/FileUtils.java
similarity index 81%
rename from apache-rat-core/src/test/java/org/apache/rat/testhelpers/FileUtils.java
rename to apache-rat-core/src/main/java/org/apache/rat/utils/FileUtils.java
index 5681e7972..50da3eccd 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/FileUtils.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/utils/FileUtils.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  */
-package org.apache.rat.testhelpers;
+package org.apache.rat.utils;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -25,15 +25,17 @@
 import java.util.Arrays;
 import java.util.Collections;
 
-import static org.assertj.core.api.Fail.fail;
 
-public class FileUtils {
+public final class FileUtils {
+    private FileUtils() {
+        // do not instantiate
+    }
 
     /**
      * Creates a directory if it does not exist.
      * @param dir the directory to make.
      */
-    public static void mkDir(File dir) {
+    public static void mkDir(final File dir) {
         boolean ignored = dir.mkdirs();
     }
 
@@ -41,7 +43,7 @@ public static void mkDir(File dir) {
      * Deletes a file if it exists.
      * @param file the file to delete.
      */
-    public static void delete(File file) {
+    public static void delete(final File file) {
         if (file.exists()) {
             if (file.isDirectory()) {
                 try {
@@ -62,15 +64,16 @@ public static void delete(File file) {
      * @param lines the lines to write into the file.
      * @return the new File.
      */
-    static public File writeFile(File dir, final String name, final Iterable<String> lines) {
+    public static  File writeFile(final File dir, final String name, final Iterable<String> lines) {
         if (dir == null) {
-            fail("base directory not specified");
+            throw new IllegalArgumentException("base directory not specified");
         }
+        mkDir(dir);
         File file = new File(dir, name);
         try (PrintWriter writer = new PrintWriter(new FileWriter(file))) {
             lines.forEach(writer::println);
         } catch (IOException e) {
-            fail(e.getMessage());
+            throw new RuntimeException(e.getMessage(), e);
         }
         return file;
     }
@@ -82,7 +85,7 @@ static public File writeFile(File dir, final String name, final Iterable<String>
      * @param lines the lines to write into the file.
      * @return the new File.
      */
-    static public File writeFile(File dir, final String name, final String... lines) {
+    public static File writeFile(final File dir, final String name, final String... lines) {
         return writeFile(dir, name, Arrays.asList(lines));
     }
 
@@ -92,7 +95,7 @@ static public File writeFile(File dir, final String name, final String... lines)
      * @param name the name of the file.
      * @return the new file.
      */
-    public static File writeFile(File dir, String name) {
+    public static File writeFile(final File dir, final String name) {
         return writeFile(dir, name, Collections.singletonList(name));
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/walker/ArchiveWalker.java b/apache-rat-core/src/main/java/org/apache/rat/walker/ArchiveWalker.java
index a50aa5ef8..4ad410449 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/walker/ArchiveWalker.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/walker/ArchiveWalker.java
@@ -20,12 +20,15 @@
 package org.apache.rat.walker;
 
 import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
+import java.util.SortedSet;
 
 import org.apache.commons.compress.archivers.ArchiveEntry;
 import org.apache.commons.compress.archivers.ArchiveException;
@@ -34,9 +37,9 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.rat.api.Document;
 import org.apache.rat.api.RatException;
-import org.apache.rat.document.ArchiveEntryDocument;
 import org.apache.rat.document.ArchiveEntryName;
 import org.apache.rat.document.DocumentName;
+import org.apache.rat.document.DocumentNameMatcher;
 import org.apache.rat.report.RatReport;
 import org.apache.rat.utils.DefaultLog;
 
@@ -87,13 +90,29 @@ public Collection<Document> getDocuments() throws RatException {
             ArchiveEntry entry;
             while ((entry = input.getNextEntry()) != null) {
                 if (!entry.isDirectory() && input.canReadEntryData(entry)) {
-                    DocumentName innerName = DocumentName.builder().setName(entry.getName())
+                    final DocumentName innerName = DocumentName.builder().setName(entry.getName())
                             .setBaseName(".").build();
-                    if (this.getDocument().getNameMatcher().matches(innerName)) {
+                    final DocumentNameMatcher documentNameMatcher = getDocument().getNameMatcher();
+                    if (documentNameMatcher.matches(innerName)) {
+                        ArchiveEntryName entryName = new ArchiveEntryName(getDocument().getName(), entry.getName());
                         ByteArrayOutputStream baos = new ByteArrayOutputStream();
                         IOUtils.copy(input, baos);
-                        ArchiveEntryName entryName = new ArchiveEntryName(getDocument().getName(), entry.getName());
-                        result.add(new ArchiveEntryDocument(entryName, baos.toByteArray(), getDocument().getNameMatcher()));
+                        result.add(new Document(entryName, documentNameMatcher) {
+                            @Override
+                            public InputStream inputStream() {
+                                return new ByteArrayInputStream(baos.toByteArray());
+                            }
+
+                            @Override
+                            public boolean isDirectory() {
+                                return false;
+                            }
+
+                            @Override
+                            public SortedSet<Document> listChildren() {
+                                return Collections.emptySortedSet();
+                            }
+                        });
                     }
                 }
             }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/walker/FileListWalker.java b/apache-rat-core/src/main/java/org/apache/rat/walker/FileListWalker.java
index 056090858..1898c4e84 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/walker/FileListWalker.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/walker/FileListWalker.java
@@ -72,7 +72,7 @@ private FileDocument createDocument(final String unixFileName) {
     @Override
     public void run(final RatReport report) throws RatException {
         DefaultLog.getInstance().debug(String.format("Reading file name: %s due to option %s", source, Arg.SOURCE.option()));
-        DocumentName sourceName = getName();
+        DocumentName sourceName = name();
         try (Reader reader = source.reader()) {
             for (String docName : IOUtils.readLines(reader)) {
                 try {
@@ -93,7 +93,7 @@ public void run(final RatReport report) throws RatException {
     }
 
     @Override
-    public DocumentName getName() {
+    public DocumentName name() {
         return source.getName();
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/walker/IReportableListWalker.java b/apache-rat-core/src/main/java/org/apache/rat/walker/IReportableListWalker.java
index b028b9c68..8df62905e 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/walker/IReportableListWalker.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/walker/IReportableListWalker.java
@@ -61,13 +61,13 @@ public void run(final RatReport report) {
             try {
                 reportable.run(report);
             } catch (RatException e) {
-                DefaultLog.getInstance().error("Error processing " + reportable.getName(), e);
+                DefaultLog.getInstance().error("Error processing " + reportable.name(), e);
             }
         }
     }
 
     @Override
-    public DocumentName getName() {
+    public DocumentName name() {
         return documentName;
     }
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/walker/Walker.java b/apache-rat-core/src/main/java/org/apache/rat/walker/Walker.java
index 5651f7ab9..f0e6d7bd4 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/walker/Walker.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/walker/Walker.java
@@ -48,7 +48,7 @@ protected Document getDocument() {
     }
 
     @Override
-    public DocumentName getName() {
+    public DocumentName name() {
         return document.getName();
     }
 }
diff --git a/apache-rat-core/src/main/resources/org/apache/rat/xhtml5.xsl b/apache-rat-core/src/main/resources/org/apache/rat/xhtml5.xsl
new file mode 100644
index 000000000..b15224605
--- /dev/null
+++ b/apache-rat-core/src/main/resources/org/apache/rat/xhtml5.xsl
@@ -0,0 +1,354 @@
+<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
+
+    <!--***********************************************************
+     *
+     * Licensed to the Apache Software Foundation (ASF) under one
+     * or more contributor license agreements.  See the NOTICE file
+     * distributed with this work for additional information
+     * regarding copyright ownership.  The ASF licenses this file
+     * to you under the Apache License, Version 2.0 (the
+     * "License"); you may not use this file except in compliance
+     * with the License.  You may obtain a copy of the License at
+     *
+     *   http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing,
+     * software distributed under the License is distributed on an
+     * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+     * KIND, either express or implied.  See the License for the
+     * specific language governing permissions and limitations
+     * under the License.
+     *
+     ***********************************************************-->
+
+    <!-- This style sheet converts any rat-report.xml file.  -->
+
+    <xsl:output method='xml'/>
+
+    <xsl:variable name='notapproved'>&#10071;</xsl:variable>
+    <xsl:variable name="archive"><span style="font-size:x-large;">&#128476;</span></xsl:variable>
+    <xsl:variable name="binary"><span style="padding-left:4px;">&#128288;</span></xsl:variable>
+    <xsl:variable name="ignored"><span style="padding-left:4px;">&#128683;</span></xsl:variable>
+    <xsl:variable name="notice"><span style="font-size:x-large;padding-left:4px;">&#8505;</span></xsl:variable>
+    <xsl:variable name="standard"><span style="padding-left:4px;">&#9989;</span></xsl:variable>
+    <xsl:variable name="unknown">&#10067;</xsl:variable>
+    <xsl:variable name="directory"><span style="padding-left:4px;background-color: #00000087;">&#128194;</span></xsl:variable>
+
+    <xsl:template match="/">
+        <html>
+            <head>
+                <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+                <style type="text/css">
+                    <xsl:comment>
+                        body {margin-top: 0px;background-color: #F9F7ED;}
+
+                        h1 {color:red;}
+                        h2 {color:blue;}
+                        h3 {color:blueviolet;}
+                        h4 {color:green;}
+                        div.section {padding-left:5em;}
+                        div.subsection {padding-left:5em;}
+
+                        /* Table Design */
+                        table,tr,td {font-weight:bold;border:1px solid #000;}
+                        table {min-width: 50%;}
+                        caption {color:blue;text-align:left;}
+
+                        .document-name {font-size:larger;}
+                        .document-mediatype {float: left;}
+                        .document-encoding {padding-left: 2em;}
+                        .license-entry {padding-left: 1em;}
+                        .license-id {padding-left: 2em;}
+                        .license-family {padding-left: 1em;}
+                    </xsl:comment>
+                </style>
+            </head>
+            <body>
+                <xsl:apply-templates />
+            </body>
+        </html>
+    </xsl:template>
+
+    <xsl:template match="rat-report">
+
+        <h1>Rat Report</h1>
+
+        <xsl:call-template name="summary" />
+
+
+        <xsl:if test="descendant::resource[license/@approval='false']">
+            <xsl:call-template name="unapproved-files" />
+        </xsl:if>
+
+        <xsl:if test="descendant::resource[@type='ARCHIVE']">
+            <xsl:call-template name="archives" />
+        </xsl:if>
+
+        <h2>Detail</h2>
+
+        <p>
+            Documents with unapproved licenses will start with a <xsl:value-of select="$notapproved"/>
+            The first character on the next line identifies the document type.
+        </p>
+        <table id="rat-reports symbols" cellspacing="0"
+        summary="Symbols used in this RAT report">
+        <caption>
+            Symbols used in this RAT report
+        </caption>
+            <tr>
+                <th>Symbol</th>
+                <th>Type</th>
+            </tr>
+            <tr>
+                <td><xsl:value-of select="$archive"/></td>
+                <td>Archive file</td>
+            </tr>
+            <tr>
+                <td><xsl:value-of select="$binary"/></td>
+                <td>Binary file</td>
+            </tr>
+            <tr>
+                <td><xsl:value-of select="$ignored"/></td>
+                <td>Ignored file</td>
+            </tr>
+            <tr>
+                <td><xsl:value-of select="$notice"/></td>
+                <td>Notice file</td>
+            </tr>
+            <tr>
+                <td><xsl:value-of select="$standard"/></td>
+                <td>Standard file</td>
+            </tr>
+            <tr>
+                <td><xsl:value-of select="$unknown"/></td>
+                <td>Unknown file</td>
+            </tr>
+            <tr>
+                <td><xsl:value-of select="$directory"/></td>
+                <td>Directory</td>
+            </tr>
+        </table>
+
+        <table id="rat-reports resources" cellspacing="0"
+               summary="Resources discovered in this RAT report">
+            <caption>
+                Resources discovered in this RAT report
+            </caption>
+            <xsl:for-each select='descendant::resource'>
+                <tr>
+                    <td>
+                        <xsl:if test="@isDirectory = 'true'"><xsl:value-of select="$directory"/></xsl:if>
+                        <xsl:if test="license/@approval = 'false'"><xsl:value-of select="$notapproved"/></xsl:if>
+                        <xsl:choose>
+                            <xsl:when test="substring(@type, 1, 1) = 'A'"><xsl:value-of select="$archive"/></xsl:when>
+                            <xsl:when test="substring(@type, 1, 1) = 'B'"><xsl:value-of select="$binary"/></xsl:when>
+                            <xsl:when test="substring(@type, 1, 1) = 'I'"><xsl:value-of select="$ignored"/></xsl:when>
+                            <xsl:when test="substring(@type, 1, 1) = 'N'"><xsl:value-of select="$notice"/></xsl:when>
+                            <xsl:when test="substring(@type, 1, 1) = 'S'"><xsl:value-of select="$standard"/></xsl:when>
+                            <xsl:when test="substring(@type, 1, 1) = 'U'"><xsl:value-of select="$unknown"/></xsl:when>
+                        </xsl:choose>
+                    </td>
+                    <td>
+                        <div class="document-entry">
+                            <span class="document-name"><xsl:value-of select='@name'/></span>
+                            <div class="document-meta">
+                                <span class="document-mediatype"><xsl:value-of select="@mediaType"/></span>
+                                <span class="document-encoding"><xsl:value-of select="@encoding"/></span>
+                            </div>
+                        </div>
+                        <xsl:for-each select='descendant::license'>
+                            <div class="license-entry">
+                                <div>
+                                    <xsl:if test="@approval = 'false'">
+                                        <span class='approval-icon'><xsl:value-of select="$notapproved"/></span>
+                                    </xsl:if>
+                                    <span class="license-name"><xsl:value-of select="@name"/></span>
+                                </div>
+                                <span class="license-id">ID:
+                                    <xsl:choose>
+                                        <xsl:when test="@id = '?????'">UUID</xsl:when>
+                                        <xsl:otherwise><xsl:value-of select="@id"/></xsl:otherwise>
+                                    </xsl:choose>
+                                </span>
+                                <span class="license-family">Family:
+                                    <xsl:choose>
+                                        <xsl:when test="@family = '?????'">Unknown</xsl:when>
+                                        <xsl:otherwise><xsl:value-of select="@family"/></xsl:otherwise>
+                                    </xsl:choose>
+                                </span>
+                            </div>
+                        </xsl:for-each>
+                    </td>
+                </tr>
+            </xsl:for-each>
+        </table>
+    </xsl:template>
+
+    <xsl:template name="summary">
+        <h2>Summary</h2>
+
+        <div class="section">
+            <p>Generated at <xsl:value-of select='@timestamp' />  by
+                <xsl:value-of select='concat(version/@product, " ", rat-report/version/@version, " (", rat-report/version/@vendor, ")")'/>
+            </p>
+
+            <table id="rat-reports summary statistics" cellspacing="0"
+                   summary="A  summary of statistics from this RAT report">
+                <caption>
+                    Table 1: A summary of statistics from this RAT report.
+                </caption>
+                <tr>
+                    <th colspan="1">Name:</th>
+                    <th colspan="1">Count:</th>
+                    <th colspan="1">Description:</th>
+                </tr>
+                <xsl:for-each select='descendant::statistic'>
+                    <tr>
+                       <td>
+                            <xsl:if test='@approval="false"'>
+                                <span class='approval-icon'><xsl:value-of select="$notapproved"/></span>
+                            </xsl:if>
+                            <xsl:choose>
+                                <xsl:when test="@name = '?????'">Unknown</xsl:when>
+                                <xsl:otherwise><xsl:value-of select="@name"/></xsl:otherwise>
+                            </xsl:choose>
+                        </td>
+                        <td><xsl:value-of select='@count'/></td>
+                        <td><xsl:value-of select='@description'/></td>
+                    </tr>
+                </xsl:for-each>
+            </table>
+
+            <h3>License Statistics</h3>
+            <div class="subsection">
+                <h4>Categories</h4>
+                <div class="subsection">
+                    <table id="rat-reports summary license-categories" cellspacing="0"
+                           summary="A summary of license categories found in this RAT report">
+                        <caption>
+                            Table 2: License categories found in this RAT report.
+                        </caption>
+                        <tr>
+                            <th colspan="1">Name:</th>
+                            <th colspan="1">Count:</th>
+                        </tr>
+
+                        <xsl:for-each select='descendant::licenseCategory'>
+                            <tr>
+                                <td>
+                                    <xsl:if test='@approved="false"'>
+                                        <span class='approval-icon'><xsl:value-of select="$notapproved"/></span>
+                                    </xsl:if>
+                                    <xsl:choose>
+                                        <xsl:when test="@name = '?????'">Unknown</xsl:when>
+                                        <xsl:otherwise><xsl:value-of select="@name"/></xsl:otherwise>
+                                    </xsl:choose>
+                                </td>
+                                <td><xsl:value-of select='@count'/></td>
+                            </tr>
+                        </xsl:for-each>
+                    </table>
+                </div>
+
+                <h4>Licenses</h4>
+                <div class="subsection">
+                    <table id="rat-reports summary licenses" cellspacing="0"
+                           summary="Licenses found in this RAT report">
+                        <caption>
+                            Table 3: Licenses found in this RAT report.
+                        </caption>
+                        <tr>
+                            <td colspan="1">Name:</td>
+                            <td colspan="1">Count:</td>
+                        </tr>
+
+                        <xsl:for-each select='descendant::licenseName'>
+                            <tr>
+                                <td>
+                                    <xsl:if test='@approved="false"'>
+                                        <span class='approval-icon'><xsl:value-of select="$notapproved"/></span>
+                                    </xsl:if>
+                                    <xsl:choose>
+                                        <xsl:when test="@name = '?????'">Unknown</xsl:when>
+                                        <xsl:otherwise><xsl:value-of select="@name"/></xsl:otherwise>
+                                    </xsl:choose>
+                                </td>
+                                <td><xsl:value-of select='@count'/></td>
+                            </tr>
+                        </xsl:for-each>
+                    </table>
+                </div>
+            </div>
+
+            <h3>Document types</h3>
+            <div class="subsection">
+                <table id="rat-reports summary document-types" cellspacing="0"
+                       summary="Document types found in this RAT report">
+                    <caption>
+                        Table 4: Document types found in this RAT report.
+                    </caption>
+                    <tr>
+                        <th colspan="1">Name:</th>
+                        <th colspan="1">Count:</th>
+                    </tr>
+
+                    <xsl:for-each select='descendant::documentType'>
+                        <tr>
+                            <td><xsl:value-of select="@name"/></td>
+                            <td><xsl:value-of select="@count"/></td>
+                        </tr>
+                    </xsl:for-each>
+                </table>
+            </div>
+        </div>
+    </xsl:template>
+
+    <xsl:template name="unapproved-files">
+        <h2>Files with unapproved licenses</h2>
+
+        <ul class="unapproved-licenses">
+            <xsl:for-each select='descendant::resource[license/@approval="false"]'>
+                <li class="document-name"><xsl:value-of select='@name'/></li>
+            </xsl:for-each>
+        </ul>
+    </xsl:template>
+
+    <xsl:template name="archives">
+        <h2>Archives</h2>
+        <ul>
+            <xsl:for-each select='descendant::resource[@type="ARCHIVE"]'>
+                <li class="document-name"><xsl:value-of select='@name'/></li>
+            </xsl:for-each>
+        </ul>
+    </xsl:template>
+
+
+    <xsl:template name="license">
+        <xsl:param name="family"/>
+        <xsl:param name="id"/>
+        <xsl:param name="name"/>
+        <xsl:param name="approval"/>
+
+        <tr>
+            <td> </td>
+            <td>
+                <table>
+                    <tr>
+                        <xsl:if test="$approval = 'false'">
+                            <xsl:value-of select="$notapproved"/>
+                        </xsl:if>
+                    </tr>
+                    <tr>
+                        <div class="document-license">
+                            <span class="license-name"><xsl:value-of select="$name"/></span>
+                            <div class="documment-license-meta">
+                                <span class="id"><xsl:value-of select="$id"/></span>
+                                <span class="family"><xsl:value-of select="$family"/></span>
+                            </div>
+                        </div>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+    </xsl:template>
+</xsl:transform>
diff --git a/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java b/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java
index bfd5f31e7..db9edb03f 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java
@@ -22,6 +22,7 @@
 import java.util.Set;
 import java.util.TreeSet;
 
+import org.apache.commons.collections4.set.UnmodifiableSortedSet;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.junit.jupiter.api.Test;
@@ -36,7 +37,7 @@ public class DefaultsTest {
     public void defaultConfigTest() {
         Defaults defaults = Defaults.builder().build();
 
-        Set<ILicense> licenses = defaults.getLicenseSetFactory().getLicenses(LicenseFilter.ALL);
+        UnmodifiableSortedSet<ILicense> licenses = defaults.getLicenseSetFactory().getLicenses(LicenseFilter.ALL);
 
         Set<String> names = new TreeSet<>();
         licenses.forEach(x -> names.add(x.getLicenseFamily().getFamilyCategory()));
diff --git a/apache-rat-core/src/test/java/org/apache/rat/OptionCollectionTest.java b/apache-rat-core/src/test/java/org/apache/rat/OptionCollectionTest.java
index 64c11257a..921273eaa 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/OptionCollectionTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/OptionCollectionTest.java
@@ -44,6 +44,7 @@
 import org.apache.rat.testhelpers.TestingLog;
 import org.apache.rat.utils.CasedString;
 import org.apache.rat.utils.DefaultLog;
+import org.apache.rat.utils.FileUtils;
 import org.apache.rat.utils.Log;
 import org.apache.rat.walker.ArchiveWalker;
 import org.apache.rat.walker.DirectoryWalker;
@@ -135,6 +136,14 @@ public String toString() {
     public @interface TestFunction {
     }
 
+    /**
+     * Gets the test path for.
+     * @return the test path.
+     */
+    public static Path getTestPath() {
+        return testPath;
+    }
+
     /**
      * Process methods in a test provider.
      * Tests are detected by looking for the {@link TestFunction} annotation.
@@ -172,6 +181,7 @@ public static Map<String, OptionTest> processTestFunctionAnnotations(Object test
     public void testDeprecatedUseLogged() throws IOException {
         TestingLog log = new TestingLog();
         try {
+            FileUtils.mkDir(testPath.resolve("target").toFile());
             DefaultLog.setInstance(log);
             String[] args = {"--dir", "target", "-a"};
             ReportConfiguration config = OptionCollection.parseCommands(testPath.toFile(), args, o -> fail("Help printed"), true);
@@ -211,8 +221,7 @@ public void testShortenedOptions() throws IOException {
     @Test
     public void testDefaultConfiguration() throws ParseException {
         String[] empty = {};
-        CommandLine cl = new DefaultParser().parse(OptionCollection.buildOptions(), empty);
-        ArgumentContext context = new ArgumentContext(new File("."), cl);
+        ArgumentContext context = new ArgumentContext(new File("."), OptionCollection.buildOptions(), empty);
         ReportConfiguration config = OptionCollection.createConfiguration(context);
         ReportConfigurationTest.validateDefault(config);
     }
@@ -221,11 +230,12 @@ public void testDefaultConfiguration() throws ParseException {
     @ValueSource(strings = { ".", "./", "target", "./target" })
     public void getReportableTest(String fName) throws IOException {
         File base = new File(fName);
-        String expected = DocumentName.FSInfo.getDefault().normalize(base.getAbsolutePath());
+        DocumentName.FSInfo fsInfo = new DocumentName.FSInfo(testPath.getFileSystem());
+        String expected = fsInfo.normalize(base.getAbsolutePath());
         ReportConfiguration config = OptionCollection.parseCommands(testPath.toFile(), new String[]{fName}, o -> fail("Help called"), false);
         IReportable reportable = OptionCollection.getReportable(base, config);
         assertThat(reportable).as(() -> format("'%s' returned null", fName)).isNotNull();
-        assertThat(reportable.getName().getName()).isEqualTo(expected);
+        assertThat(reportable.name().getName()).isEqualTo(expected);
     }
 
     @Test
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
index 69af88b2b..f29c622ea 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
@@ -39,6 +39,7 @@
 import java.util.List;
 import java.util.SortedSet;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import org.apache.commons.io.filefilter.DirectoryFileFilter;
 import org.apache.commons.io.output.CloseShieldOutputStream;
@@ -56,6 +57,7 @@
 import org.apache.rat.testhelpers.TestingLicense;
 import org.apache.rat.testhelpers.TestingMatcher;
 import org.apache.rat.utils.DefaultLog;
+import org.apache.rat.utils.Log;
 import org.apache.rat.utils.Log.Level;
 import org.apache.rat.utils.ReportingSet.Options;
 import org.junit.jupiter.api.AfterEach;
@@ -456,7 +458,7 @@ public void outputTest() throws IOException {
         assertThat(underTest.getWriter()).isNotNull();
 
         ByteArrayOutputStream stream = new ByteArrayOutputStream();
-        underTest.setOut(() -> stream);
+        underTest.setOut(new ReportConfiguration.IODescriptor<>("outputTest", () -> stream));
         assertThat(underTest.getOutput().get()).isEqualTo(stream);
         PrintWriter writer = underTest.getWriter().get();
         assertThat(writer).isNotNull();
@@ -480,9 +482,9 @@ public void stylesheetTest() throws IOException, URISyntaxException {
         URL url = this.getClass().getResource("ReportConfigurationTestFile");
         assertThat(url).isNotNull();
 
-        assertThat(underTest.getStyleSheet()).isNull();
+        assertThat(underTest.getStyleSheetDescriptor()).isNull();
         InputStream stream = mock(InputStream.class);
-        underTest.setStyleSheet(() -> stream);
+        underTest.setStyleSheet(new ReportConfiguration.IODescriptor<>("stylesheetTest", () -> stream));
         assertThat(underTest.getStyleSheet().get()).isEqualTo(stream);
 
         File file = mock(File.class);
@@ -515,32 +517,37 @@ public void testFlags() {
 
     @Test
     public void testValidate() {
-        final StringBuilder sb = new StringBuilder();
+        TestingLog testLog = new TestingLog();
+        Log oldLog = DefaultLog.getInstance();
+        try {
+            DefaultLog.setInstance(testLog);
+
         String msg = "At least one source must be specified";
-        assertThatThrownBy(() -> underTest.validate(sb::append)).isExactlyInstanceOf(ConfigurationException.class)
+            assertThatThrownBy(underTest::validate).isExactlyInstanceOf(ConfigurationException.class)
                 .hasMessageContaining(msg);
-        assertThat(sb.toString()).isEqualTo(msg);
+            testLog.assertContains(msg);
+            testLog.clear();
 
 
-        sb.setLength(0);
-        msg = "You must specify at least one license";
+            msg = "At least one license must be defined";
         underTest.addSource(mock(IReportable.class));
 
-        assertThatThrownBy(() -> underTest.validate(sb::append)).isExactlyInstanceOf(ConfigurationException.class)
+            assertThatThrownBy(underTest::validate).isExactlyInstanceOf(ConfigurationException.class)
                 .hasMessageContaining(msg);
-        assertThat(sb.toString()).isEqualTo(msg);
+            testLog.assertContains(msg);
 
-        sb.setLength(0);
         underTest.addLicense(testingLicense("valid", "Validation testing license"));
-        underTest.validate(sb::append);
-        assertThat(sb.length()).isEqualTo(0);
+            underTest.validate();
+        } finally {
+            DefaultLog.setInstance(oldLog);
+        }
     }
     
     @Test
     public void testSetOut() throws IOException {
         ReportConfiguration config = new ReportConfiguration();
         try (OutputStreamInterceptor osi = new OutputStreamInterceptor()) {
-            config.setOut(() -> osi);
+            config.setOut(new ReportConfiguration.IODescriptor<>("testSetOut", () -> osi));
             assertThat(osi.closeCount).isEqualTo(0);
             try (OutputStream os = config.getOutput().get()) {
                 assertThat(os).isNotNull();
@@ -563,16 +570,18 @@ public void logFamilyCollisionTest() {
        
         // verify default collision logs WARNING
         underTest.addFamily(ILicenseFamily.builder().setLicenseFamilyCategory("CAT").setLicenseFamilyName("name2"));
-        assertThat(log.getCaptured().contains("WARN")).as("default value not WARN").isTrue();
-        assertThat(log.getCaptured().contains("CAT")).as("'CAT' not found").isTrue();
+        assertThat(log.getCaptured()).contains("WARN").contains("CAT");
         
         // verify level setting works.
         for (Level l : Level.values()) {
           log.clear();
           underTest.logFamilyCollisions(l);
           underTest.addFamily(ILicenseFamily.builder().setLicenseFamilyCategory("CAT").setLicenseFamilyName("name2"));
-          assertThat(log.getCaptured().contains("CAT")).as("'CAT' not found").isTrue();
-          assertThat(log.getCaptured().contains(l.name())).as("logging not set to "+l).isTrue();
+          if (DefaultLog.getInstance().isEnabled(l)) {
+              assertThat(log.getCaptured()).contains("CAT").contains(l.name());
+          } else {
+              assertThat(log.getCaptured()).doesNotContain("CAT").doesNotContain(l.name());
+          }
         }
     }
     
@@ -662,51 +671,52 @@ public void licenseDuplicateOptionsTest() {
                 .isExactlyInstanceOf(IllegalArgumentException.class);
     }
 
-    /**
-     * Validates that the configuration contains the default approved licenses.
-     * @param config The configuration to test.
-     */
-    public static void validateDefaultApprovedLicenses(ReportConfiguration config) {
-        validateDefaultApprovedLicenses(config, 0);
-    }
     
     /**
      * Validates that the configuration contains the default approved licenses.
      * @param config The configuration to test.
      */
-    public static void validateDefaultApprovedLicenses(ReportConfiguration config, int additionalIdCount) {
-        assertThat(config.getLicenseCategories(LicenseFilter.APPROVED)).hasSize(XMLConfigurationReaderTest.APPROVED_IDS.length + additionalIdCount);
-        for (String s : XMLConfigurationReaderTest.APPROVED_IDS) {
-            assertThat(config.getLicenseCategories(LicenseFilter.APPROVED)).contains(ILicenseFamily.makeCategory(s));
+    public static void validateDefaultApprovedLicenses(ReportConfiguration config, String... additionalIds) {
+        validateLicenses(config, Arrays.asList(additionalIds), LicenseFilter.APPROVED, XMLConfigurationReaderTest.APPROVED_LICENSES);
         }
+
+    /**
+     * Validates that the configuration contains all the default licenses along with any addiitonal licenses
+     * @param config the configuration to test.
+     * @param additionalLicenses Additional licence IDs that are expected.
+     */
+    public static void validateDefaultLicenses(ReportConfiguration config, String...additionalLicenses) {
+        validateLicenses(config, Arrays.asList(additionalLicenses), LicenseFilter.ALL, XMLConfigurationReaderTest.EXPECTED_LICENSES);
     }
 
+    private static void validateLicenses(ReportConfiguration config, List<String> additionalIds, LicenseFilter filter, String[] approvedIds) {
+        List<String> expected = new ArrayList<>(Arrays.asList(approvedIds));
+        expected.addAll(additionalIds);
+        assertThat(config.getLicenses(filter).stream().map(ILicense::getId).collect(Collectors.toSet())).containsExactlyInAnyOrderElementsOf(expected);
+    }
+
+
     /**
      * Validates that the configuration contains the default license families.
      * @param config the configuration to test.
      */
     public static void validateDefaultLicenseFamilies(ReportConfiguration config, String...additionalIds) {
-        assertThat(config.getLicenseFamilies(LicenseFilter.ALL)).hasSize(XMLConfigurationReaderTest.EXPECTED_IDS.length + additionalIds.length);
-        List<String> expected = new ArrayList<>();
-        expected.addAll(Arrays.asList(XMLConfigurationReaderTest.EXPECTED_IDS));
-        expected.addAll(Arrays.asList(additionalIds));
-        for (ILicenseFamily family : config.getLicenseFamilies(LicenseFilter.ALL)) {
-            assertThat(expected).contains(family.getFamilyCategory().trim());
-        }
+        validateLicenseFamilies(config, Arrays.asList(additionalIds), LicenseFilter.ALL, XMLConfigurationReaderTest.EXPECTED_IDS);
     }
 
     /**
-     * Validates that the configuration contains the default licenses.
+     * Validates that the configuration contains the default license families.
      * @param config the configuration to test.
      */
-    public static void validateDefaultLicenses(ReportConfiguration config, String...additionalLicenses) {
-        assertThat(config.getLicenses(LicenseFilter.ALL)).hasSize(XMLConfigurationReaderTest.EXPECTED_LICENSES.length + additionalLicenses.length);
-        List<String> expected = new ArrayList<>();
-        expected.addAll(Arrays.asList(XMLConfigurationReaderTest.EXPECTED_LICENSES));
-        expected.addAll(Arrays.asList(additionalLicenses));
-        for (ILicense license : config.getLicenses(LicenseFilter.ALL)) {
-            assertThat(expected).contains(license.getId());
+    public static void validateDefaultApprovedLicenseFamilies(ReportConfiguration config, String...additionalIds) {
+        validateLicenseFamilies(config, Arrays.asList(additionalIds), LicenseFilter.APPROVED, XMLConfigurationReaderTest.APPROVED_IDS);
         }
+
+    private static void validateLicenseFamilies(ReportConfiguration config, List<String> additionalIds, LicenseFilter filter, String[] approvedIds) {
+        List<String> expected = new ArrayList<>(Arrays.asList(approvedIds));
+        expected.addAll(additionalIds);
+        assertThat(config.getLicenseFamilies(filter).stream().map(lf -> lf.getFamilyCategory().trim())
+                .collect(Collectors.toSet())).containsExactlyInAnyOrderElementsOf(expected);
     }
     
     /**
@@ -719,9 +729,10 @@ public static void validateDefault(ReportConfiguration config) {
         assertThat(config.getCopyrightMessage()).isNull();
         assertThat(config.getStyleSheet()).withFailMessage("Stylesheet should not be null").isNotNull();
 
-        validateDefaultApprovedLicenses(config);
         validateDefaultLicenseFamilies(config);
+        validateDefaultApprovedLicenseFamilies(config);
         validateDefaultLicenses(config);
+        validateDefaultApprovedLicenses(config);
     }
 
     /**
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReporterOptionsProvider.java b/apache-rat-core/src/test/java/org/apache/rat/ReporterOptionsProvider.java
index 84d21a8c6..75b5ffa3c 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReporterOptionsProvider.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReporterOptionsProvider.java
@@ -22,10 +22,13 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileReader;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintStream;
+import java.io.Reader;
+import java.io.Writer;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.Arrays;
@@ -55,7 +58,7 @@
 import org.apache.rat.test.AbstractOptionsProvider;
 import org.apache.rat.test.utils.OptionFormatter;
 import org.apache.rat.test.utils.Resources;
-import org.apache.rat.testhelpers.FileUtils;
+import org.apache.rat.utils.FileUtils;
 import org.apache.rat.testhelpers.TestingLog;
 import org.apache.rat.testhelpers.TextUtils;
 import org.apache.rat.testhelpers.XmlUtils;
@@ -115,11 +118,26 @@ protected final ReportConfiguration generateConfig(List<Pair<Option, String[]>>
         return config;
     }
 
+    /**
+     * Creates the srcDir.,.
+     * @param option the name for the srcDir.
+     */
     private void configureSourceDir(Option option) {
         sourceDir = new File(baseDir, OptionFormatter.getName(option));
         FileUtils.mkDir(sourceDir);
     }
 
+    /**
+     * Creates the option/.rat directory
+     * @param option the name for the sourceDirectory.
+     */
+    private File configureRatDir(Option option) {
+        configureSourceDir(option);
+        File ratDir = new File(sourceDir, ".rat");
+        FileUtils.mkDir(ratDir);
+        return ratDir;
+    }
+
     private void validateNoArgSetup() throws IOException, RatException {
         // verify that without args the report is ok.
         TestingLog log = new TestingLog();
@@ -127,9 +145,9 @@ private void validateNoArgSetup() throws IOException, RatException {
         try {
             ReportConfiguration config = generateConfig(Collections.emptyList());
             Reporter reporter = new Reporter(config);
-            ClaimStatistic claimStatistic = reporter.execute();
+            Reporter.Output output = reporter.execute();
             ClaimValidator validator = config.getClaimValidator();
-            assertThat(validator.listIssues(claimStatistic)).isEmpty();
+            assertThat(validator.listIssues(output.getStatistic())).isEmpty();
         } finally {
             DefaultLog.setInstance(null);
         }
@@ -155,8 +173,8 @@ private void editLicenseTest(final Option option) {
             FileUtils.delete(resultFile);
 
             Reporter reporter = new Reporter(config);
-            ClaimStatistic claimStatistic = reporter.execute();
-            assertThat(claimStatistic).isNotNull();
+            Reporter.Output output = reporter.execute();
+            assertThat(output.getStatistic()).isNotNull();
             String contents = String.join("\n", IOUtils.readLines(new FileReader(testFile)));
             assertThat(contents).isEqualTo("class NoLicense {}");
             assertThat(resultFile).exists();
@@ -211,9 +229,9 @@ private void execLicensesDeniedTest(final Option option, final String[] args) {
 
             ReportConfiguration config = generateConfig(ImmutablePair.of(option, args));
             Reporter reporter = new Reporter(config);
-            ClaimStatistic claimStatistic = reporter.execute();
+            Reporter.Output output = reporter.execute();
             ClaimValidator validator = config.getClaimValidator();
-            assertThat(validator.listIssues(claimStatistic)).containsExactly("UNAPPROVED");
+            assertThat(validator.listIssues(output.getStatistic())).containsExactly("UNAPPROVED");
         } catch (IOException | RatException e) {
             fail(e.getMessage(), e);
         }
@@ -226,9 +244,9 @@ protected void licensesDeniedTest() {
 
     @OptionCollectionTest.TestFunction
     protected void licensesDeniedFileTest() {
-        File outputFile = FileUtils.writeFile(baseDir, "licensesDenied.txt", Collections.singletonList("ILLUMOS"));
-        execLicensesDeniedTest(Arg.LICENSES_DENIED_FILE.find("licenses-denied-file"),
-                new String[]{outputFile.getAbsolutePath()});
+        Option option = Arg.LICENSES_DENIED_FILE.find("licenses-denied-file");
+        File outputFile = FileUtils.writeFile(configureRatDir(option), "licensesDenied.txt", Collections.singletonList("ILLUMOS"));
+        execLicensesDeniedTest(option, new String[]{outputFile.getAbsolutePath()});
     }
 
     private void noDefaultsTest(final Option option) {
@@ -245,9 +263,7 @@ private void noDefaultsTest(final Option option) {
                 reporter.execute();
                 fail("Should have thrown exception");
             } catch (RatException e) {
-                ClaimStatistic claimStatistic = reporter.getClaimsStatistic();
                 ClaimValidator validator = config.getClaimValidator();
-                assertThat(validator.listIssues(claimStatistic)).containsExactlyInAnyOrder("DOCUMENT_TYPES", "LICENSE_CATEGORIES", "LICENSE_NAMES", "STANDARDS");
             }
         } catch (IOException | RatException e) {
             fail(e.getMessage(), e);
@@ -275,16 +291,16 @@ protected void counterMaxTest() {
 
             ReportConfiguration config = generateConfig(Collections.emptyList());
             Reporter reporter = new Reporter(config);
-            ClaimStatistic claimStatistic = reporter.execute();
+            Reporter.Output output = reporter.execute();
             ClaimValidator validator = config.getClaimValidator();
-            assertThat(validator.listIssues(claimStatistic)).containsExactly("UNAPPROVED");
+            assertThat(validator.listIssues(output.getStatistic())).containsExactly("UNAPPROVED");
 
             arg[0] = "Unapproved:1";
             config = generateConfig(ImmutablePair.of(option, arg));
             reporter = new Reporter(config);
-            claimStatistic = reporter.execute();
+            output  = reporter.execute();
             validator = config.getClaimValidator();
-            assertThat(validator.listIssues(claimStatistic)).isEmpty();
+            assertThat(validator.listIssues(output.getStatistic())).isEmpty();
         } catch (IOException | RatException e) {
             fail(e.getMessage(), e);
         }
@@ -302,23 +318,28 @@ protected void counterMinTest() {
 
             ReportConfiguration config = generateConfig(Collections.emptyList());
             Reporter reporter = new Reporter(config);
-            ClaimStatistic claimStatistic = reporter.execute();
+            Reporter.Output output = reporter.execute();
             ClaimValidator validator = config.getClaimValidator();
-            assertThat(validator.listIssues(claimStatistic)).containsExactly("UNAPPROVED");
+            assertThat(validator.listIssues(output.getStatistic())).containsExactly("UNAPPROVED");
 
             arg[0] = "Unapproved:1";
             config = generateConfig(ImmutablePair.of(option, arg));
             reporter = new Reporter(config);
-            claimStatistic = reporter.execute();
+            output = reporter.execute();
             validator = config.getClaimValidator();
-            assertThat(validator.listIssues(claimStatistic)).isEmpty();
+            assertThat(validator.listIssues(output.getStatistic())).isEmpty();
         } catch (IOException | RatException e) {
             fail(e.getMessage(), e);
         }
     }
 
-    // exclude tests
-    private void execExcludeTest(final Option option, final String[] args) {
+    /**
+     * Runs the exclude tests.
+     * @param option The exclude option to run.
+     * @param args the arguments for the command line.
+     * @param includesRatDir @{code true} if the .rat directory was created.
+     */
+    private void execExcludeTest(final Option option, final String[] args, final boolean includesRatDir) {
         String[] notExcluded = {"notbaz", "well._afile"};
         String[] excluded = {"some.foo", "B.bar", "justbaz"};
         try {
@@ -331,25 +352,24 @@ private void execExcludeTest(final Option option, final String[] args) {
 
             ReportConfiguration config = generateConfig(Collections.emptyList());
             Reporter reporter = new Reporter(config);
-            ClaimStatistic claimStatistic = reporter.execute();
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(5);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(0);
+            Reporter.Output output = reporter.execute();
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(5);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(includesRatDir ? 1 : 0);
 
             // filter out source
             config = generateConfig(ImmutablePair.of(option, args));
             reporter = new Reporter(config);
-            claimStatistic = reporter.execute();
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(2);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(3);
+            output = reporter.execute();
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(2);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(includesRatDir ? 4 : 3);
         } catch (IOException | RatException e) {
             fail(e.getMessage(), e);
         }
     }
 
     private void excludeFileTest(final Option option) {
-        configureSourceDir(option);
-        File outputFile = FileUtils.writeFile(baseDir, "exclude.txt", Arrays.asList(EXCLUDE_ARGS));
-        execExcludeTest(option, new String[]{outputFile.getAbsolutePath()});
+        File outputFile = FileUtils.writeFile(configureRatDir(option), "exclude.txt", Arrays.asList(EXCLUDE_ARGS));
+        execExcludeTest(option, new String[]{outputFile.getAbsolutePath()}, true);
     }
 
     @OptionCollectionTest.TestFunction
@@ -364,12 +384,12 @@ protected void inputExcludeFileTest() {
 
     @OptionCollectionTest.TestFunction
     protected void excludeTest() {
-        execExcludeTest(Arg.EXCLUDE.find("exclude"), EXCLUDE_ARGS);
+        execExcludeTest(Arg.EXCLUDE.find("exclude"), EXCLUDE_ARGS, false);
     }
 
     @OptionCollectionTest.TestFunction
     protected void inputExcludeTest() {
-        execExcludeTest(Arg.EXCLUDE.find("input-exclude"), EXCLUDE_ARGS);
+        execExcludeTest(Arg.EXCLUDE.find("input-exclude"), EXCLUDE_ARGS, false);
     }
 
     @OptionCollectionTest.TestFunction
@@ -385,16 +405,16 @@ protected void inputExcludeSizeTest() {
 
             ReportConfiguration config = generateConfig(Collections.emptyList());
             Reporter reporter = new Reporter(config);
-            ClaimStatistic claimStatistic = reporter.execute();
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(3);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(0);
+            Reporter.Output output = reporter.execute();
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(3);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(0);
 
             // filter out source
             config = generateConfig(ImmutablePair.of(option, args));
             reporter = new Reporter(config);
-            claimStatistic = reporter.execute();
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(2);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(1);
+            output = reporter.execute();
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(2);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(1);
         } catch (IOException | RatException e) {
             fail(e.getMessage(), e);
         }
@@ -421,15 +441,15 @@ protected void inputExcludeStdTest() {
 
             ReportConfiguration config = generateConfig(Collections.emptyList());
             Reporter reporter = new Reporter(config);
-            ClaimStatistic claimStatistic = reporter.execute();
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(5);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(4);
+            Reporter.Output output = reporter.execute();
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(5);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(4);
 
             config = generateConfig(ImmutablePair.of(option, args));
             reporter = new Reporter(config);
-            claimStatistic = reporter.execute();
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(4);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(5);
+            output = reporter.execute();
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(4);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(5);
         } catch (IOException | RatException e) {
             fail(e.getMessage(), e);
         }
@@ -479,23 +499,28 @@ protected void inputExcludeParsedScmTest() {
 
             ReportConfiguration config = generateConfig(Collections.emptyList());
             Reporter reporter = new Reporter(config);
-            ClaimStatistic claimStatistic = reporter.execute();
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(11);
+            Reporter.Output output = reporter.execute();
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(11);
             // .gitignore is ignored by default as it is hidden but not counted
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(0);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(0);
 
             config = generateConfig(ImmutablePair.of(option, args));
             reporter = new Reporter(config);
-            claimStatistic = reporter.execute();
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(3);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(8);
+            output = reporter.execute();
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(3);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(8);
         } catch (IOException | RatException e) {
             fail(e.getMessage(), e);
         }
     }
 
-    // include tests
-    private void execIncludeTest(final Option option, final String[] args) {
+    /**
+     * Runs the include tests.
+     * @param option The include option to run.
+     * @param args the arguments for the command line.
+     * @param includesRatDir @{code true} if the .rat directory was created.
+     */
+    private void execIncludeTest(final Option option, final String[] args, final boolean includesRatDir) {
         Option excludeOption = Arg.EXCLUDE.option();
         String[] notExcluded = {"B.bar", "justbaz", "notbaz"};
         String[] excluded = {"some.foo"};
@@ -508,33 +533,34 @@ private void execIncludeTest(final Option option, final String[] args) {
 
             ReportConfiguration config = generateConfig(Collections.emptyList());
             Reporter reporter = new Reporter(config);
-            ClaimStatistic claimStatistic = reporter.execute();
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(4);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(0);
+            Reporter.Output output = reporter.execute();
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(4);
+
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(includesRatDir ? 1 : 0);
 
             // verify exclude removes most files.
             config = generateConfig(ImmutablePair.of(excludeOption, EXCLUDE_ARGS));
             reporter = new Reporter(config);
-            claimStatistic = reporter.execute();
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(1);
+            output  = reporter.execute();
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(1);
             // .gitignore is ignored by default as it is hidden but not counted
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(3);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(includesRatDir ? 4 : 3);
 
             // verify include pust them back
             config = generateConfig(ImmutablePair.of(option, args), ImmutablePair.of(excludeOption, EXCLUDE_ARGS));
             reporter = new Reporter(config);
-            claimStatistic = reporter.execute();
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(3);
+            output  = reporter.execute();
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(3);
             // .gitignore is ignored by default as it is hidden but not counted
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(1);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(includesRatDir ? 2 : 1 );
         } catch (IOException | RatException e) {
             fail(e.getMessage(), e);
         }
     }
 
     private void includeFileTest(final Option option) {
-        File outputFile = FileUtils.writeFile(baseDir, "include.txt", Arrays.asList(INCLUDE_ARGS));
-        execIncludeTest(option, new String[]{outputFile.getAbsolutePath()});
+        File outputFile = FileUtils.writeFile(configureRatDir(option), "include.txt", Arrays.asList(INCLUDE_ARGS));
+        execIncludeTest(option, new String[]{outputFile.getAbsolutePath()}, true);
     }
 
     @OptionCollectionTest.TestFunction
@@ -549,12 +575,12 @@ protected void includesFileTest() {
 
     @OptionCollectionTest.TestFunction
     protected void includeTest() {
-        execIncludeTest(Arg.INCLUDE.find("include"), INCLUDE_ARGS);
+        execIncludeTest(Arg.INCLUDE.find("include"), INCLUDE_ARGS, false);
     }
 
     @OptionCollectionTest.TestFunction
     protected void inputIncludeTest() {
-        execIncludeTest(Arg.INCLUDE.find("input-include"), INCLUDE_ARGS);
+        execIncludeTest(Arg.INCLUDE.find("input-include"), INCLUDE_ARGS, false);
     }
 
     @OptionCollectionTest.TestFunction
@@ -578,15 +604,15 @@ protected void inputIncludeStdTest() {
 
             ReportConfiguration config = generateConfig(Collections.singletonList(excludes));
             Reporter reporter = new Reporter(config);
-            ClaimStatistic claimStatistic = reporter.execute();
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(3);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(5);
+            Reporter.Output output = reporter.execute();
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(3);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(5);
 
             config = generateConfig(excludes, ImmutablePair.of(option, args));
             reporter = new Reporter(config);
-            claimStatistic = reporter.execute();
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(7);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(1);
+            output  = reporter.execute();
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(7);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(1);
         } catch (IOException | RatException e) {
             fail(e.getMessage(), e);
         }
@@ -604,15 +630,15 @@ protected void inputSourceTest() {
 
             ReportConfiguration config = generateConfig();
             Reporter reporter = new Reporter(config);
-            ClaimStatistic claimStatistic = reporter.execute();
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(3);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(0);
+            Reporter.Output output = reporter.execute();
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(3);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(0);
 
             config = generateConfig(ImmutablePair.of(option, new String[]{inputFile.getAbsolutePath()}));
             reporter = new Reporter(config);
-            claimStatistic = reporter.execute();
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(1);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(0);
+            output  = reporter.execute();
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(1);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(0);
         } catch (IOException | RatException e) {
             fail(e.getMessage(), e);
         }
@@ -635,18 +661,18 @@ private void execLicenseFamiliesApprovedTest(final Option option, final String[]
 
             ReportConfiguration config = addCatzLicense(generateConfig());
             Reporter reporter = new Reporter(config);
-            ClaimStatistic claimStatistic = reporter.execute();
+            Reporter.Output output = reporter.execute();
 
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(1);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.APPROVED)).isEqualTo(0);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.UNAPPROVED)).isEqualTo(1);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(1);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.APPROVED)).isEqualTo(0);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.UNAPPROVED)).isEqualTo(1);
 
             config = addCatzLicense(generateConfig(arg1));
             reporter = new Reporter(config);
-            claimStatistic = reporter.execute();
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(1);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.APPROVED)).isEqualTo(1);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.UNAPPROVED)).isEqualTo(0);
+            output  = reporter.execute();
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(1);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.APPROVED)).isEqualTo(1);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.UNAPPROVED)).isEqualTo(0);
         } catch (IOException | RatException e) {
             fail(e.getMessage(), e);
         }
@@ -655,7 +681,7 @@ private void execLicenseFamiliesApprovedTest(final Option option, final String[]
     @OptionCollectionTest.TestFunction
     protected void licenseFamiliesApprovedFileTest() {
         Option option = Arg.FAMILIES_APPROVED_FILE.find("license-families-approved-file");
-        File outputFile = FileUtils.writeFile(baseDir, "familiesApproved.txt", Collections.singletonList("catz"));
+        File outputFile = FileUtils.writeFile(configureRatDir(option), "familiesApproved.txt", Collections.singletonList("catz"));
         execLicenseFamiliesApprovedTest(option, new String[]{outputFile.getAbsolutePath()});
     }
 
@@ -676,17 +702,17 @@ private void execLicenseFamiliesDeniedTest(final Option option, final String[] a
 
             ReportConfiguration config = generateConfig();
             Reporter reporter = new Reporter(config);
-            ClaimStatistic claimStatistic = reporter.execute();
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(1);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.APPROVED)).isEqualTo(1);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.UNAPPROVED)).isEqualTo(0);
+            Reporter.Output output = reporter.execute();
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(1);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.APPROVED)).isEqualTo(1);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.UNAPPROVED)).isEqualTo(0);
 
             config = generateConfig(arg1);
             reporter = new Reporter(config);
-            claimStatistic = reporter.execute();
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(1);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.APPROVED)).isEqualTo(0);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.UNAPPROVED)).isEqualTo(1);
+            output  = reporter.execute();
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(1);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.APPROVED)).isEqualTo(0);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.UNAPPROVED)).isEqualTo(1);
         } catch (IOException | RatException e) {
             fail(e.getMessage(), e);
         }
@@ -694,9 +720,9 @@ private void execLicenseFamiliesDeniedTest(final Option option, final String[] a
 
     @OptionCollectionTest.TestFunction
     protected void licenseFamiliesDeniedFileTest() {
-        File outputFile = FileUtils.writeFile(baseDir, "familiesDenied.txt", Collections.singletonList("BSD-3"));
-        execLicenseFamiliesDeniedTest(Arg.FAMILIES_DENIED_FILE.find("license-families-denied-file"),
-                new String[]{outputFile.getAbsolutePath()});
+        Option option = Arg.FAMILIES_DENIED_FILE.find("license-families-denied-file");
+        File outputFile = FileUtils.writeFile(configureRatDir(option), "familiesDenied.txt", Collections.singletonList("BSD-3"));
+        execLicenseFamiliesDeniedTest(option, new String[]{outputFile.getAbsolutePath()});
     }
 
     @OptionCollectionTest.TestFunction
@@ -712,7 +738,6 @@ private void configTest(final Option option) {
             String[] args = {
                     Resources.getResourceFile("OptionTools/One.xml").getAbsolutePath(),
                     Resources.getResourceFile("OptionTools/Two.xml").getAbsolutePath()};
-
             Pair<Option, String[]> arg1 = ImmutablePair.of(option, args);
 
             writeFile("bsd.txt", "SPDX-License-Identifier: BSD-3-Clause");
@@ -720,26 +745,26 @@ private void configTest(final Option option) {
 
             ReportConfiguration config = generateConfig();
             Reporter reporter = new Reporter(config);
-            ClaimStatistic claimStatistic = reporter.execute();
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(2);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.APPROVED)).isEqualTo(1);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.UNAPPROVED)).isEqualTo(1);
+            Reporter.Output output = reporter.execute();
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(2);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.APPROVED)).isEqualTo(1);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.UNAPPROVED)).isEqualTo(1);
 
             config = generateConfig(arg1);
             reporter = new Reporter(config);
-            claimStatistic = reporter.execute();
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(2);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.APPROVED)).isEqualTo(2);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.UNAPPROVED)).isEqualTo(0);
+            output  = reporter.execute();
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(2);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.APPROVED)).isEqualTo(2);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.UNAPPROVED)).isEqualTo(0);
 
             Pair<Option, String[]> arg2 = ImmutablePair.of(Arg.CONFIGURATION_NO_DEFAULTS.find("configuration-no-defaults"), null);
 
             config = generateConfig(arg1, arg2);
             reporter = new Reporter(config);
-            claimStatistic = reporter.execute();
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(2);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.APPROVED)).isEqualTo(1);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.UNAPPROVED)).isEqualTo(1);
+            output  = reporter.execute();
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(2);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.APPROVED)).isEqualTo(1);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.UNAPPROVED)).isEqualTo(1);
 
         } catch (IOException | RatException e) {
             fail(e.getMessage(), e);
@@ -768,17 +793,17 @@ protected void execLicensesApprovedTest(final Option option, String[] args) {
 
             ReportConfiguration config = generateConfig();
             Reporter reporter = new Reporter(config);
-            ClaimStatistic claimStatistic = reporter.execute();
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(2);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.APPROVED)).isEqualTo(1);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.UNAPPROVED)).isEqualTo(1);
+            Reporter.Output output = reporter.execute();
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(2);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.APPROVED)).isEqualTo(1);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.UNAPPROVED)).isEqualTo(1);
 
             config = generateConfig(arg1);
             reporter = new Reporter(config);
-            claimStatistic = reporter.execute();
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(2);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.APPROVED)).isEqualTo(2);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.UNAPPROVED)).isEqualTo(0);
+            output  = reporter.execute();
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(2);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.APPROVED)).isEqualTo(2);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.UNAPPROVED)).isEqualTo(0);
 
 
         } catch (IOException | RatException e) {
@@ -788,9 +813,9 @@ protected void execLicensesApprovedTest(final Option option, String[] args) {
 
     @OptionCollectionTest.TestFunction
     protected void licensesApprovedFileTest() {
-        File outputFile = FileUtils.writeFile(baseDir, "licensesApproved.txt", Collections.singletonList("GPL1"));
-        execLicensesApprovedTest(Arg.LICENSES_APPROVED_FILE.find("licenses-approved-file"),
-                new String[]{outputFile.getAbsolutePath()});
+        Option option = Arg.LICENSES_APPROVED_FILE.find("licenses-approved-file");
+        File outputFile = FileUtils.writeFile(configureRatDir(option), "licensesApproved.txt", Collections.singletonList("GPL1"));
+        execLicensesApprovedTest(option, new String[]{outputFile.getAbsolutePath()});
     }
 
     @OptionCollectionTest.TestFunction
@@ -815,17 +840,17 @@ protected void scanHiddenDirectoriesTest() {
 
             ReportConfiguration config = generateConfig();
             Reporter reporter = new Reporter(config);
-            ClaimStatistic claimStatistic = reporter.execute();
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(1);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.APPROVED)).isEqualTo(1);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.UNAPPROVED)).isEqualTo(0);
+            Reporter.Output output = reporter.execute();
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(1);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.APPROVED)).isEqualTo(1);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.UNAPPROVED)).isEqualTo(0);
 
             config = generateConfig(arg1);
             reporter = new Reporter(config);
-            claimStatistic = reporter.execute();
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(2);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.APPROVED)).isEqualTo(1);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.UNAPPROVED)).isEqualTo(1);
+            output  = reporter.execute();
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(2);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.APPROVED)).isEqualTo(1);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.UNAPPROVED)).isEqualTo(1);
         } catch (IOException | RatException e) {
             fail(e.getMessage(), e);
         }
@@ -841,10 +866,11 @@ private void outTest(final Option option) {
 
             ReportConfiguration config = generateConfig(ImmutablePair.of(option, args));
             Reporter reporter = new Reporter(config);
-            ClaimStatistic claimStatistic = reporter.output();
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(1);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.APPROVED)).isEqualTo(1);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.UNAPPROVED)).isEqualTo(0);
+            Reporter.Output output = reporter.execute();
+            output.format(config);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(1);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.APPROVED)).isEqualTo(1);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.UNAPPROVED)).isEqualTo(0);
 
             String actualText = TextUtils.readFile(outFile);
             TextUtils.assertContainsExactly(1, "Apache License 2.0: 1 ", actualText);
@@ -884,10 +910,11 @@ private void styleSheetTest(final Option option) {
                 args[0] = sheet.arg();
                 ReportConfiguration config = generateConfig(ImmutablePair.of(option, args));
                 Reporter reporter = new Reporter(config);
-                ClaimStatistic claimStatistic = reporter.output();
-                assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(1);
-                assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.APPROVED)).isEqualTo(0);
-                assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.UNAPPROVED)).isEqualTo(1);
+                Reporter.Output output  = reporter.execute();
+                output.format(config);
+                assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(1);
+                assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.APPROVED)).isEqualTo(0);
+                assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.UNAPPROVED)).isEqualTo(1);
 
                 String actualText = baos.toString(StandardCharsets.UTF_8);
                 switch (sheet) {
@@ -905,6 +932,9 @@ private void styleSheetTest(final Option option) {
                     case UNAPPROVED_LICENSES:
                         TextUtils.assertContainsExactly(1, "Files with unapproved licenses:" + System.lineSeparator() + "  /stylesheet", actualText);
                         break;
+                    case XHTML5:
+                        TextUtils.assertPatternInTarget("<td>Approved<\\/td>\\s+<td>\\d+<\\/td>\\s+<td>A count of approved licenses.<\\/td>", actualText);
+                        break;
                     default:
                         fail("No test for stylesheet " + sheet);
                         break;
@@ -914,10 +944,11 @@ private void styleSheetTest(final Option option) {
             args[0] = file.getAbsolutePath();
             ReportConfiguration config = generateConfig(ImmutablePair.of(option, args));
             Reporter reporter = new Reporter(config);
-            ClaimStatistic claimStatistic = reporter.output();
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(1);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.APPROVED)).isEqualTo(0);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.UNAPPROVED)).isEqualTo(1);
+            Reporter.Output output  = reporter.execute();
+            output.format(config);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(1);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.APPROVED)).isEqualTo(0);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.UNAPPROVED)).isEqualTo(1);
 
             String actualText = baos.toString(StandardCharsets.UTF_8);
             TextUtils.assertContainsExactly(1, "Hello world", actualText);
@@ -956,15 +987,16 @@ protected void xmlTest() {
 
             ReportConfiguration config = generateConfig(ImmutablePair.of(option, null));
             Reporter reporter = new Reporter(config);
-            ClaimStatistic claimStatistic = reporter.output();
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(1);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.APPROVED)).isEqualTo(0);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.UNAPPROVED)).isEqualTo(1);
+            Reporter.Output output  = reporter.execute();
+            output.format(config);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(1);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.APPROVED)).isEqualTo(0);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.UNAPPROVED)).isEqualTo(1);
 
             String actualText = baos.toString(StandardCharsets.UTF_8);
             TextUtils.assertContainsExactly(1, "<resource encoding=\"ISO-8859-1\" mediaType=\"text/plain\" name=\"/stylesheet\" type=\"STANDARD\">", actualText);
 
-            try (InputStream expected = StyleSheets.getStyleSheet("xml").get();
+            try (InputStream expected = StyleSheets.getStyleSheet("xml", null).ioSupplier().get();
                  InputStream actual = config.getStyleSheet().get()) {
                 assertThat(IOUtils.contentEquals(expected, actual)).as("'xml' does not match").isTrue();
             }
@@ -987,12 +1019,12 @@ protected void logLevelTest() {
 
             ReportConfiguration config = generateConfig();
             Reporter reporter = new Reporter(config);
-            reporter.output();
+            reporter.execute();
             TextUtils.assertNotContains("DEBUG", baos.toString(StandardCharsets.UTF_8));
 
             config = generateConfig(ImmutablePair.of(option, new String[]{"debug"}));
             reporter = new Reporter(config);
-            reporter.output();
+            reporter.execute();
             TextUtils.assertContains("DEBUG", baos.toString(StandardCharsets.UTF_8));
         } catch (IOException | RatException e) {
             fail(e.getMessage(), e);
@@ -1008,16 +1040,11 @@ private void listLicenses(final Option option) {
 
         try {
             configureSourceDir(option);
-            File outFile = new File(sourceDir, "out.xml");
-            FileUtils.delete(outFile);
-            ImmutablePair<Option, String[]> outputFile = ImmutablePair.of(Arg.OUTPUT_FILE.option(), new String[]{outFile.getAbsolutePath()});
-            ImmutablePair<Option, String[]> stylesheet = ImmutablePair.of(Arg.OUTPUT_STYLE.option(), new String[]{StyleSheets.XML.arg()});
             for (LicenseSetFactory.LicenseFilter filter : LicenseSetFactory.LicenseFilter.values()) {
                 args[0] = filter.name();
-                ReportConfiguration config = generateConfig(outputFile, stylesheet, ImmutablePair.of(option, args));
+                ReportConfiguration config = generateConfig(ImmutablePair.of(option, args));
                 Reporter reporter = new Reporter(config);
-                reporter.output();
-                Document document = XmlUtils.toDom(new FileInputStream(outFile));
+                Document document = reporter.execute().getDocument();
                 switch (filter) {
                     case ALL:
                         XmlUtils.assertIsPresent(filter.name(), document, xPath, "/rat-report/rat-config/licenses/license[@id='AL2.0']");
@@ -1035,8 +1062,7 @@ private void listLicenses(final Option option) {
                         throw new IllegalArgumentException("Unexpected filter: " + filter);
                 }
             }
-        } catch (IOException | RatException | SAXException |
-                 XPathExpressionException e) {
+        } catch (IOException | RatException | XPathExpressionException e) {
             fail(e.getMessage(), e);
         }
     }
@@ -1057,16 +1083,12 @@ private void listFamilies(final Option option) {
 
         try {
             configureSourceDir(option);
-            File outFile = new File(sourceDir, "out.xml");
-            FileUtils.delete(outFile);
-            ImmutablePair<Option, String[]> outputFile = ImmutablePair.of(Arg.OUTPUT_FILE.option(), new String[]{outFile.getAbsolutePath()});
-            ImmutablePair<Option, String[]> stylesheet = ImmutablePair.of(Arg.OUTPUT_STYLE.option(), new String[]{StyleSheets.XML.arg()});
             for (LicenseSetFactory.LicenseFilter filter : LicenseSetFactory.LicenseFilter.values()) {
                 args[0] = filter.name();
-                ReportConfiguration config = generateConfig(outputFile, stylesheet, ImmutablePair.of(option, args));
+                ReportConfiguration config = generateConfig(ImmutablePair.of(option, args));
                 Reporter reporter = new Reporter(config);
-                reporter.output();
-                Document document = XmlUtils.toDom(Files.newInputStream(outFile.toPath()));
+                Reporter.Output output = reporter.execute();
+                Document document = output.getDocument();
                 switch (filter) {
                     case ALL:
                         XmlUtils.assertIsPresent(filter.name(), document, xPath, "/rat-report/rat-config/families/family[@id='AL']");
@@ -1084,8 +1106,7 @@ private void listFamilies(final Option option) {
                         throw new IllegalArgumentException("Unexpected filter: " + filter);
                 }
             }
-        } catch (IOException | RatException | SAXException |
-                 XPathExpressionException e) {
+        } catch (IOException | RatException | XPathExpressionException e) {
             fail(e.getMessage(), e);
         }
     }
@@ -1121,9 +1142,8 @@ private void archiveTest(final Option option) {
                 args[0] = proc.name();
                 ReportConfiguration config = generateConfig(outputFile, stylesheet, ImmutablePair.of(option, args));
                 Reporter reporter = new Reporter(config);
-                reporter.output();
 
-                Document document = XmlUtils.toDom(Files.newInputStream(outFile.toPath()));
+                Document document = reporter.execute().getDocument();
                 XmlUtils.assertIsPresent(proc.name(), document, xPath, "/rat-report/resource[@name='/dummy.jar']");
                 switch (proc) {
                     case ABSENCE:
@@ -1142,8 +1162,7 @@ private void archiveTest(final Option option) {
                         throw new IllegalArgumentException("Unexpected processing " + proc);
                 }
             }
-        } catch (IOException | RatException | SAXException |
-                 XPathExpressionException e) {
+        } catch (IOException | RatException | XPathExpressionException e) {
             fail(e.getMessage(), e);
         }
     }
@@ -1174,9 +1193,9 @@ private void standardTest(final Option option) {
                 args[0] = proc.name();
                 ReportConfiguration config = generateConfig(outputFile, stylesheet, ImmutablePair.of(option, args));
                 Reporter reporter = new Reporter(config);
-                reporter.output();
+                Reporter.Output output = reporter.execute();
 
-                Document document = XmlUtils.toDom(Files.newInputStream(outFile.toPath()));
+                Document document = output.getDocument();
                 XmlUtils.assertIsPresent(proc.name(), document, xPath, testDoc);
                 XmlUtils.assertIsPresent(proc.name(), document, xPath, missingDoc);
 
@@ -1197,8 +1216,7 @@ private void standardTest(final Option option) {
                         throw new IllegalArgumentException("Unexpected processing " + proc);
                 }
             }
-        } catch (IOException | RatException | SAXException |
-                 XPathExpressionException e) {
+        } catch (IOException | RatException | XPathExpressionException e) {
             fail(e.getMessage(), e);
         }
     }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReporterOptionsTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReporterOptionsTest.java
index ccb82f3c6..4f52a31a5 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReporterOptionsTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReporterOptionsTest.java
@@ -27,7 +27,7 @@
 import org.apache.rat.api.RatException;
 import org.apache.rat.report.claim.ClaimStatistic;
 import org.apache.rat.test.AbstractConfigurationOptionsProvider;
-import org.apache.rat.testhelpers.FileUtils;
+import org.apache.rat.utils.FileUtils;
 import org.apache.rat.testhelpers.XmlUtils;
 import org.apache.rat.utils.DefaultLog;
 import org.apache.rat.utils.Log;
@@ -78,14 +78,14 @@ void testRat362() {
             FileUtils.writeFile(testDir, "foo.md");
             ReportConfiguration config = OptionCollection.parseCommands(testDir, args, o -> fail("Help called"), true);
             Reporter reporter = new Reporter(config);
-            ClaimStatistic claimStatistic = reporter.execute();
-            XmlUtils.printDocument(System.out, reporter.getDocument());
+            Reporter.Output output = reporter.execute();
+            XmlUtils.printDocument(System.out, output.getDocument());
             XPath xpath = XPathFactory.newInstance().newXPath();
-            XmlUtils.assertIsPresent(reporter.getDocument(), xpath, "/rat-report/resource[@name='/foo.md']");
-            XmlUtils.assertAttributes(reporter.getDocument(), xpath, "/rat-report/resource[@name='/foo.md']",
+            XmlUtils.assertIsPresent(output.getDocument(), xpath, "/rat-report/resource[@name='/foo.md']");
+            XmlUtils.assertAttributes(output.getDocument(), xpath, "/rat-report/resource[@name='/foo.md']",
                     XmlUtils.mapOf("type", "IGNORED"));
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(0);
-            assertThat(claimStatistic.getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(2);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.STANDARDS)).isEqualTo(0);
+            assertThat(output.getStatistic().getCounter(ClaimStatistic.Counter.IGNORED)).isEqualTo(2);
         } catch (IOException | RatException | XPathExpressionException e) {
             fail(e);
         }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
index 39d780c9e..9aab15aad 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
@@ -19,21 +19,28 @@
 package org.apache.rat;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Fail.fail;
 
-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.IOException;
 import java.io.PrintStream;
+import java.lang.reflect.Method;
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.TreeMap;
+import java.util.UUID;
+import java.util.stream.Stream;
 import javax.xml.XMLConstants;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
@@ -45,12 +52,11 @@
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathFactory;
 
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.io.FileUtils;
 import org.apache.rat.api.Document.Type;
 import org.apache.rat.api.RatException;
+import org.apache.rat.commandline.Arg;
 import org.apache.rat.commandline.ArgumentContext;
 import org.apache.rat.commandline.StyleSheets;
 import org.apache.rat.document.FileDocument;
@@ -59,11 +65,22 @@
 import org.apache.rat.license.LicenseSetFactory;
 import org.apache.rat.report.claim.ClaimStatistic;
 import org.apache.rat.test.utils.Resources;
+import org.apache.rat.testhelpers.BaseOptionCollection;
 import org.apache.rat.testhelpers.TextUtils;
 import org.apache.rat.testhelpers.XmlUtils;
+import org.apache.rat.testhelpers.data.ReportTestDataProvider;
+import org.apache.rat.testhelpers.data.TestData;
+import org.apache.rat.testhelpers.data.ValidatorData;
 import org.apache.rat.walker.DirectoryWalker;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
@@ -72,22 +89,68 @@
  * Tests the output of the Reporter.
  */
 public class ReporterTest {
-    @TempDir
-    File tempDirectory;
+    /**
+     * temporary file.  Not using tempDir because it does not
+     * always work.
+     */
+    private static Path tempPath;
+    /**
+     * The TestInfo for the current test.
+     */
+    private TestInfo testInfo;
+
+    /**
+     * The directory for the test.
+     */
+    private Path testPath;
+
+    /**
+     * Directory for the test data.
+     */
     final String basedir;
 
+    private final OptionCollectionParser collectionParser;
+
     ReporterTest() throws URISyntaxException {
         basedir = Resources.getExampleResource("exampleData").getPath();
+        collectionParser = new OptionCollectionParser(BaseOptionCollection.builder().build());
     }
 
-    @Test
-    public void testExecute() throws RatException, ParseException {
-        File output = new File(tempDirectory, "testExecute");
+    @BeforeAll
+    static void setUp() throws IOException {
+        tempPath = Files.createTempDirectory("ReporterTest");
+    }
+
+    @AfterAll
+    static void cleanup() throws IOException {
+        FileUtils.deleteDirectory(tempPath.toFile());
+    }
+
+    @BeforeEach
+    void setUpTest(TestInfo testInfo) {
+        this.testInfo = testInfo;
+        Optional<Method> testMethod = testInfo.getTestMethod();
+        this.testPath = tempPath.resolve(testMethod.isPresent() ?
+                        testMethod.get().getName() :
+                        UUID.randomUUID().toString());
+        File file = testPath.toFile();
+        if (!file.exists()) {
+            if (!file.mkdirs()) {
+                throw new RuntimeException("Unable to create temp directory: " + file.getName());
+            }
+        } else {
+            if (!file.isDirectory()) {
+                throw new RuntimeException(file.getName() + " is NOT a directory.");
+            }
+        }
+    }
 
-        CommandLine cl = new DefaultParser().parse(OptionCollection.buildOptions(), new String[]{"--output-style", "xml", "--output-file", output.getPath(), basedir});
-        ArgumentContext ctxt = new ArgumentContext(new File("."), cl);
-        ReportConfiguration config = OptionCollection.createConfiguration(ctxt);
-        ClaimStatistic statistic = new Reporter(config).execute();
+    @Test
+    void testExecute() throws RatException, ParseException, IOException {
+        File output = testPath.resolve("output.xml").toFile();
+        BaseOptionCollection optionCollection = BaseOptionCollection.builder().build();
+        ArgumentContext ctxt = collectionParser.parseCommands(new File("."), new String[]{"--output-style", "xml", "--output-file", output.getPath(), basedir});
+        ClaimStatistic statistic = new Reporter(ctxt.getConfiguration()).execute().getStatistic();
 
         assertThat(statistic.getCounter(Type.ARCHIVE)).isEqualTo(1);
         assertThat(statistic.getCounter(Type.BINARY)).isEqualTo(2);
@@ -136,13 +199,10 @@ public void testExecute() throws RatException, ParseException {
     }
 
     @Test
-    public void testOutputOption() throws Exception {
-        File output = new File(tempDirectory, "test");
-        CommandLine commandLine = new DefaultParser().parse(OptionCollection.buildOptions(), new String[]{"-o", output.getCanonicalPath(), basedir});
-        ArgumentContext ctxt = new ArgumentContext(new File("."), commandLine);
-
-        ReportConfiguration config = OptionCollection.createConfiguration(ctxt);
-        new Reporter(config).output();
+    void testOutputOption() throws Exception {
+        File output = testPath.resolve("output.txt").toFile();
+        ArgumentContext ctxt = collectionParser.parseCommands(new File("."), new String[]{"--output-file", output.getCanonicalPath(), basedir});
+        new Reporter(ctxt.getConfiguration()).execute().format(ctxt.getConfiguration());
         assertThat(output.exists()).isTrue();
         String content = FileUtils.readFileToString(output, StandardCharsets.UTF_8);
         TextUtils.assertPatternInTarget("^! Unapproved:\\s*2 ", content);
@@ -151,17 +211,15 @@ public void testOutputOption() throws Exception {
     }
 
     @Test
-    public void testDefaultOutput() throws Exception {
-        File output = new File(tempDirectory, "testDefaultOutput");
+    void testDefaultOutput() throws Exception {
+        File output = testPath.resolve("captured.txt").toFile();
+        BaseOptionCollection optionCollection = BaseOptionCollection.builder().build();
 
         PrintStream origin = System.out;
         try (PrintStream out = new PrintStream(output)) {
             System.setOut(out);
-            CommandLine commandLine = new DefaultParser().parse(OptionCollection.buildOptions(), new String[]{basedir});
-            ArgumentContext ctxt = new ArgumentContext(new File("."), commandLine);
-
-            ReportConfiguration config = OptionCollection.createConfiguration(ctxt);
-            new Reporter(config).output();
+            ArgumentContext ctxt = collectionParser.parseCommands(new File("."), new String[]{basedir});
+            new Reporter(ctxt.getConfiguration()).execute().format(ctxt.getConfiguration());
         } finally {
             System.setOut(origin);
         }
@@ -179,7 +237,7 @@ private static Map<String, String> mapOf(String... parts) {
     }
 
     @Test
-    public void testXMLOutput() throws Exception {
+    void testXMLOutput() throws Exception {
         Map<String, Map<String, String>> expected = new HashMap<>();
         expected.put("/.hiddenDirectory", mapOf("isDirectory", "true", "mediaType", "application/octet-stream",
                 "type", "IGNORED"));
@@ -209,12 +267,10 @@ public void testXMLOutput() throws Exception {
         expected.put("/tri.txt", mapOf("encoding", "ISO-8859-1", "mediaType", "text/plain",
                 "type", "STANDARD"));
 
-        File output = new File(tempDirectory, "testXMLOutput");
-        CommandLine commandLine = new DefaultParser().parse(OptionCollection.buildOptions(), new String[]{"--output-style", "xml", "--output-file", output.getPath(), basedir});
-        ArgumentContext ctxt = new ArgumentContext(new File("."), commandLine);
-
-        ReportConfiguration config = OptionCollection.createConfiguration(ctxt);
-        new Reporter(config).output();
+        File output = testPath.resolve(".rat/testXMLOutput").toFile();
+        output.getParentFile().mkdir();
+        ArgumentContext ctxt = collectionParser.parseCommands(testPath.toFile(), new String[]{"--output-style", "xml", "--output-file", output.getPath(), basedir});
+        new Reporter(ctxt.getConfiguration()).execute().format(ctxt.getConfiguration());
 
         assertThat(output).exists();
         Document doc = XmlUtils.toDom(java.nio.file.Files.newInputStream(output.toPath()));
@@ -403,14 +459,9 @@ private Validator initValidator() throws SAXException {
     }
 
     @Test
-    public void xmlReportTest() throws Exception {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-
+    void xmlReportTest() throws Exception {
         ReportConfiguration configuration = initializeConfiguration();
-        configuration.setStyleSheet(StyleSheets.XML.getStyleSheet());
-        configuration.setOut(() -> out);
-        new Reporter(configuration).output();
-        Document doc = XmlUtils.toDom(new ByteArrayInputStream(out.toByteArray()));
+        Document doc = new Reporter(configuration).execute().getDocument();
 
         XPath xPath = XPathFactory.newInstance().newXPath();
 
@@ -447,7 +498,7 @@ public void xmlReportTest() throws Exception {
     }
 
     @Test
-    public void plainReportTest() throws Exception {
+    void plainReportTest() throws Exception {
         final String NL = System.lineSeparator();
         final String SEPARATOR = "*****************************************************";
         final String HEADER = SEPARATOR + NL + //
@@ -456,10 +507,9 @@ public void plainReportTest() throws Exception {
                 "Generated at: ";
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         ReportConfiguration configuration = initializeConfiguration();
-        configuration.setOut(() -> out);
-        new Reporter(configuration).output();
+        configuration.setOut(new ReportConfiguration.IODescriptor<>("plainReportTest", () -> out));
+        new Reporter(configuration).execute().format(configuration);
 
-        out.flush();
         String document = out.toString();
 
         TextUtils.assertNotContains("<?xml version=\"1.0\" encoding=\"UTF-8\"?>", document);
@@ -469,14 +519,13 @@ public void plainReportTest() throws Exception {
     }
 
     @Test
-    public void unapprovedLicensesReportTest() throws Exception {
+    void unapprovedLicensesReportTest() throws Exception {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         ReportConfiguration configuration = initializeConfiguration();
-        configuration.setOut(() -> out);
+        configuration.setOut(new ReportConfiguration.IODescriptor<>("unapprovedLicensesReportTest", () -> out));
         configuration.setStyleSheet(this.getClass().getResource("/org/apache/rat/unapproved-licenses.xsl"));
-        new Reporter(configuration).output();
+        new Reporter(configuration).execute().format(configuration);
 
-        out.flush();
         String document = out.toString();
 
         TextUtils.assertContains("Generated at: ", document );
@@ -488,34 +537,62 @@ public void unapprovedLicensesReportTest() throws Exception {
     void listLicensesReportTest() throws Exception {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         ReportConfiguration configuration = initializeConfiguration();
-        configuration.setOut(() -> out);
+        configuration.setOut(new ReportConfiguration.IODescriptor<>("listLicensesReportTest", () -> out));
         configuration.setStyleSheet(StyleSheets.UNAPPROVED_LICENSES.getStyleSheet());
         Reporter.listLicenses(configuration, LicenseSetFactory.LicenseFilter.NONE);
 
         out.flush();
         String document = out.toString();
-
         assertThat(document).contains("Licenses (NONE):");
     }
 
     @Test
     void counterMaxTest() throws Exception {
         ReportConfiguration config = initializeConfiguration();
-        Reporter reporter = new Reporter(config);
-        reporter.output();
+        Reporter.Output output = new Reporter(config).execute();
         assertThat(config.getClaimValidator().hasErrors()).isTrue();
-        assertThat(config.getClaimValidator().isValid(ClaimStatistic.Counter.UNAPPROVED, reporter.getClaimsStatistic().getCounter(ClaimStatistic.Counter.UNAPPROVED)))
+        assertThat(config.getClaimValidator().isValid(ClaimStatistic.Counter.UNAPPROVED, output.getStatistic().getCounter(ClaimStatistic.Counter.UNAPPROVED)))
                 .isFalse();
 
         config = initializeConfiguration();
         config.getClaimValidator().setMax(ClaimStatistic.Counter.UNAPPROVED, 2);
-        reporter = new Reporter(config);
-        reporter.output();
+        output = new Reporter(config).execute();
         assertThat(config.getClaimValidator().hasErrors()).isFalse();
-        assertThat(config.getClaimValidator().isValid(ClaimStatistic.Counter.UNAPPROVED, reporter.getClaimsStatistic().getCounter(ClaimStatistic.Counter.UNAPPROVED)))
+        assertThat(config.getClaimValidator().isValid(ClaimStatistic.Counter.UNAPPROVED, output.getStatistic().getCounter(ClaimStatistic.Counter.UNAPPROVED)))
                 .isTrue();
     }
 
+    static Stream<Arguments> getTestData() {
+        BaseOptionCollection.Builder builder = BaseOptionCollection.builder()
+                        .unsupported(Arg.OUTPUT_FILE);
+        return new ReportTestDataProvider().getOptionTests(builder.build()).stream().map(testData ->
+                Arguments.of(testData.getTestName(), testData));
+    }
+
+    @ParameterizedTest( name = "{index} {0}")
+    @MethodSource("getTestData")
+    void testReportData(String name, TestData test) throws Exception {
+        Path invokePath = testPath.resolve(test.getTestName());
+        org.apache.rat.utils.FileUtils.mkDir(invokePath.toFile());
+
+        test.setupFiles(invokePath);
+        ArgumentContext ctxt = collectionParser.parseCommands(invokePath.toFile(),
+                test.getCommandLine(invokePath.toString()));
+        if (test.expectingException()) {
+            assertThatThrownBy(() -> new Reporter(ctxt.getConfiguration()).execute()).as("Expected throws from " + name)
+                    .hasMessageContaining(test.getExpectedException().getMessage());
+            ValidatorData data = new ValidatorData(Reporter.Output.builder().configuration(ctxt.getConfiguration()).build(),
+                    invokePath.toString());
+            test.getValidator().accept(data);
+        } else {
+            Reporter.Output output = ctxt.getConfiguration() != null ? new Reporter(ctxt.getConfiguration()).execute() :
+                    Reporter.Output.builder().build();
+            ValidatorData data = new ValidatorData(output, invokePath.toString());
+            data.getOutput().format(data.getConfiguration());
+            test.getValidator().accept(data);
+        }
+    }
+
     private record LicenseInfo(String id, String family, boolean approval, boolean hasNotes) {
             LicenseInfo(String id, boolean approval, boolean hasNotes) {
                 this(id, id, approval, hasNotes);
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/HeaderCheckWorkerTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/HeaderCheckWorkerTest.java
index b00aec082..ec6420aed 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/HeaderCheckWorkerTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/HeaderCheckWorkerTest.java
@@ -22,7 +22,11 @@
 import java.io.StringReader;
 
 import java.util.Collections;
+import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
+import org.apache.commons.collections4.set.UnmodifiableSortedSet;
 import org.apache.rat.Defaults;
 import org.apache.rat.api.Document;
 import org.apache.rat.configuration.builders.AnyBuilder;
@@ -38,12 +42,19 @@
 
 public class HeaderCheckWorkerTest {
 
+    /** Create an unmodifiable sorted set from members */
+    private UnmodifiableSortedSet<ILicense> asLicenses(ILicense... licenses) {
+        SortedSet<ILicense> inner = new  TreeSet<>();
+        inner.addAll(List.of(licenses));
+        return (UnmodifiableSortedSet<ILicense>) UnmodifiableSortedSet.unmodifiableSortedSet(inner);
+    }
+
     @Test
     public void emptyInputIsUnknownTest() throws RatHeaderAnalysisException {
         final Document subject = new TestingDocument("subject");
         subject.getMetaData().setApprovalPredicate(Defaults.builder().build().getLicenseSetFactory().getApprovedLicensePredicate());
         ILicense matcher = new TestingLicense("test", "test");
-        HeaderCheckWorker worker = new HeaderCheckWorker(new TestingMatcher(), new StringReader(""), Lists.list(matcher), subject);
+        HeaderCheckWorker worker = new HeaderCheckWorker(new TestingMatcher(), new StringReader(""), asLicenses(matcher), subject);
         worker.read();
         assertThat(subject.getMetaData().unapprovedLicenses().count()).isEqualTo(1);
         assertThat(subject.getMetaData().unapprovedLicenses().toList().get(0).getLicenseFamily()).isEqualTo(ILicenseFamily.UNKNOWN);
@@ -53,7 +64,7 @@ public void emptyInputIsUnknownTest() throws RatHeaderAnalysisException {
     public void generatedFileDetectionTest() throws Exception {
         final Document subject = new TestingDocument(new StringReader("Generated from configure.ac by autoheader"), "subject");
         IHeaderMatcher matcher = new AnyBuilder().setResource("/org/apache/rat/generation-keywords.txt").build();
-        HeaderCheckWorker worker = new HeaderCheckWorker(matcher, subject.reader(), Collections.emptyList(), subject);
+        HeaderCheckWorker worker = new HeaderCheckWorker(matcher, subject.reader(), asLicenses(), subject);
         worker.read();
         assertThat(subject.getMetaData().getDocumentType()).isEqualTo(Document.Type.IGNORED);
     }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/commandline/ArgTests.java b/apache-rat-core/src/test/java/org/apache/rat/commandline/ArgTests.java
index 1d51a5f29..9ed0df624 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/commandline/ArgTests.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/commandline/ArgTests.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance   *
  * with the License.  You may obtain a copy of the License at   *
  *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *   https://www.apache.org/licenses/LICENSE-2.0                 *
  *                                                              *
  * Unless required by applicable law or agreed to in writing,   *
  * software distributed under the License is distributed on an  *
@@ -18,7 +18,6 @@
  */
 package org.apache.rat.commandline;
 
-import java.io.IOException;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.Options;
@@ -32,6 +31,7 @@
 import org.junit.jupiter.params.provider.ValueSource;
 
 import java.io.File;
+import java.nio.file.Path;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -45,21 +45,31 @@ private CommandLine createCommandLine(String[] args) throws ParseException {
 
     @ParameterizedTest(name = "{0}")
     @ValueSource(strings = { "rat.txt", "./rat.txt", "/rat.txt", "target/rat.test" })
-    public void outputFileNameNoDirectoryTest(String name) throws ParseException, IOException {
-        class OutputFileConfig extends ReportConfiguration  {
+    public void outputFileNameNoDirectoryTest(String name) throws ParseException {
+        class OutputFileConfig extends ReportConfiguration {
             private File actual = null;
+
             @Override
             public void setOut(File file) {
                 actual = file;
             }
         }
-        String fileName = name.replace("/", DocumentName.FSInfo.getDefault().dirSeparator());
-        File expected = new File(fileName);
 
-        CommandLine commandLine = createCommandLine(new String[] {"--output-file", fileName});
+        DocumentName.FSInfo fsInfo = DocumentName.FSInfo.getDefault();
+        String fileName = name.replace("/", fsInfo.dirSeparator());
+        File localFile = new File(".");
+        DocumentName localFileName = DocumentName.builder(localFile).build();
+        Path workingPath = localFile.getAbsoluteFile().toPath();
+        String expected = fsInfo.normalize(workingPath.resolve("./" + fileName).toString());
+
+        CommandLine commandLine = createCommandLine(new String[]{"--output-file", fileName});
         OutputFileConfig configuration = new OutputFileConfig();
-        ArgumentContext ctxt = new ArgumentContext(new File("."), configuration, commandLine);
+        ArgumentContext ctxt = new ArgumentContext(localFile, configuration, CLIOptionCollection.INSTANCE.getOptions(), new String[]{"--output-file", fileName});
         Arg.processArgs(ctxt, CLIOptionCollection.INSTANCE);
-        assertThat(configuration.actual.getAbsolutePath()).isEqualTo(expected.getCanonicalPath());
+        if (name.equals("/rat.txt")) {
+            assertThat(fsInfo.normalize(configuration.actual.getAbsolutePath())).isEqualTo(localFileName.getRoot() + "rat.txt");
+        } else {
+            assertThat(fsInfo.normalize(configuration.actual.toString())).isEqualTo(expected);
+        }
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/commandline/FileConverterTest.java b/apache-rat-core/src/test/java/org/apache/rat/commandline/FileConverterTest.java
new file mode 100644
index 000000000..34271b2db
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/commandline/FileConverterTest.java
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   https://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.commandline;
+
+import org.apache.rat.document.DocumentName;
+import org.apache.rat.document.FSInfoTest;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class FileConverterTest {
+
+    @ParameterizedTest
+    @MethodSource("applyTestData")
+    void applyTest(DocumentName.FSInfo fsInfo, String fileName, Converters.FileConverter underTest, String expected) {
+        assertThat(underTest.apply(fileName).getName()).isEqualTo(expected);
+    }
+
+    /**
+     * Record returned from createDocumentData
+     * @param documentName the document name for the working directory.
+     * @param defaultRoot the default root for the file system
+     * @param workingBaseName the working base name.
+     * @param baseName the base name.
+     */
+    private record DocumentData(DocumentName documentName, String defaultRoot, String workingBaseName, String baseName) {
+    }
+
+    /**
+     * Creats a DocumentData from a FSInfo.
+     * @param fsInfo the FSInfo to work with.
+     * @return the DocumentData for the working directory,.
+     */
+    private static DocumentData createDocumentData(final DocumentName.FSInfo fsInfo) {
+        String defaultRoot = fsInfo.roots()[0];
+        String workingBaseName = defaultRoot + "working";
+        String baseName = workingBaseName + fsInfo.dirSeparator() + "base";
+        return new DocumentData(DocumentName.builder(fsInfo).setRoot(defaultRoot).setBaseName(workingBaseName).setName("base").build(),
+                defaultRoot, workingBaseName, baseName);
+    }
+
+
+    static List<Arguments> applyTestData() {
+        List<Arguments> lst = new ArrayList<>();
+
+        for (DocumentName.FSInfo fsInfo : FSInfoTest.TEST_SUITE) {
+            final DocumentData workingDirectory = createDocumentData(fsInfo);
+            final Converters.FileConverter underTest = new Converters.FileConverter();
+            underTest.setWorkingDirectory(workingDirectory.documentName);
+
+            lst.add(Arguments.of(fsInfo, "/foo/bar.txt", underTest, workingDirectory.defaultRoot + String.join(fsInfo.dirSeparator(), "foo", "bar.txt")));
+            lst.add(Arguments.of(fsInfo, "\\foo\\bar.txt", underTest, workingDirectory.defaultRoot + String.join(fsInfo.dirSeparator(), "foo", "bar.txt")));
+
+            lst.add(Arguments.of(fsInfo, "foo/bar.txt", underTest, workingDirectory.baseName + String.join(fsInfo.dirSeparator(), "", "foo", "bar.txt")));
+            lst.add(Arguments.of(fsInfo, "foo\\bar.txt", underTest, workingDirectory.baseName + String.join(fsInfo.dirSeparator(), "", "foo", "bar.txt")));
+
+            if (fsInfo.equals(FSInfoTest.WINDOWS)) {
+                String root = fsInfo.roots()[1];
+                lst.add(Arguments.of(fsInfo, root + "foo/bar.txt", underTest, root + String.join(fsInfo.dirSeparator(), "foo", "bar.txt")));
+                lst.add(Arguments.of(fsInfo, root + "foo\\bar.txt", underTest, root + String.join(fsInfo.dirSeparator(), "foo", "bar.txt")));
+
+            }
+        }
+        return lst;
+    }
+}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/config/exclusion/ExclusionProcessorTest.java b/apache-rat-core/src/test/java/org/apache/rat/config/exclusion/ExclusionProcessorTest.java
index 85d8d9762..19e2e1542 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/config/exclusion/ExclusionProcessorTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/config/exclusion/ExclusionProcessorTest.java
@@ -30,7 +30,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -44,12 +43,10 @@
 import static org.apache.rat.document.FSInfoTest.OSX;
 import static org.apache.rat.document.FSInfoTest.UNIX;
 import static org.apache.rat.document.FSInfoTest.WINDOWS;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class ExclusionProcessorTest {
 
-    final private static DocumentNameMatcher TRUE = DocumentNameMatcher.MATCHES_ALL;
-    final private static DocumentNameMatcher FALSE = DocumentNameMatcher.MATCHES_NONE;
-
     @TempDir
     private static Path tempDir;
 
@@ -70,10 +67,12 @@ private DocumentName mkName(DocumentName baseDir, String pth) throws IOException
         String fn = result.localized(FileSystems.getDefault().getSeparator());
         File file = tempDir.resolve(fn.substring(1)).toFile();
         File parent = file.getParentFile();
-        if (parent.exists() && !parent.isDirectory()) {
-            parent.delete();
+        if (parent.exists() && !parent.isDirectory() && !parent.delete()) {
+            fail(() -> "Unable to delete parent: " + parent);
+        }
+        if (!parent.exists() && !parent.mkdirs()) {
+            fail((() -> "Unable to create parent: " + parent));
         }
-        parent.mkdirs();
         if (file.exists()) {
             if (file.isDirectory()) {
                 FileUtils.deleteDirectory(file);
@@ -81,7 +80,9 @@ private DocumentName mkName(DocumentName baseDir, String pth) throws IOException
                 FileUtils.delete(file);
             }
         }
-        file.createNewFile();
+        if (!file.createNewFile()) {
+            fail(() -> "Unable to create file: " + file);
+        }
         Mockito.when(mocked.asFile()).thenReturn(file);
         return mocked;
     }
@@ -246,34 +247,6 @@ void addExcludedPatternsTest(DocumentName basedir) throws IOException {
         assertExclusions(basedir, "**/foo/**", expectedMap);
     }
 
-    @ParameterizedTest
-    @MethodSource("getDocumentNames")
-    void orTest(DocumentName basedir) {
-        ExclusionProcessor underTest = new ExclusionProcessor();
-        assertThat(DocumentNameMatcher.or(Arrays.asList(TRUE, FALSE)).matches(basedir)).isTrue();
-        assertThat(DocumentNameMatcher.or(Arrays.asList(FALSE, TRUE)).matches(basedir)).isTrue();
-        assertThat(DocumentNameMatcher.or(Arrays.asList(TRUE, TRUE)).matches(basedir)).isTrue();
-        assertThat(DocumentNameMatcher.or(Arrays.asList(FALSE, FALSE)).matches(basedir)).isFalse();
-    }
-
-    @ParameterizedTest
-    @MethodSource("getDocumentNames")
-    void andTest(DocumentName basedir) {
-        ExclusionProcessor underTest = new ExclusionProcessor();
-        assertThat(DocumentNameMatcher.and(TRUE, FALSE).matches(basedir)).isFalse();
-        assertThat(DocumentNameMatcher.and(FALSE, TRUE).matches(basedir)).isFalse();
-        assertThat(DocumentNameMatcher.and(TRUE, TRUE).matches(basedir)).isTrue();
-        assertThat(DocumentNameMatcher.and(FALSE, FALSE).matches(basedir)).isFalse();
-    }
-
-    @ParameterizedTest
-    @MethodSource("getDocumentNames")
-    void notTest(DocumentName basedir) {
-        ExclusionProcessor underTest = new ExclusionProcessor();
-        assertThat(DocumentNameMatcher.not(TRUE).matches(basedir)).isFalse();
-        assertThat(DocumentNameMatcher.not(FALSE).matches(basedir)).isTrue();
-    }
-
     private static Stream<Arguments> getDocumentNames() {
         List<Arguments> lst = new ArrayList<>();
 
diff --git a/apache-rat-core/src/test/java/org/apache/rat/configuration/XMLConfigurationReaderTest.java b/apache-rat-core/src/test/java/org/apache/rat/configuration/XMLConfigurationReaderTest.java
index f0779b31f..5d2caa1ed 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/configuration/XMLConfigurationReaderTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/configuration/XMLConfigurationReaderTest.java
@@ -52,6 +52,10 @@ public class XMLConfigurationReaderTest {
     public static final String[] EXPECTED_LICENSES = {"AL1.0", "AL1.1", "AL2.0", "BSD-3", "DOJO", "TMF", "CDDL1", "ILLUMOS", "GPL1", "GPL2",
             "GPL3", "MIT", "OASIS", "W3C", "W3CD"};
 
+    public static final String[] APPROVED_LICENSES = { "AL1.0", "AL1.1", "AL2.0", "BSD-3", "DOJO", "TMF", "CDDL1", "ILLUMOS",
+            "MIT", "OASIS", "W3C", "W3CD" };
+
+
     @Test
     void approvedLicenseIdTest() throws URISyntaxException {
         XMLConfigurationReader reader = new XMLConfigurationReader();
@@ -59,13 +63,12 @@ void approvedLicenseIdTest() throws URISyntaxException {
         assertThat(url).isNotNull();
         reader.read(url.toURI());
 
-        Collection<String> readCategories = reader.approvedLicenseId();
-        assertThat(readCategories.toArray(new String[readCategories.size()]))
-                .containsExactly(APPROVED_IDS);
+        Collection<String> actual = reader.approvedLicenseId();
+        assertThat(actual).containsExactlyInAnyOrder(APPROVED_IDS);
     }
 
     @Test
-    void LicensesTest() throws URISyntaxException {
+    public void LicensesTest() throws URISyntaxException {
         XMLConfigurationReader reader = new XMLConfigurationReader();
         URL url = XMLConfigurationReaderTest.class.getResource("/org/apache/rat/default.xml");
         reader.read(url.toURI());
@@ -77,10 +80,12 @@ void LicensesTest() throws URISyntaxException {
     void LicenseFamiliesTest() throws URISyntaxException {
         XMLConfigurationReader reader = new XMLConfigurationReader();
         URL url = XMLConfigurationReaderTest.class.getResource("/org/apache/rat/default.xml");
+        assertThat(url).isNotNull();
         reader.read(url.toURI());
 
-        assertThat(reader.readFamilies().stream().map(x -> x.getFamilyCategory().trim()).toArray(String[]::new))
-                .containsExactly(EXPECTED_IDS);
+        Collection<String> actual = reader.readFamilies().stream().map(lf -> lf.getFamilyCategory().trim())
+                .toList();
+        assertThat(actual).containsExactlyInAnyOrder(EXPECTED_IDS);
     }
 
     private void checkMatcher(String name, Class<? extends AbstractBuilder> clazz) {
diff --git a/apache-rat-core/src/test/java/org/apache/rat/document/DocumentNameBuilderTest.java b/apache-rat-core/src/test/java/org/apache/rat/document/DocumentNameBuilderTest.java
index 0e0f0d1f7..08f0b0f5b 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/document/DocumentNameBuilderTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/document/DocumentNameBuilderTest.java
@@ -19,23 +19,40 @@
 package org.apache.rat.document;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Stream;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.FieldSource;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.apache.rat.document.FSInfoTest.WINDOWS;
 
+/**
+ * Tests the DcoumentName.Builder class
+ */
 public class DocumentNameBuilderTest {
 
-    @ParameterizedTest(name="{0}")
-    @MethodSource("buildTestData")
-    void buildTest(String testName, DocumentName documentName, String name, String shortName, String baseName, String root,
+    private static final DocumentName.FSInfo[] TEST_SUITE = FSInfoTest.TEST_SUITE;
+
+    /**
+     * Validates the data in a document name matches expected data.
+     * @param documentName the document name to check
+     * @param name the expected fully qualified name.
+     * @param shortName the name for the last segment of the name.
+     * @param baseName the name of the base document.
+     * @param root the root the document is in.
+     * @param directorySeparator the expected directory separator.
+     * @param isCaseSensitive the expected case sensitivity.
+     * @param localized the default localized name (e.g. path and file name from base name).
+     * @param localizedArg the localized name with directory separator set to '+'
+     */
+    void assertDocumentName(DocumentName documentName, String name, String shortName, String baseName, String root,
                    String directorySeparator, Boolean isCaseSensitive, String localized, String localizedArg) {
         assertThat(documentName.getName()).as("Invalid name").isEqualTo(name);
         assertThat(documentName.getShortName()).as("Invalid short name").isEqualTo(shortName);
@@ -48,120 +65,192 @@ void buildTest(String testName, DocumentName documentName, String name, String s
             assertThat(documentName.isCaseSensitive()).as("Invalid case sensitivity").isFalse();
         }
         assertThat(documentName.localized()).as("Invalid localized ").isEqualTo(localized);
-        final String sep = documentName.getDirectorySeparator().equals("/") ? "\\" : "/";
-        assertThat(documentName.localized(sep)).as(() -> String.format("Invalid localized('%s')", sep)).isEqualTo(localizedArg);
+        assertThat(documentName.localized("+")).as("Invalid localized('+')").isEqualTo(localizedArg);
     }
 
-    static Stream<Arguments> buildTestData() {
-        List<Arguments> lst = new ArrayList<>();
-
-            //
-            String testName = "windows\\foo direct";
-            DocumentName documentName = DocumentName.builder(WINDOWS).setName("C:\\windows\\foo").setBaseName("C:\\windows").build();
-            lst.add(Arguments.of( testName, documentName, "C:\\windows\\foo", "foo", "C:\\windows", "C:", "\\", false,
-                    "\\foo", "/foo"));
-            DocumentName baseName = documentName;
-
-            //
-            testName = "builder(docName)";
-            documentName = DocumentName.builder(baseName).build();
-            lst.add(Arguments.of( testName, documentName, "C:\\windows\\foo", "foo", "C:\\windows", "C:", "\\", false,
-                    "\\foo", "/foo"));
-
-            //
-            testName = "windows\\foo\\bar by resolve";
-            documentName = baseName.resolve("bar");
-            lst.add(Arguments.of(testName, documentName, "C:\\windows\\foo\\bar", "bar", "C:\\windows", "C:", "\\", false,
-                    "\\foo\\bar", "/foo/bar"));
-
-            //
-            testName = "windows\\foo\\direct by basename";
-            documentName = DocumentName.builder(baseName).setName("windows\\foo\\direct").build();
-            lst.add(Arguments.of(testName, documentName, "C:\\windows\\foo\\direct", "direct", "C:\\windows", "C:", "\\", false,
-                    "\\foo\\direct", "/foo/direct"));
-
-            //
-            testName = "windows\\foo\\bar by file";
-            File file = mock(File.class);
-            File parent = mock(File.class);
-            when(file.getAbsolutePath()).thenReturn("C:\\windows\\foo\\bar");
-            when(file.getParentFile()).thenReturn(parent);
-            when(file.isDirectory()).thenReturn(false);
-            when(parent.getAbsolutePath()).thenReturn("C:\\windows\\foo");
-            when(parent.isDirectory()).thenReturn(true);
-            documentName = new DocumentName.Builder(WINDOWS, file).build();
-            lst.add(Arguments.of(testName, documentName, "C:\\windows\\foo\\bar", "bar", "C:\\windows\\foo", "C:", "\\", false,
-                    "\\bar", "/bar"));
-
-        //
-        testName = "windows\\foo\\bar by directory";
-        file = mock(File.class);
-        parent = mock(File.class);
-        when(file.getAbsolutePath()).thenReturn("C:\\windows\\foo\\bar");
-        when(file.getParentFile()).thenReturn(parent);
-        when(file.isDirectory()).thenReturn(true);
-        when(parent.getAbsolutePath()).thenReturn("C:\\windows\\foo");
-        when(parent.isDirectory()).thenReturn(true);
-        documentName = new DocumentName.Builder(WINDOWS, file).build();
-        lst.add(Arguments.of(testName, documentName, "C:\\windows\\foo\\bar", "bar", "C:\\windows\\foo\\bar", "C:", "\\", false,
-                "\\", "/"));
-
-            //
-            testName = "windows setRoot";
-            documentName = DocumentName.builder(baseName).setRoot("D:").build();
-            lst.add(Arguments.of(testName, documentName, "D:\\windows\\foo", "foo", "C:\\windows", "D:", "\\", false,
-                    "D:\\windows\\foo", "D:/windows/foo"));
-
-            testName = "windows setRoot(null)";
-            documentName = DocumentName.builder(baseName).setRoot(null).build();
-            lst.add(Arguments.of(testName, documentName, "\\windows\\foo", "foo", "C:\\windows", "", "\\", false,
-                    "\\windows\\foo", "/windows/foo"));
-
-            testName = "windows setRoot('')";
-            documentName = DocumentName.builder(baseName).setRoot("").build();
-            lst.add(Arguments.of(testName, documentName, "\\windows\\foo", "foo", "C:\\windows", "", "\\", false,
-                    "\\windows\\foo", "/windows/foo"));
-
-            //
-            testName = "windows setName('baz')";
-            documentName = DocumentName.builder(baseName).setName("baz").build();
-            lst.add(Arguments.of(testName, documentName, "C:\\windows\\baz", "baz", "C:\\windows", "C:", "\\", false,
-                    "\\baz", "/baz"));
-
-            testName = "windows setName((String)null)";
-            documentName = DocumentName.builder(baseName).setName((String)null).build();
-            lst.add(Arguments.of(testName, documentName, "C:\\windows", "windows", "C:\\windows", "C:", "\\", false,
-                    "\\", "/"));
-
-            testName = "windows setName('')";
-            documentName = DocumentName.builder(baseName).setName("").build();
-            lst.add(Arguments.of(testName, documentName, "C:\\windows", "windows", "C:\\windows", "C:", "\\", false,
-                    "\\", "/"));
-
-        file = mock(File.class);
-        parent = mock(File.class);
-        when(file.getAbsolutePath()).thenReturn("C:\\windows\\foo\\bar");
+    /**
+     * Verifies tha the baseName is not modified when used in the builder.
+     * Base name is default root + OS name.  For example C:\windows, or /unix
+     * @param fsInfo the file system info for the test.
+     */
+    @ParameterizedTest
+    @FieldSource("TEST_SUITE")
+    void baseNamePreserved(DocumentName.FSInfo fsInfo) {
+        final String root = fsInfo.roots()[0];
+        final String baseNameStr = root + fsInfo;
+        // create a document {os name}/bar.  Used to establish basename in builder.
+        final DocumentName siblingName = DocumentName.builder(fsInfo).setName("bar").setBaseName(fsInfo.toString()).build();
+
+        // check a relative name does not change base name.
+        String nameStr = fsInfo.mkPath("foo", "baz");
+        DocumentName documentName = DocumentName.builder(siblingName).setName(nameStr).build();
+        String expected = root + fsInfo.mkPath(fsInfo.toString(), "foo", "baz");
+        assertThat(documentName.getName()).as("relative value").isEqualTo(expected);
+        assertDocumentName(documentName, expected, "baz", baseNameStr, root, fsInfo.dirSeparator(), fsInfo.isCaseSensitive(),
+                fsInfo.dirSeparator() + nameStr, "+foo+baz");
+
+        // check a FQName results in the base name not being changed.
+        documentName = DocumentName.builder(siblingName).setName(expected).build();
+        assertThat(documentName.getName()).as("absolute value").isEqualTo(expected);
+        assertDocumentName(documentName, expected, "baz", baseNameStr, root, fsInfo.dirSeparator(), fsInfo.isCaseSensitive(),
+                fsInfo.dirSeparator() + nameStr, "+foo+baz");
+
+    }
+
+    @ParameterizedTest
+    @FieldSource("TEST_SUITE")
+    void documentNameFromFQNameWithBaseName(DocumentName.FSInfo fsInfo) {
+        final String root = fsInfo.roots()[0];
+        final String baseNameStr = root + fsInfo;
+        String fqName = root + fsInfo.mkPath(fsInfo.toString(), "foo");
+        DocumentName documentName = DocumentName.builder(fsInfo).setName(fqName).setBaseName(baseNameStr).build();
+        assertDocumentName(documentName, fqName, "foo", baseNameStr, root, fsInfo.dirSeparator(), fsInfo.isCaseSensitive(),
+                fsInfo.dirSeparator() + "foo", "+foo");
+    }
+
+    @ParameterizedTest
+    @FieldSource("TEST_SUITE")
+    void noBaseNameThowsException(DocumentName.FSInfo fsInfo) {
+        final String root = fsInfo.roots()[0];
+        String fqName = root + fsInfo.mkPath(fsInfo.toString(), "foo");
+        DocumentName.Builder underTest = DocumentName.builder(fsInfo).setName(fqName);
+        assertThatThrownBy(underTest::build)
+                .isInstanceOf(NullPointerException.class)
+                .hasMessage("Basename must not be null");
+    }
+
+    @ParameterizedTest
+    @FieldSource("TEST_SUITE")
+    void noNameThowsException(DocumentName.FSInfo fsInfo) {
+        final String root = fsInfo.roots()[0];
+        String fqName = root + fsInfo.mkPath(fsInfo.toString(), "foo");
+        DocumentName.Builder underTest = DocumentName.builder(fsInfo).setBaseName(fqName);
+        assertThatThrownBy(underTest::build)
+                .isInstanceOf(NullPointerException.class)
+                .hasMessage("Name must not be null");
+    }
+
+    @Test
+    void DocumentNameFromFileSystem() {
+        FileSystem fileSystem = FileSystems.getDefault();
+        String expectedRoot = fileSystem.getRootDirectories().iterator().next().toString();
+        DocumentName documentName = DocumentName.builder(fileSystem).setBaseName("")
+                .setName("theName.txt").build();
+        assertThat(documentName.getRoot()).isEqualTo(expectedRoot);
+        assertThat(documentName.getName()).isEqualTo(expectedRoot + "theName.txt");
+    }
+
+    @ParameterizedTest
+    @FieldSource("TEST_SUITE")
+    void DocumentNameFromDocumentName(DocumentName.FSInfo fsInfo) {
+        final String root = fsInfo.roots()[0];
+        final String baseNameStr = root + fsInfo;
+        String fqName = root + fsInfo.mkPath(fsInfo.toString(), "foo");
+        DocumentName expected = DocumentName.builder(fsInfo).setName(fqName).setBaseName(baseNameStr).build();
+
+        DocumentName actual = DocumentName.builder(expected).build();
+        assertThat(actual).isEqualTo(expected);
+
+        assertDocumentName(actual, fqName, "foo", baseNameStr, root, fsInfo.dirSeparator(), fsInfo.isCaseSensitive(),
+                fsInfo.dirSeparator() + "foo", "+foo");
+
+    }
+
+    @ParameterizedTest
+    @FieldSource("TEST_SUITE")
+    void builderOnDocumentNameWithNameSharesBaseName(DocumentName.FSInfo fsInfo) {
+        final String root = fsInfo.roots()[0];
+        final String baseNameStr = root + fsInfo;
+
+        String fqName = root + fsInfo.mkPath(fsInfo.toString(), "foo");
+        DocumentName firstName = DocumentName.builder(fsInfo).setName(fqName).setBaseName(baseNameStr).build();
+
+        fqName = root + fsInfo.mkPath(fsInfo.toString(), "bar");
+        DocumentName actual = DocumentName.builder(firstName).setName(fqName).setBaseName(baseNameStr).build();
+
+        assertDocumentName(actual, fqName, "bar", baseNameStr, root, fsInfo.dirSeparator(), fsInfo.isCaseSensitive(),
+                fsInfo.dirSeparator() + "bar", "+bar");
+    }
+
+    @ParameterizedTest
+    @FieldSource("TEST_SUITE")
+    void builderOnFile(DocumentName.FSInfo fsInfo) {
+        String root = fsInfo.roots()[0];
+        final String baseNameStr = root + fsInfo.mkPath(fsInfo.toString(), "foo");
+        final String fqName = root + fsInfo.mkPath(fsInfo.toString(), "foo", "bar");
+        File file = mock(File.class);
+        File parent = mock(File.class);
+        when(file.getAbsolutePath()).thenReturn(fqName);
         when(file.getParentFile()).thenReturn(parent);
         when(file.isDirectory()).thenReturn(false);
-        when(parent.getAbsolutePath()).thenReturn("C:\\windows\\foo");
+        when(parent.getAbsolutePath()).thenReturn(baseNameStr);
         when(parent.isDirectory()).thenReturn(true);
-            testName = "windows setName(file)";
-            documentName = DocumentName.builder(baseName).setName(file).build();
-            lst.add(Arguments.of(testName, documentName, "C:\\windows\\foo\\bar", "bar", "C:\\windows\\foo", "C:", "\\", false,
-                    "\\bar", "/bar"));
-
-        file = mock(File.class);
-        parent = mock(File.class);
-        when(file.getAbsolutePath()).thenReturn("C:\\windows\\foo\\bar");
-        when(file.getParentFile()).thenReturn(parent);
-        when(file.isDirectory()).thenReturn(true);
-        when(parent.getAbsolutePath()).thenReturn("C:\\windows\\foo");
-        when(parent.isDirectory()).thenReturn(true);
-        testName = "windows setName(directory)";
-        documentName = DocumentName.builder(baseName).setName(file).build();
-        lst.add(Arguments.of(testName, documentName, "C:\\windows\\foo\\bar", "bar", "C:\\windows\\foo\\bar", "C:", "\\", false,
-                "\\", "/"));
 
-        return lst.stream();
+        DocumentName actual = new DocumentName.Builder(fsInfo, file).build();
+
+        assertDocumentName(actual, fqName, "bar", baseNameStr, root, fsInfo.dirSeparator(), fsInfo.isCaseSensitive(),
+                fsInfo.dirSeparator() + "bar", "+bar");
+    }
+
+    @Test
+    void windowRootDifference() {
+        // verify that setting the root results in the entire DocumentName being re-rooted e.g. including the basename(s).
+        DocumentName.FSInfo fsInfo = WINDOWS;
+        String root = fsInfo.roots()[0];
+        String baseNameStr = root + fsInfo.mkPath(fsInfo.toString(), "foo");
+        String fqName = root + fsInfo.mkPath(fsInfo.toString(), "foo", "bar");
+        DocumentName firstName = DocumentName.builder(fsInfo).setName(fqName).setBaseName(baseNameStr).build();
+
+        root = fsInfo.roots()[1];
+        DocumentName actual = DocumentName.builder(firstName).setRoot(root).build();
+
+        baseNameStr = root + fsInfo.mkPath(fsInfo.toString(), "foo");
+        fqName = root + fsInfo.mkPath(fsInfo.toString(), "foo", "bar");
+
+        assertDocumentName(actual, fqName, "bar", baseNameStr, root, fsInfo.dirSeparator(), fsInfo.isCaseSensitive(),
+                fsInfo.dirSeparator() + "bar", "+bar");
+
+    }
+
+    @ParameterizedTest
+    @FieldSource("TEST_SUITE")
+    void setRootNull(DocumentName.FSInfo fsInfo) {
+        for (String root : fsInfo.roots()) {
+            String baseNameStr = root + fsInfo.mkPath(fsInfo.toString(), "foo");
+            String fqName = root + fsInfo.mkPath(fsInfo.toString(), "foo", "bar");
+            DocumentName firstName = DocumentName.builder(fsInfo).setName(fqName).setBaseName(baseNameStr).build();
+
+            // verify setting the root to null results in relative names with a blank root set
+            DocumentName actual = DocumentName.builder(firstName).setRoot(null).build();
+
+            assertDocumentName(actual, fqName, "bar", baseNameStr, root, fsInfo.dirSeparator(), fsInfo.isCaseSensitive(),
+                    fsInfo.dirSeparator() + "bar", "+bar");
+        }
+    }
+
+    @ParameterizedTest
+    @FieldSource("TEST_SUITE")
+    void setRootEmpty(DocumentName.FSInfo fsInfo) {
+        for (String baseRoot : fsInfo.roots()) {
+            String baseNameStr = baseRoot + fsInfo.mkPath(fsInfo.toString(), "foo");
+            String fqName = baseRoot + fsInfo.mkPath(fsInfo.toString(), "foo", "bar");
+            DocumentName firstName = DocumentName.builder(fsInfo).setName(fqName).setBaseName(baseNameStr).build();
+
+            DocumentName actual = DocumentName.builder(firstName).setRoot("").build();
+
+            assertDocumentName(actual, fqName, "bar", baseNameStr, baseRoot, fsInfo.dirSeparator(), fsInfo.isCaseSensitive(),
+                    fsInfo.dirSeparator() + "bar", "+bar");
+        }
+    }
+
+    @ParameterizedTest
+    @FieldSource("TEST_SUITE")
+    void splitRootsTest(DocumentName.FSInfo fsInfo) {
+        for (String root : fsInfo.roots()) {
+            String path = fsInfo.mkPath("My", "path", "to", "a", "file.txt");
+            Pair<String, String> result = DocumentName.builder(fsInfo).splitRoot(root + path);
+            assertThat(result.getLeft()).isEqualTo(root);
+            assertThat(result.getRight()).isEqualTo(path);
+        }
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/document/DocumentNameMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/document/DocumentNameMatcherTest.java
index c53fb23db..c5c616bb2 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/document/DocumentNameMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/document/DocumentNameMatcherTest.java
@@ -18,21 +18,22 @@
  */
 package org.apache.rat.document;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.function.Predicate;
 import org.apache.commons.io.filefilter.NameFileFilter;
 import org.apache.rat.config.exclusion.plexus.MatchPatterns;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.apache.rat.document.DocumentNameMatcher.MATCHES_ALL;
 import static org.apache.rat.document.DocumentNameMatcher.MATCHES_NONE;
 
 public class DocumentNameMatcherTest {
-
     private final static DocumentNameMatcher TRUE = new DocumentNameMatcher("T", (Predicate<DocumentName>)name -> true);
     private final static DocumentNameMatcher FALSE = new DocumentNameMatcher("F", (Predicate<DocumentName>)name -> false);
     private final static DocumentNameMatcher SOME = new DocumentNameMatcher("X", (Predicate<DocumentName>)name -> false);
-    private final static DocumentName testName = DocumentName.builder().setName("testName").setBaseName("/").build();
 
     public static String processDecompose(DocumentNameMatcher matcher, DocumentName candidate) {
         StringBuilder sb = new StringBuilder();
@@ -40,24 +41,35 @@ public static String processDecompose(DocumentNameMatcher matcher, DocumentName
         return sb.toString();
     }
 
-    @Test
-    public void orTest() {
+    private static List<DocumentName> testDocuments() {
+        List<DocumentName> args = new ArrayList<>();
+        for (DocumentName.FSInfo fsInfo : FSInfoTest.TEST_SUITE) {
+            args.add(DocumentName.builder(fsInfo).setName("testName").setBaseName("/").build());
+        }
+        return args;
+    }
+
+    @ParameterizedTest
+    @MethodSource("testDocuments")
+    void orTest(DocumentName testName) {
         assertThat(DocumentNameMatcher.or(TRUE, FALSE).matches(testName)).as("T,F").isTrue();
         assertThat(DocumentNameMatcher.or(FALSE, TRUE).matches(testName)).as("F,T").isTrue();
         assertThat(DocumentNameMatcher.or(TRUE, TRUE).matches(testName)).as("T,T").isTrue();
         assertThat(DocumentNameMatcher.or(FALSE, FALSE).matches(testName)).as("F,F").isFalse();
     }
 
-    @Test
-    public void andTest() {
+    @ParameterizedTest
+    @MethodSource("testDocuments")
+    void andTest(DocumentName testName) {
         assertThat(DocumentNameMatcher.and(TRUE, FALSE).matches(testName)).as("T,F").isFalse();
         assertThat(DocumentNameMatcher.and(FALSE, TRUE).matches(testName)).as("F,T").isFalse();
         assertThat(DocumentNameMatcher.and(TRUE, TRUE).matches(testName)).as("T,T").isTrue();
         assertThat(DocumentNameMatcher.and(FALSE, FALSE).matches(testName)).as("F,F").isFalse();
     }
 
-    @Test
-    public void matcherSetTest() {
+    @ParameterizedTest
+    @MethodSource("testDocuments")
+    void matcherSetTest(DocumentName testName) {
         assertThat(DocumentNameMatcher.matcherSet(TRUE, FALSE).matches(testName)).as("T,F").isTrue();
         assertThat(DocumentNameMatcher.matcherSet(FALSE, TRUE).matches(testName)).as("F,T").isFalse();
         assertThat(DocumentNameMatcher.matcherSet(TRUE, TRUE).matches(testName)).as("T,T").isTrue();
@@ -76,8 +88,9 @@ public void matcherSetTest() {
         assertThat(DocumentNameMatcher.matcherSet(SOME, SOME).toString()).as("X,X").isEqualTo("matcherSet(X, X)");
     }
 
-    @Test
-    void testDecompose() {
+    @ParameterizedTest
+    @MethodSource("testDocuments")
+    void testDecompose(DocumentName testName) {
         DocumentNameMatcher matcher1 = new DocumentNameMatcher("FileFilterTest", new NameFileFilter("File.name"));
         String result = processDecompose(matcher1, testName);
         assertThat(result).contains("FileFilterTest: >>false<<").contains("  NameFileFilter(File.name)");
diff --git a/apache-rat-core/src/test/java/org/apache/rat/document/DocumentNameTest.java b/apache-rat-core/src/test/java/org/apache/rat/document/DocumentNameTest.java
index beeeeca94..5abac9625 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/document/DocumentNameTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/document/DocumentNameTest.java
@@ -18,79 +18,79 @@
  */
 package org.apache.rat.document;
 
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileFilter;
+import java.io.FileReader;
+import java.io.FileWriter;
 import java.io.FilenameFilter;
 import java.io.IOException;
-import java.nio.file.FileSystems;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import java.util.stream.Stream;
 
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.tuple.Pair;
 import org.apache.rat.config.exclusion.ExclusionUtils;
 import org.apache.rat.document.DocumentName.FSInfo;
 
-import org.assertj.core.util.Files;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.FieldSource;
 import org.junit.jupiter.params.provider.MethodSource;
-import org.mockito.Mockito;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.apache.rat.document.FSInfoTest.OSX;
-import static org.apache.rat.document.FSInfoTest.UNIX;
-import static org.apache.rat.document.FSInfoTest.WINDOWS;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.mockito.ArgumentMatchers.any;
 
 public class DocumentNameTest {
-
-    public static DocumentName mkName(Path tempDir, FSInfo fsInfo) {
-        File docFile = mkFile(tempDir.toFile(), fsInfo);
-        DocumentName result = DocumentName.builder(fsInfo).setName(docFile).build();
-        DocumentName mocked = Mockito.spy(result);
-
-        String fn = result.localized(FileSystems.getDefault().getSeparator());
-        File file = tempDir.resolve(fn.substring(1)).toFile();
-        File mockedFile = mkFile(file, fsInfo);
-        when(mocked.asFile()).thenReturn(mockedFile);
-
-        assertThat(mocked.asFile()).isEqualTo(mockedFile);
-        return mocked;
-    }
-
-    private static File[] listFiles(File file, FSInfo fsInfo) {
-        File[] fileList = file.listFiles();
-        if (fileList == null) {
-            return fileList;
-        }
-        return Arrays.stream(fileList).map(f -> mkFile(f, fsInfo)).toArray(File[]::new);
+    private static final FSInfo[] TEST_SUITE = FSInfoTest.TEST_SUITE;
+
+    /**
+     * Create a list of mocked files from the specified directory.
+     * @param directory the native directory to read.
+     * @param fsInfo the file system to mock the files in.
+     * @return an array of mocked files in the file system.
+     */
+    private static File[] listFiles(File directory, FSInfo fsInfo) {
+        File[] fileList = directory.listFiles();
+        return fileList == null ? null : Arrays.stream(fileList).map(f -> mkFile(f, fsInfo)).toArray(File[]::new);
     }
 
-    private static File[] listFiles(File file, FSInfo fsInfo, FileFilter filter) {
-        File[] fileList = file.listFiles();
-        if (fileList == null) {
-            return fileList;
-        }
-        return Arrays.stream(fileList).map(f -> mkFile(f, fsInfo)).filter(filter::accept).toArray(File[]::new);
+    /**
+     * Create an array of mocked files from the specified directory then apply applying a file filter.
+     * @param directory the native directory to read files from.
+     * @param fsInfo the file system to create the mocked files in.
+     * @param filter the filter to apply to the mocked files.
+     * @return the array of mocked files that pass the filter.
+     */
+    private static File[] listFiles(File directory, FSInfo fsInfo, FileFilter filter) {
+        File[] fileList = directory.listFiles();
+        return fileList == null ? null : Arrays.stream(fileList).map(f -> mkFile(f, fsInfo)).filter(filter::accept).toArray(File[]::new);
     }
 
-    private static File[] listFiles(File file, FSInfo fsInfo, FilenameFilter filter) {
-        File[] fileList = file.listFiles();
-        if (fileList == null) {
-            return fileList;
-        }
-        return Arrays.stream(fileList).map(f -> mkFile(f, fsInfo)).filter(x -> filter.accept(x, x.getName())).toArray(File[]::new);
+    /**
+     * Create an array of mocked files from the specified directory then apply applying a file filter.
+     * @param directory the native directory to read files from.
+     * @param fsInfo the file system to create the mocked files in.
+     * @param filter the filter to apply to the mocked files.
+     * @return the array of mocked files that pass the filter.
+     */
+    private static File[] listFiles(File directory, FSInfo fsInfo, FilenameFilter filter) {
+        File[] fileList = directory.listFiles();
+        return fileList == null ? null : Arrays.stream(fileList).map(f -> mkFile(f, fsInfo)).filter(x -> filter.accept(x, x.getName())).toArray(File[]::new);
     }
 
+    /**
+     * Creates a mocked file on the specified file system with the
+     * @param file the name of the native file.
+     * @param fsInfo the file system to mock the file in.
+     * @return the mocked file in the specified file system
+     */
     public static File mkFile(final File file, final FSInfo fsInfo) {
         File mockedFile = mock(File.class);
         when(mockedFile.listFiles()).thenAnswer( env -> listFiles(file, fsInfo));
@@ -105,222 +105,199 @@ public static File mkFile(final File file, final FSInfo fsInfo) {
         return mockedFile;
     }
 
-    public static DocumentName mkName(Path tempDir, DocumentName baseDir, String pth) throws IOException {
-        DocumentName result = baseDir.resolve(ExclusionUtils.convertSeparator(pth, "/", baseDir.getDirectorySeparator()));
-        DocumentName mocked = Mockito.spy(result);
-
-        String fn = result.localized(FileSystems.getDefault().getSeparator());
-        File file = tempDir.resolve(fn.substring(1)).toFile();
-        File parent = file.getParentFile();
-        if (parent.exists() && !parent.isDirectory()) {
-            parent.delete();
-        }
-        parent.mkdirs();
-        if (file.exists()) {
-            if (file.isDirectory()) {
-                FileUtils.deleteDirectory(file);
-            } else {
-                FileUtils.delete(file);
-            }
-        }
-        file.createNewFile();
-        when(mocked.asFile()).thenReturn(file);
-        return mocked;
-    }
-
-    @ParameterizedTest(name = "{index} {0} {2}")
+    /**
+     * Verifies that {@code resolve()} works correctly.
+     * @param fsInfo the file system under test.
+     * @param base the DocumentName to resolve from.
+     * @param toResolve the string to resolve.
+     * @param expected the expected DocumentName after resolution.
+     */
+    @ParameterizedTest(name = "{index} {0} {1} {3}")
     @MethodSource("resolveTestData")
-    void resolveTest(String testName, DocumentName base, String toResolve, DocumentName expected) {
+    void resolveTest(DocumentName.FSInfo fsInfo, String root, DocumentName base, String toResolve, DocumentName expected) {
        DocumentName actual = base.resolve(toResolve);
-       assertThat(actual).isEqualTo(expected);
+       assertThat(actual.getName()).isEqualTo(expected.getName());
     }
 
     private static Stream<Arguments> resolveTestData() {
         List<Arguments> lst = new ArrayList<>();
+        DocumentName base;
+        DocumentName expected;
+        for (DocumentName.FSInfo fsInfo : TEST_SUITE) {
+            String root = fsInfo.roots()[0];
+            for (String baseName : List.of(root, root + fsInfo.mkPath("from", "base"))) {
+                for (String testRoot : fsInfo.roots()) {
+                    String name = testRoot + fsInfo.mkPath("", "dir", fsInfo.toString());
+                    base = DocumentName.builder(fsInfo).setName(name).setBaseName(baseName).build();
+                    lst.add(Arguments.of(fsInfo, base.getName(),  base, null, base));
 
-        DocumentName base = DocumentName.builder(UNIX).setName("/dir/unix").setBaseName("/").build();
-
-        DocumentName expected = DocumentName.builder(UNIX).setName("/dir/unix/relative").setBaseName("/").build();
-        lst.add(Arguments.of("unix", base, "relative", expected));
+                    lst.add(Arguments.of(fsInfo, base.getName(), base, "", base));
 
-        expected = DocumentName.builder(UNIX).setName("/from/root").setBaseName("/").build();
-        lst.add(Arguments.of("unix", base, "/from/root", expected));
+                    lst.add(Arguments.of(fsInfo, base.getName(), base, "  ", base));
 
-        expected = DocumentName.builder(UNIX).setName("dir/up/and/down").setBaseName("/").build();
-        lst.add(Arguments.of("unix", base, "../up/and/down", expected));
+                    expected = DocumentName.builder(fsInfo).setName(fsInfo.mkPath(name, "relative")).setBaseName(baseName).build();
+                    lst.add(Arguments.of(fsInfo, base.getName(), base, "relative", expected));
 
-        expected = DocumentName.builder(UNIX).setName("/from/root").setBaseName("/").build();
-        lst.add(Arguments.of("unix", base, "\\from\\root", expected));
+                    expected = DocumentName.builder(fsInfo).setRoot(testRoot).setName(fsInfo.mkPath("", "from", "root")).setBaseName(baseName).build();
+                    lst.add(Arguments.of(fsInfo, base.getName(), base, fsInfo.mkPath("", "from", "root"), expected));
 
-        expected = DocumentName.builder(UNIX).setName("dir/up/and/down").setBaseName("/").build();
-        lst.add(Arguments.of("unix", base, "..\\up\\and\\down", expected));
+                    expected = DocumentName.builder(fsInfo).setRoot(testRoot).setName(fsInfo.mkPath("dir", "up", "and", "down")).setBaseName(baseName).build();
+                    lst.add(Arguments.of(fsInfo, base.getName(), base, fsInfo.mkPath("..", "up", "and", "down"), expected));
 
-        // WINDOWS
-        base = DocumentName.builder(WINDOWS).setName("\\dir\\windows").setBaseName("C:\\").build();
-
-        expected = DocumentName.builder(WINDOWS).setName("\\dir\\windows\\relative").setBaseName("C:\\").build();
-        lst.add(Arguments.of("windows", base, "relative", expected));
-
-        expected = DocumentName.builder(WINDOWS).setName("\\from\\root").setBaseName("C:\\").build();
-        lst.add(Arguments.of("windows", base, "/from/root", expected));
-
-        expected = DocumentName.builder(WINDOWS).setName("dir\\up\\and\\down").setBaseName("C:\\").build();
-        lst.add(Arguments.of("windows", base, "../up/and/down", expected));
-
-        expected = DocumentName.builder(WINDOWS).setName("\\from\\root").setBaseName("C:\\").build();
-        lst.add(Arguments.of("windows", base, "\\from\\root", expected));
-
-        expected = DocumentName.builder(WINDOWS).setName("dir\\up\\and\\down").setBaseName("C:\\").build();
-        lst.add(Arguments.of("windows", base, "..\\up\\and\\down", expected));
-
-        // OSX
-        base = DocumentName.builder(OSX).setName("/dir/osx").setBaseName("/").build();
-
-        expected = DocumentName.builder(OSX).setName("/dir/osx/relative").setBaseName("/").build();
-        lst.add(Arguments.of("osx", base, "relative", expected));
-
-        expected = DocumentName.builder(OSX).setName("/from/root").setBaseName("/").build();
-        lst.add(Arguments.of("osx", base, "/from/root", expected));
-
-        expected = DocumentName.builder(OSX).setName("dir/up/and/down").setBaseName("/").build();
-        lst.add(Arguments.of("osx", base, "../up/and/down", expected));
-
-        expected = DocumentName.builder(OSX).setName("/from/root").setBaseName("/").build();
-        lst.add(Arguments.of("osx", base, "\\from\\root", expected));
-
-        expected = DocumentName.builder(OSX).setName("dir/up/and/down").setBaseName("/").build();
-        lst.add(Arguments.of("osx", base, "..\\up\\and\\down", expected));
+                    expected = DocumentName.builder(fsInfo).setRoot(testRoot).setName(fsInfo.mkPath("", "from", "root")).setBaseName(baseName).build();
+                    String wrongSeparator = fsInfo.dirSeparator().equals("/") ? "\\" : "/";
+                    lst.add(Arguments.of(fsInfo, base.getName(), base, String.join(wrongSeparator, "", "from", "root"), expected));
 
+                    expected = DocumentName.builder(fsInfo).setRoot(testRoot).setName(fsInfo.mkPath("dir", "up", "and", "down")).setBaseName(baseName).build();
+                    lst.add(Arguments.of(fsInfo, base.getName(), base, String.join(wrongSeparator, "..", "up", "and", "down"), expected));
+                }
+            }
+        }
         return lst.stream();
     }
 
     @Test
-    void localizeTest() {
-        DocumentName documentName = DocumentName.builder(UNIX).setName("/a/b/c")
-                .setBaseName("/a").build();
-        assertThat(documentName.localized()).isEqualTo("/b/c");
-        assertThat(documentName.localized("-")).isEqualTo("-b-c");
+    void resolveWithMultipleRootsTest() {
+        // these tests exist because windows has multiple roots.
+        DocumentName.FSInfo fsInfo = FSInfoTest.WINDOWS;
+        DocumentName base = DocumentName.builder(fsInfo).setName(fsInfo.mkPath("", "dir", fsInfo.toString()))
+                .setBaseName("").build();
+
+        String resolveName = fsInfo.roots()[1] + fsInfo.mkPath("dir", fsInfo.toString());
+        assertThatThrownBy(() -> base.resolve(resolveName))
+                .as(resolveName)
+                .hasMessageContaining(String.format("%s does not start with %s", resolveName, base.getName()))
+                .isInstanceOf(IllegalArgumentException.class);
+
+        String resolveName2 = fsInfo.roots()[0] + fsInfo.mkPath("dir", fsInfo.toString(), "thing");
+        assertThat(base.resolve(resolveName2).getName())
+                .isEqualTo(resolveName2);
 
-        documentName = DocumentName.builder(WINDOWS).setName("\\a\\b\\c")
-                .setBaseName("\\a").build();
-        assertThat(documentName.localized()).isEqualTo("\\b\\c");
-        assertThat(documentName.localized("-")).isEqualTo("-b-c");
+    }
 
-        documentName = DocumentName.builder(OSX).setName("/a/b/c")
-                .setBaseName("/a").build();
-        assertThat(documentName.localized()).isEqualTo("/b/c");
-        assertThat(documentName.localized("-")).isEqualTo("-b-c");
+    void testNoRootSpecified() {
+        // no root specified
+        assertThat(DocumentName.startsWithRootOrSeparator("X:/candidate", null, "/")).isFalse();
+        assertThat(DocumentName.startsWithRootOrSeparator("X:/candidate", "", "/")).isFalse();
+        assertThat(DocumentName.startsWithRootOrSeparator("X;/candidate", "  ", "/")).isFalse();
+        assertThat(DocumentName.startsWithRootOrSeparator("/candidate", null, "/")).isTrue();
+        assertThat(DocumentName.startsWithRootOrSeparator("/candidate", "", "/")).isTrue();
+        assertThat(DocumentName.startsWithRootOrSeparator("/candidate", "  ", "/")).isTrue();
+        assertThat(DocumentName.startsWithRootOrSeparator("candidate", null, "/")).isFalse();
+        assertThat(DocumentName.startsWithRootOrSeparator("candidate", "", "/")).isFalse();
+        assertThat(DocumentName.startsWithRootOrSeparator("candidate", "  ", "/")).isFalse();
     }
 
-    @ParameterizedTest(name = "{index} {0}")
-    @MethodSource("validBuilderData")
-    void validBuilderTest(String testName, DocumentName.Builder builder, String root, String name, String baseName, String dirSeparator) {
-        DocumentName underTest = builder.build();
-        assertThat(underTest.getRoot()).as(testName).isEqualTo(root);
-        assertThat(underTest.getDirectorySeparator()).as(testName).isEqualTo(dirSeparator);
-        assertThat(underTest.getName()).as(testName).isEqualTo(root + dirSeparator + name);
-        assertThat(underTest.getBaseName()).as(testName).isEqualTo(root + dirSeparator + baseName);
+    @Test
+    void startsWithRootOrSeparatorTest() {
+        assertThat(DocumentName.startsWithRootOrSeparator("X:/candidate", "X:/", "/")).isTrue();
+        assertThat(DocumentName.startsWithRootOrSeparator("X:/candidate", "Y:/", "/")).isFalse();
+        assertThat(DocumentName.startsWithRootOrSeparator("/candidate", "X:/", "/")).isTrue();
+        assertThat(DocumentName.startsWithRootOrSeparator("\\candidate", "Y:/", "/")).isFalse();
+        assertThat(DocumentName.startsWithRootOrSeparator("candidate", "Y:/", "/")).isFalse();
+        assertThat(DocumentName.startsWithRootOrSeparator("Y:candidate", "Y:/", "/")).isFalse();
+        assertThat(DocumentName.startsWithRootOrSeparator(null, "Y:/", "/")).isFalse();
+        assertThat(DocumentName.startsWithRootOrSeparator("", "Y:/", "/")).isFalse();
+        assertThat(DocumentName.startsWithRootOrSeparator("  ", "Y:/", "/")).isFalse();
+
+        testNoRootSpecified();
     }
 
-    private static Stream<Arguments> validBuilderData() {
-        List<Arguments> lst = new ArrayList<>();
-        File f = Files.newTemporaryFile();
-
-        Set<String> roots = new HashSet<>();
-        File[] rootary = File.listRoots();
-        if (rootary != null) {
-            for (File root : rootary) {
-                String name = root.getPath();
-                roots.add(name);
-            }
-        }
+    @ParameterizedTest
+    @FieldSource("TEST_SUITE")
+    void localizeTest(FSInfo fsInfo) {
+        DocumentName documentName = DocumentName.builder(fsInfo).setName(
+                fsInfo.mkPath("", "a", "b", "c"))
+                .setBaseName(fsInfo.mkPath("", "a")).build();
 
-        String name = f.getAbsolutePath();
-        String root = "";
-        for (String sysRoot : roots) {
-            if (name.startsWith(sysRoot)) {
-                name = name.substring(sysRoot.length());
-                if (sysRoot.endsWith(File.separator)) {
-                    root = sysRoot.substring(0, sysRoot.length() - File.separator.length());
-                }
-                break;
-            }
-        }
-
-        File p = f.getParentFile();
-        String baseName = p.getAbsolutePath().substring(root.length());
-        if (baseName.startsWith(File.separator)) {
-            baseName = baseName.substring(File.separator.length());
-        }
-        lst.add(Arguments.of("setName(file)", DocumentName.builder().setName(f), root, name, baseName, File.separator));
-        lst.add(Arguments.of("Builder(file)", DocumentName.builder(f), root, name, baseName, File.separator));
+        assertThat(documentName.localized()).isEqualTo(fsInfo.mkPath("", "b", "c"));
+        assertThat(documentName.localized("-")).isEqualTo("-b-c");
 
-        lst.add(Arguments.of("setName(dir)", DocumentName.builder().setName(p), root, baseName, baseName, File.separator));
-        lst.add(Arguments.of("Builder(dir)", DocumentName.builder(p), root, baseName, baseName, File.separator));
+        documentName = DocumentName.builder(fsInfo).setName(
+                        fsInfo.mkPath("", "a", "b", "c"))
+                .setBaseName(fsInfo.mkPath("", "z")).build();
 
-        File r = new File(root.isEmpty() ? File.separator : root);
-        lst.add(Arguments.of("setName(root)", DocumentName.builder().setName(r), root, "", "", File.separator));
-        lst.add(Arguments.of("Builder(root)", DocumentName.builder(r), root, "", "", File.separator));
+        assertThat(documentName.localized()).isEqualTo(fsInfo.mkPath("", "a", "b", "c"));
 
+        if (fsInfo.roots().length > 1) {
+            documentName = DocumentName.builder(fsInfo).setName(
+                            fsInfo.mkPath("", "a", "b", "c"))
+                    .setBaseName(fsInfo.mkPath("", "z"))
+                    .setRoot(fsInfo.roots()[1]).build();
+            assertThat(documentName.localized()).isEqualTo(fsInfo.mkPath("", "a", "b", "c"));
+        }
+    }
 
-        lst.add(Arguments.of("foo/bar foo", DocumentName.builder(UNIX)
-                .setName("/foo/bar").setBaseName("foo"), "", "foo/bar", "foo", "/"));
+    @Test
+    void asFileTest() throws IOException {
+        File expected = File.createTempFile("docNameTest", ".txt");
+        try (FileWriter fw = new FileWriter(expected, StandardCharsets.UTF_8)) {
+            fw.write("Hello world");
+        }
+        DocumentName underTest = DocumentName.builder(expected).build();
+        File actual = underTest.asFile();
+        try (FileReader fr = new FileReader(actual, StandardCharsets.UTF_8);
+        BufferedReader br = new BufferedReader(fr)) {
+            assertThat(br.readLine()).isEqualTo("Hello world");
+        }
+    }
 
-        DocumentName.Builder builder = DocumentName.builder(WINDOWS).setName("\\foo\\bar").setBaseName("C:\\foo")
-                .setRoot("C:");
-        lst.add(Arguments.of("\\foo\\bar foo", builder, "C:", "foo\\bar", "foo", "\\"));
+    @Test
+    void asPathTest() throws IOException {
+        File expected = File.createTempFile("docNameTest", ".txt");
+        try (FileWriter fw = new FileWriter(expected, StandardCharsets.UTF_8)) {
+            fw.write("Hello world");
+        }
+        DocumentName underTest = DocumentName.builder(expected).build();
+        Path actual = underTest.asPath();
+        Path root = Path.of(underTest.getRoot());
+        File file = root.resolve(actual).toFile();
+        try (FileReader fr = new FileReader(file, StandardCharsets.UTF_8);
+             BufferedReader br = new BufferedReader(fr)) {
+            assertThat(br.readLine()).isEqualTo("Hello world");
+        }
+    }
 
-        lst.add(Arguments.of("foo/bar foo", DocumentName.builder(OSX)
-                .setName("/foo/bar").setBaseName("foo"), "", "foo/bar", "foo", "/"));
 
-        return lst.stream();
+    @ParameterizedTest(name = "{index} {0} {1}")
+    @MethodSource("archiveEntryTestData")
+    void archiveEntryNameTest(String os, String testName, DocumentName archiveName, String root, String separator, String baseName,
+                              String localizedName) {
+        assertThat(archiveName.getRoot()).as("root").isEqualTo(root);
+        assertThat(archiveName.getDirectorySeparator()).as("separator").isEqualTo(separator);
+        assertThat(archiveName.getBaseName()).as("baseName").isEqualTo(baseName);
+        assertThat(archiveName.localized()).as("localized").isEqualTo(localizedName);
+        assertThat(archiveName.getName()).as("name").isEqualTo(baseName + localizedName);
+        if (!separator.equals(archiveName.fsInfo().dirSeparator()))
+        {
+            String newBaseName = separator.equals("/") ? baseName.replace('\\', '/') : baseName.replace('/', '\\');
+            assertThat(archiveName.localized(separator)).as("localized(x)").isEqualTo(newBaseName + localizedName);
+        }
     }
 
-    @Test
-    void splitRootsTest() {
-        Pair<String, String> result = DocumentName.builder(WINDOWS).splitRoot("C:\\My\\path\\to\\a\\file.txt");
-        assertThat(result.getLeft()).isEqualTo("C:");
-        assertThat(result.getRight()).isEqualTo("My\\path\\to\\a\\file.txt");
-
-        result = DocumentName.builder(UNIX).splitRoot("/My/path/to/a/file.txt");
-        assertThat(result.getLeft()).isEqualTo("");
-        assertThat(result.getRight()).isEqualTo("My/path/to/a/file.txt");
-
-        result = DocumentName.builder(OSX).splitRoot("/My/path/to/a/file.txt");
-        assertThat(result.getLeft()).isEqualTo("");
-        assertThat(result.getRight()).isEqualTo("My/path/to/a/file.txt");
-    }
+    static List<Arguments> archiveEntryTestData() {
+        List<Arguments> lst = new ArrayList<>();
 
-    @Test
-    void archiveEntryNameTest() {
-        String entryName = "./anArchiveEntry.txt";
-        DocumentName archiveName = DocumentName.builder(WINDOWS)
-                .setName("C:\\archives\\anArchive.zip").setBaseName("C:\\archives").build();
-
-        assertThat(archiveName.getRoot()).isEqualTo("C:");
-        assertThat(archiveName.getDirectorySeparator()).isEqualTo("\\");
-        assertThat(archiveName.getBaseName()).isEqualTo("C:\\archives");
-        assertThat(archiveName.getName()).isEqualTo("C:\\archives\\anArchive.zip");
-        assertThat(archiveName.localized()).isEqualTo("\\anArchive.zip");
-
-        ArchiveEntryName archiveEntryName = new ArchiveEntryName(archiveName, entryName);
-
-        assertThat(archiveEntryName.getRoot()).isEqualTo(archiveName.getName()+"#");
-        assertThat(archiveEntryName.getDirectorySeparator()).isEqualTo("/");
-        assertThat(archiveEntryName.getBaseName()).isEqualTo("C:\\archives\\anArchive.zip#");
-        assertThat(archiveEntryName.getName()).isEqualTo("C:\\archives\\anArchive.zip#/anArchiveEntry.txt");
-        assertThat(archiveEntryName.localized()).isEqualTo("/anArchiveEntry.txt");
-        assertThat(archiveEntryName.localized("/")).isEqualTo("/anArchive.zip#/anArchiveEntry.txt");
-
-        // test with directory
-        entryName = "./someDir/anArchiveEntry.txt";
-        archiveEntryName = new ArchiveEntryName(archiveName, entryName);
-
-        assertThat(archiveEntryName.getRoot()).isEqualTo(archiveName.getName()+"#");
-        assertThat(archiveEntryName.getDirectorySeparator()).isEqualTo("/");
-        assertThat(archiveEntryName.getBaseName()).isEqualTo("C:\\archives\\anArchive.zip#");
-        assertThat(archiveEntryName.getName()).isEqualTo("C:\\archives\\anArchive.zip#/someDir/anArchiveEntry.txt");
-        assertThat(archiveEntryName.localized()).isEqualTo("/someDir/anArchiveEntry.txt");
-        assertThat(archiveEntryName.localized("/")).isEqualTo("/anArchive.zip#/someDir/anArchiveEntry.txt");
+        for (FSInfo fsInfo :  FSInfoTest.TEST_SUITE) {
+            String os = fsInfo.toString();
+            String root = fsInfo.roots()[0];
+            String baseName = String.format(String.format("%sarchives", root));
+            String simpleName = String.format("%sanArchive.zip", fsInfo.dirSeparator());
+            String entryName = "./anArchiveEntry.txt";
+            DocumentName archiveName = DocumentName.builder(fsInfo).setName(baseName + simpleName).setBaseName(baseName).build();
+            lst.add(Arguments.of(os, "archive name", archiveName, root, fsInfo.dirSeparator(), baseName, simpleName));
+
+            ArchiveEntryName archiveEntryName = new ArchiveEntryName(archiveName, entryName);
+            baseName = archiveName.getName() + "#";
+            root = baseName + "/";
+            lst.add(Arguments.of(os, "archive entry name", archiveEntryName, root, "/", baseName, "/anArchiveEntry.txt"));
+
+            // test with directory
+            entryName = "./someDir/anArchiveEntry.txt";
+            archiveEntryName = new ArchiveEntryName(archiveName, entryName);
+
+            lst.add(Arguments.of(os, "archive entry with directory", archiveEntryName, root, "/", baseName, "/someDir/anArchiveEntry.txt"));
+        }
+        return lst;
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/document/FSInfoTest.java b/apache-rat-core/src/test/java/org/apache/rat/document/FSInfoTest.java
index ced9d8c62..e2513822e 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/document/FSInfoTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/document/FSInfoTest.java
@@ -23,9 +23,19 @@
 import java.io.IOException;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
-import java.util.Arrays;
-import java.util.stream.Stream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.FieldSource;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class FSInfoTest {
     public static final DocumentName.FSInfo DEFAULT;
@@ -36,7 +46,8 @@ public class FSInfoTest {
     static {
         try (FileSystem osx = Jimfs.newFileSystem(Configuration.osX());
              FileSystem unix = Jimfs.newFileSystem(Configuration.unix());
-             FileSystem windows = Jimfs.newFileSystem(Configuration.windows())) {
+             FileSystem windows = Jimfs.newFileSystem(Configuration.windows().toBuilder()
+                     .setRoots("C:\\", "D:\\").build())) {
             OSX = new DocumentName.FSInfo("osx", osx);
             UNIX = new DocumentName.FSInfo("unix", unix);
             WINDOWS = new DocumentName.FSInfo("windows", windows);
@@ -48,11 +59,96 @@ public class FSInfoTest {
 
     public static final DocumentName.FSInfo[] TEST_SUITE = {UNIX, WINDOWS, OSX};
 
-    /**
-     * Provides arguments for parameterized tests that only require the fsInfo.
-     * @return a stream of TEST_SUITE based Arguments.
-     */
-    public static Stream<Arguments> fsInfoArgs() {
-        return Arrays.stream(TEST_SUITE).map(Arguments::of);
+    @ParameterizedTest
+    @FieldSource("TEST_SUITE")
+    void normalizeTest(DocumentName.FSInfo info) {
+        String sep = info.dirSeparator();
+        Map<String, String> strings = new TreeMap<>();
+        strings.put("hello", "hello");
+        strings.put("hello/", "hello");
+        strings.put("/hello", sep+"hello");
+        strings.put("/hello/../goodbye", sep+"goodbye");
+        strings.put("hello/../goodbye", "goodbye");
+        strings.put("/hello/./goodbye", sep+"hello"+sep+"goodbye");
+        strings.put("hello/./goodbye", "hello"+sep+"goodbye");
+        strings.put("\\hello\\..\\goodbye", sep+"goodbye");
+        strings.put("hello\\..\\goodbye", "goodbye");
+        strings.put("\\hello\\.\\goodbye", sep+"hello"+sep+"goodbye");
+        strings.put("hello\\.\\goodbye", "hello"+sep+"goodbye");
+
+        strings.put(info.roots()[0]+"hello", info.roots()[0]+"hello");
+        String pattern = "a/b\\c";
+        strings.put(pattern, pattern.replace(sep.equals("/") ? "\\" : "/", sep));
+        strings.put("", "");
+        strings.put(" ", "");
+        strings.put(".", "");
+        strings.put(" .", "");
+        strings.put(" . ", "");
+        strings.put("/", sep);
+        strings.put("\\", sep);
+
+        assertThat(info.normalize(null)).as("[null]").isEmpty();
+        for (Map.Entry<String, String> entry : strings.entrySet()) {
+            assertThat(info.normalize(entry.getKey())).as(String.format("[%s]", entry.getKey()))
+                    .isEqualTo(entry.getValue());
+        }
+
+        for (String pattern2 : List.of( "/..", "hello/../..", "/hello/../..")) {
+                assertThatThrownBy(() -> info.normalize(pattern2)).as(String.format("[%s]", pattern2))
+                        .isInstanceOf(IllegalStateException.class)
+                        .hasMessageContaining("Unable to create path before root");
+                }
+    }
+
+    static List<Arguments> tokenizingData() {
+        List<Arguments> data = new ArrayList<>();
+        for (DocumentName.FSInfo fsInfo : TEST_SUITE) {
+            String sep = fsInfo.dirSeparator();
+            String notSep = sep.equals("/") ? "\\" : "/";
+            data.add(Arguments.of(fsInfo, "hello", List.of("hello")));
+            data.add(Arguments.of(fsInfo, "hello" + sep, List.of("hello")));
+            data.add(Arguments.of(fsInfo, "hello" + sep + "world", List.of("hello", "world")));
+            data.add(Arguments.of(fsInfo, sep + "hello", List.of("", "hello")));
+            data.add(Arguments.of(fsInfo, sep + "hello" + sep + ".." + sep + "goodbye", List.of("", "hello", "..", "goodbye")));
+            data.add(Arguments.of(fsInfo, "hello" + sep + ".." + sep + "goodbye", List.of("hello", "..", "goodbye")));
+            data.add(Arguments.of(fsInfo, notSep + "hello" + sep + "goodbye", List.of(notSep + "hello", "goodbye")));
+        }
+        return data;
+    }
+
+    @ParameterizedTest
+    @MethodSource("tokenizingData")
+    void tokenizeTest(DocumentName.FSInfo info, String token, List<String> split) {
+            assertThat(info.tokenize(token))
+                    .containsExactlyElementsOf(split);
+    }
+
+    @ParameterizedTest
+    @MethodSource("tokenizingData")
+    void mkPathTest(DocumentName.FSInfo info, String path, List<String> segments) {
+        if (path.endsWith(info.dirSeparator())) {
+            assertThat(info.mkPath(segments.toArray(new String[0]))).isEqualTo(path.substring(0, path.length()-1));
+        } else {
+            assertThat(info.mkPath(segments.toArray(new String[0]))).isEqualTo(path);
+        }
+    }
+
+    @Test
+    void compareTests() {
+        for (int i = 0; i < TEST_SUITE.length; i++) {
+            for (int j = 0; j < TEST_SUITE.length; j++) {
+                DocumentName.FSInfo underTest = TEST_SUITE[i];
+                DocumentName.FSInfo compareTo = TEST_SUITE[j];
+                String name = String.format("%s with %s ", underTest, compareTo);
+                if (i == j) {
+                    assertThat(underTest).as(name + "equality").isEqualTo(compareTo);
+                    assertThat(underTest.hashCode()).as(name + "hashCode").hasSameHashCodeAs(compareTo);
+                    assertThat(underTest).as(name + "compareTo").isEqualByComparingTo(compareTo);
+                } else {
+                    assertThat(underTest).as(name + "equality").isNotEqualTo(compareTo);
+                    assertThat(underTest).as(name + "compareTo").isNotEqualByComparingTo(compareTo);
+                }
+            }
+        }
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/test/AbstractConfigurationOptionsProvider.java b/apache-rat-core/src/test/java/org/apache/rat/test/AbstractConfigurationOptionsProvider.java
index 6c4aa2ab5..c04f5abb9 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/test/AbstractConfigurationOptionsProvider.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/test/AbstractConfigurationOptionsProvider.java
@@ -18,6 +18,7 @@
  */
 package org.apache.rat.test;
 
+import java.io.FileWriter;
 import java.nio.file.FileSystems;
 import java.nio.file.Path;
 import org.apache.commons.cli.Option;
@@ -25,6 +26,7 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
+import org.apache.commons.text.WordUtils;
 import org.apache.rat.OptionCollectionTest;
 import org.apache.rat.ReportConfiguration;
 import org.apache.rat.ReporterTest;
@@ -37,6 +39,7 @@
 import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.license.LicenseSetFactory;
 import org.apache.rat.report.claim.ClaimStatistic;
+import org.apache.rat.report.xml.writer.XmlWriter;
 import org.apache.rat.test.utils.Resources;
 import org.apache.rat.testhelpers.TextUtils;
 import org.apache.rat.utils.DefaultLog;
@@ -54,6 +57,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Locale;
 import java.util.SortedSet;
 
 import static org.apache.rat.commandline.Arg.HELP_LICENSES;
@@ -75,7 +79,7 @@ public abstract class AbstractConfigurationOptionsProvider extends AbstractOptio
      */
     public static void preserveData(File baseDir, String targetDir) {
         final Path recordPath = FileSystems.getDefault().getPath("target", targetDir);
-        recordPath.toFile().mkdirs();
+        org.apache.rat.utils.FileUtils.mkDir(recordPath.toFile());
         try {
             FileUtils.copyDirectory(baseDir, recordPath.toFile());
         } catch (IOException e) {
@@ -229,10 +233,10 @@ protected void inputExcludeParsedScmTest() {
 
         writeFile(".gitignore", Arrays.asList(lines));
         File dir = new File(baseDir, "red");
-        dir.mkdirs();
+        org.apache.rat.utils.FileUtils.mkDir(dir);
         dir = new File(baseDir, "blue");
         dir = new File(dir, "fish");
-        dir.mkdirs();
+        org.apache.rat.utils.FileUtils.mkDir(dir);
 
         try {
             ReportConfiguration config = generateConfig(ImmutablePair.of(option, args));
@@ -525,8 +529,55 @@ protected void counterMinTest() {
         }
     }
 
+    private String writeConfigXML(String name) {
+        String licenseText = """
+                Licensed to the Apache Software Foundation (ASF) under one or more
+                       contributor license agreements.  See the NOTICE file distributed with
+                       this work for additional information regarding copyright ownership.
+                               The ASF licenses this file to You under the Apache License, Version 2.0
+                       (the "License"); you may not use this file except in compliance with
+                       the License.  You may obtain a copy of the License at
+                
+                       http://www.apache.org/licenses/LICENSE-2.0
+                
+                       Unless required by applicable law or agreed to in writing, software
+                       distributed under the License is distributed on an "AS IS" BASIS,
+                               WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+                               See the License for the specific language governing permissions and
+                       limitations under the License.""";
+        String capName = WordUtils.capitalize(name);
+        String upperName = name.toUpperCase(Locale.ROOT);
+
+        Path xmlPath = this.baseDir.toPath().resolve(".rat/" + capName + ".xml");
+        File f = xmlPath.toFile();
+        try {
+            FileUtils.forceMkdir(f.getParentFile());
+            try (FileWriter writer = new FileWriter(f);
+                 XmlWriter xmlWriter = new XmlWriter(writer)) {
+
+                xmlWriter.startDocument()
+                        .comment(licenseText)
+                        .openElement("rat-config")
+                        .openElement("families")
+                        .openElement("family")
+                        .attribute("id", upperName)
+                        .attribute("name", "from " + capName + ".xml")
+                        .closeElement("families")
+                        .openElement("licenses")
+                        .openElement("license")
+                        .attribute("family", upperName)
+                        .openElement("text")
+                        .content(name)
+                        .closeElement("rat-config");
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return xmlPath.toString();
+    }
+
     private void configTest(final Option option) {
-        String[] args = {"src/test/resources/OptionTools/One.xml", "src/test/resources/OptionTools/Two.xml"};
+        String[] args = {writeConfigXML("one"), writeConfigXML("two")};
         Pair<Option, String[]> arg1 = ImmutablePair.of(option, args);
         try {
             ReportConfiguration config = generateConfig(arg1);
@@ -594,11 +645,10 @@ private void editCopyrightTest(final Option option) {
             config = generateConfig(arg1, arg2);
             assertThat(config.getCopyrightMessage()).isEqualTo("MyCopyright");
         } catch (IOException e) {
-            e.printStackTrace();
             if (e.getCause() != null) {
                 fail(e.getMessage() + ": " + e.getCause().getMessage());
             }
-            fail(e.getMessage());
+            fail(e.getMessage(), e);
         }
     }
 
@@ -780,23 +830,34 @@ private void styleSheetTest(final Option option) {
         try (
                 InputStream in = ReporterTest.class.getResourceAsStream("MatcherContainerResource.txt");
                 OutputStream out = Files.newOutputStream(file.toPath())) {
-            IOUtils.copy(in, out);
+            if (in == null) {
+                fail("Could not copy MatcherContainerResource.txt: resource not found");
+            } else {
+                IOUtils.copy(in, out);
+            }
         } catch (IOException e) {
             fail("Could not copy MatcherContainerResource.txt: " + e.getMessage());
         }
         // run the test
         String[] args = {null};
         try {
-            for (String sheet : new String[]{"plain-rat", "missing-headers", "unapproved-licenses", file.getAbsolutePath()}) {
+            for (String sheet : new String[]{"plain-rat", "missing-headers", "unapproved-licenses", "stylesheet-" + option.getLongOpt()}) {
                 args[0] = sheet;
                 ReportConfiguration config = generateConfig(ImmutablePair.of(option, args));
-                try (InputStream expected = StyleSheets.getStyleSheet(sheet).get();
+                DocumentName base = DocumentName.builder(baseDir).build();
+                DocumentName expectedName = base.resolve(sheet);
+                try (InputStream expected = StyleSheets.getStyleSheet(sheet, base).ioSupplier().get();
                      InputStream actual = config.getStyleSheet().get()) {
-                    assertThat(IOUtils.contentEquals(expected, actual)).as(() -> String.format("'%s' does not match", sheet)).isTrue();
+                    String expectedStr =  IOUtils.toString(expected);
+                    String actualStr =  IOUtils.toString(actual);
+                    assertThat(actualStr).isEqualTo(expectedStr).as(() -> String.format("'%s' does not match '%s': %s != %s",
+                            config.getStyleSheetDescriptor().name(),
+                            expectedName.getName(),
+                            actualStr, expectedStr));
                 }
             }
         } catch (IOException e) {
-            fail(e.getMessage());
+            fail(e.getMessage(), e);
         }
     }
 
@@ -821,7 +882,7 @@ protected void scanHiddenDirectoriesTest() {
     protected void xmlTest() {
         try {
             ReportConfiguration config = generateConfig(ImmutablePair.of(Arg.OUTPUT_STYLE.find("xml"), null));
-            try (InputStream expected = StyleSheets.getStyleSheet("xml").get();
+            try (InputStream expected = StyleSheets.getStyleSheet("xml", null).ioSupplier().get();
                  InputStream actual = config.getStyleSheet().get()) {
                 assertThat(IOUtils.contentEquals(expected, actual)).as("'xml' does not match").isTrue();
             }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/test/AbstractOptionsProvider.java b/apache-rat-core/src/test/java/org/apache/rat/test/AbstractOptionsProvider.java
index f4a188099..1f55d2ba0 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/test/AbstractOptionsProvider.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/test/AbstractOptionsProvider.java
@@ -170,7 +170,7 @@ public static String[] extractArgs(List<Pair<Option, String[]>> args) {
     }
 
     protected File writeFile(final String name, final Iterable<String> lines) {
-        return org.apache.rat.testhelpers.FileUtils.writeFile(baseDir, name, lines);
+        return org.apache.rat.utils.FileUtils.writeFile(baseDir, name, lines);
     }
 
     final protected DocumentName mkDocName(final String name) {
diff --git a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/BaseOption.java b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/BaseOption.java
new file mode 100644
index 000000000..4a22d9d7e
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/BaseOption.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   https://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.testhelpers;
+
+import org.apache.commons.cli.Option;
+import org.apache.rat.ui.ArgumentTracker;
+import org.apache.rat.ui.UIOption;
+import org.apache.rat.ui.UIOptionCollection;
+import org.apache.rat.utils.CasedString;
+
+public final class BaseOption extends UIOption<BaseOption> {
+    BaseOption(final UIOptionCollection<BaseOption> collection, Option option) {
+        super(collection, option, new CasedString(CasedString.StringCase.KEBAB, ArgumentTracker.extractKey(option)));
+    }
+    protected String cleanupName(Option option) {
+        return ArgumentTracker.extractKey(option);
+    }
+
+    public String getExample() {
+        return "";
+    }
+
+    public String getText() {
+        return "";
+    }
+}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/BaseOptionCollection.java b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/BaseOptionCollection.java
new file mode 100644
index 000000000..18b507103
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/BaseOptionCollection.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   https://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.testhelpers;
+
+import org.apache.commons.cli.Option;
+import org.apache.rat.ui.UIOptionCollection;
+
+public final class BaseOptionCollection extends UIOptionCollection<BaseOption> {
+    private BaseOptionCollection(Builder builder) {
+        super(builder);
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static final class Builder extends UIOptionCollection.Builder<BaseOption, Builder> {
+        private Builder() {
+            super(BaseOption::new);
+        }
+
+        public BaseOptionCollection build() {
+            return new BaseOptionCollection(this);
+        }
+    }
+}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingLog.java b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingLog.java
index 171cacacd..0298eb52c 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingLog.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingLog.java
@@ -26,6 +26,7 @@
 public class TestingLog implements Log {
 
     private StringBuilder captured = new StringBuilder();
+    private Log.Level level = Log.Level.INFO;
 
     /**
      * Clears the captured buffer
@@ -86,12 +87,18 @@ public void assertNotContainsPattern(String pattern) {
 
     @Override
     public Level getLevel() {
-        return Level.DEBUG;
+        return level;
+    }
+
+    @Override
+    public void setLevel(Level level) {
+        this.level = level;
     }
 
     @Override
     public void log(Level level, String msg) {
-        captured.append(String.format("%s: %s%n", level, msg));
+        if (isEnabled(level))
+            captured.append(String.format("%s: %s%n", level, msg));
     }
 
     /**
diff --git a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/data/AbstractTestDataProvider.java b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/data/AbstractTestDataProvider.java
new file mode 100644
index 000000000..6bc5682f8
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/data/AbstractTestDataProvider.java
@@ -0,0 +1,198 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.testhelpers.data;
+
+
+import com.google.common.collect.ImmutableList;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.stream.Stream;
+import org.apache.commons.cli.Option;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.rat.OptionCollectionParser;
+import org.apache.rat.commandline.Arg;
+import org.apache.rat.ui.UIOptionCollection;
+import org.apache.rat.ui.ArgumentTracker;
+import org.apache.rat.utils.DefaultLog;
+
+/**
+ * Generates a list of TestData for executing the Report.
+ * Use of this interface ensures consistent testing across the UIs. Each method
+ * tests an Option from {@link OptionCollectionParser} that must be implemented in the UI.
+ */
+public abstract class AbstractTestDataProvider {
+
+    /** The list of exclude args */
+    static final String[] EXCLUDE_ARGS = {"*.foo", "%regex[[A-Z]\\.bar]", "justbaz"};
+    /** the list of include args */
+    static final String[] INCLUDE_ARGS = {"B.bar", "justbaz"};
+    public final ImmutableList<ImmutablePair<Option, String[]>> NO_OPTIONS = ImmutableList.of(ImmutablePair.nullPair());
+
+    /**
+     * Generates a map of TestData indexed by the testName
+     * @param optionCollection the collection of options for the UI under test.
+     * @return the map of testName to Test Data.
+     */
+    public final Map<String, TestData> getOptionTestMap(final UIOptionCollection<?> optionCollection) {
+        Map<String, TestData> map = new TreeMap<>();
+        for (TestData test : getOptionTests(optionCollection)) {
+            map.put(test.getTestName(), test);
+        }
+        return map;
+    }
+
+    /**
+     * Generates a list of test data for Option testing.
+     * This is different from UI testing as this is to test
+     * that the command line is properly parsed into a configuration.
+     * @param optionCollection the collection of options for the UI under test.
+     * @return a set of TestData for the tests.
+     */
+    public final Set<TestData> getOptionTests(final UIOptionCollection<?> optionCollection) {
+        // the optionCollection establishes any changes to the Arg values.
+        List<Option> unsupportedOptions = new ArrayList<>(optionCollection.getUnsupportedOptions().getOptions());
+        Set<TestData> result = new TreeSet<>();
+        for (Arg arg : Arg.values()) {
+            if (!arg.isEmpty()) {
+                Stream<Option> options = arg.group().getOptions().stream().filter(opt -> !unsupportedOptions.contains(opt));
+                switch (arg) {
+                    case CONFIGURATION -> options.forEach(opt -> configTest(result, opt));
+                    case CONFIGURATION_NO_DEFAULTS -> options.forEach(opt -> configurationNoDefaultsTest(result, opt));
+                    case COUNTER_MIN -> options.forEach(opt -> counterMinTest(result, opt));
+                    case COUNTER_MAX -> options.forEach(opt -> counterMaxTest(result, opt));
+                    case DRY_RUN -> options.forEach(opt -> dryRunTest(result, opt));
+                    case EDIT_COPYRIGHT -> options.forEach(opt -> editCopyrightTest(result, opt));
+                    case EDIT_ADD -> options.forEach(opt -> editLicenseTest(result, opt));
+                    case EDIT_OVERWRITE -> options.forEach(opt -> editOverwriteTest(result, opt));
+                    case HELP_LICENSES -> options.forEach(opt -> helpLicenses(result, opt));
+                    case EXCLUDE -> options.forEach(opt -> inputExcludeTest(result, opt));
+                    case EXCLUDE_FILE -> options.forEach(opt -> inputExcludeFileTest(result, opt));
+                    case EXCLUDE_PARSE_SCM -> options.forEach(opt -> inputExcludeParsedScmTest(result, opt));
+                    case EXCLUDE_STD -> options.forEach(opt -> inputExcludeStdTest(result, opt));
+                    case EXCLUDE_SIZE -> options.forEach(opt -> inputExcludeSizeTest(result, opt));
+                    case INCLUDE -> options.forEach(opt -> inputIncludeTest(result, opt));
+                    case INCLUDE_FILE -> options.forEach(opt -> inputIncludeFileTest(result, opt));
+                    case INCLUDE_STD -> options.forEach(opt -> inputIncludeStdTest(result, opt));
+                    case SOURCE -> options.forEach(opt -> inputSourceTest(result, opt));
+                    case FAMILIES_APPROVED -> options.forEach(opt -> licenseFamiliesApprovedTest(result, opt));
+                    case FAMILIES_APPROVED_FILE -> options.forEach(opt -> licenseFamiliesApprovedFileTest(result, opt));
+                    case FAMILIES_DENIED -> options.forEach(opt -> licenseFamiliesDeniedTest(result, opt));
+                    case FAMILIES_DENIED_FILE -> options.forEach(opt -> licenseFamiliesDeniedFileTest(result, opt));
+                    case LICENSES_APPROVED -> options.forEach(opt -> licensesApprovedTest(result, opt));
+                    case LICENSES_APPROVED_FILE -> options.forEach(opt -> licensesApprovedFileTest(result, opt));
+                    case LICENSES_DENIED -> options.forEach(opt -> licensesDeniedTest(result, opt));
+                    case LICENSES_DENIED_FILE -> options.forEach(opt -> licensesDeniedFileTest(result, opt));
+                    case LOG_LEVEL -> options.forEach(opt -> logLevelTest(result, opt));
+                    case OUTPUT_ARCHIVE -> options.forEach(opt -> outputArchiveTest(result, opt));
+                    case OUTPUT_FAMILIES -> options.forEach(opt -> outputFamiliesTest(result, opt));
+                    case OUTPUT_FILE -> options.forEach(opt -> outputFileTest(result, opt));
+                    case OUTPUT_LICENSES -> options.forEach(opt -> outputLicensesTest(result, opt));
+                    case OUTPUT_STANDARD -> options.forEach(opt -> outputStandardTest(result, opt));
+                    case OUTPUT_STYLE -> options.forEach(opt -> outputStyleTest(result, opt));
+                }
+            }
+        }
+        validate(result);
+        return result;
+    }
+
+    private void validate(Set<TestData> result) {
+        Set<Option> options = new HashSet<>(Arg.getOptions().getOptions());
+        result.forEach(testData -> options.remove(testData.getOption()));
+        // TODO fix this once deprecated options are removed
+        options.forEach(opt -> DefaultLog.getInstance().warn("Option " + ArgumentTracker.extractKey(opt) + " was not tested."));
+        //assertThat(options).describedAs("All options are not accounted for.").isEmpty();
+    }
+
+    protected abstract void inputExcludeFileTest(final Set<TestData> result, final Option option);
+
+    protected abstract void inputExcludeTest(final Set<TestData> result, final Option option);
+
+    protected abstract void inputExcludeStdTest(final Set<TestData> result, final Option option);
+
+    protected abstract void inputExcludeParsedScmTest(final Set<TestData> result, final Option option);
+
+    protected abstract void inputExcludeSizeTest(final Set<TestData> result, final Option option);
+
+    protected abstract void inputIncludeFileTest(final Set<TestData> result, final Option option);
+
+    protected abstract void inputIncludeTest(final Set<TestData> result, final Option option);
+
+    protected abstract void inputIncludeStdTest(final Set<TestData> result, final Option option);
+
+    protected abstract void inputSourceTest(final Set<TestData> result, final Option option);
+
+    protected abstract void helpLicenses(final Set<TestData> result, final Option option);
+
+    protected abstract void licensesApprovedFileTest(final Set<TestData> result, final Option option);
+
+    protected abstract void licensesApprovedTest(final Set<TestData> result, final Option option);
+
+    protected abstract void licensesDeniedTest(final Set<TestData> result, final Option option);
+
+    protected abstract void licensesDeniedFileTest(final Set<TestData> result, final Option option);
+
+    protected abstract void licenseFamiliesApprovedFileTest(final Set<TestData> result, final Option option);
+
+    protected abstract void licenseFamiliesApprovedTest(final Set<TestData> result, final Option option);
+
+    protected abstract void licenseFamiliesDeniedFileTest(final Set<TestData> result, final Option option);
+
+    protected abstract void licenseFamiliesDeniedTest(final Set<TestData> result, final Option option);
+
+    protected abstract void counterMaxTest(final Set<TestData> result, final Option option);
+
+    protected abstract void counterMinTest(final Set<TestData> result, final Option option);
+
+    /**
+     * Add results to the result list.
+     * @param result the result list.
+     * @param option configuration option we are testing.
+     */
+    protected abstract void configTest(final Set<TestData> result, final Option option);
+
+    protected abstract void configurationNoDefaultsTest(final Set<TestData> result, final Option option);
+
+    protected abstract void dryRunTest(final Set<TestData> result, final Option option);
+
+    protected abstract  void editCopyrightTest(final Set<TestData> result, final Option option);
+
+    protected abstract void editLicenseTest(final Set<TestData> result, final Option option);
+
+    protected abstract void editOverwriteTest(final Set<TestData> result, final Option option);
+
+    protected abstract void logLevelTest(final Set<TestData> result, final Option option);
+
+    protected abstract void outputArchiveTest(final Set<TestData> result, final Option option);
+
+    protected abstract void outputFamiliesTest(final Set<TestData> result, final Option option);
+
+    protected abstract void outputFileTest(final Set<TestData> result, final Option option);
+
+    protected abstract void outputLicensesTest(final Set<TestData> result, final Option option);
+
+    protected abstract void outputStandardTest(final Set<TestData> result, final Option option);
+
+    protected abstract void outputStyleTest(final Set<TestData> result, final Option option);
+}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/data/DataUtils.java b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/data/DataUtils.java
new file mode 100644
index 000000000..11ad8ec87
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/data/DataUtils.java
@@ -0,0 +1,142 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.testhelpers.data;
+
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Locale;
+import java.util.function.Consumer;
+import org.apache.commons.cli.Option;
+import org.apache.rat.report.xml.writer.XmlWriter;
+import org.apache.rat.utils.CasedString;
+import org.apache.rat.utils.DefaultLog;
+
+public class DataUtils {
+    /**
+     * The text for the current ASF license.
+     */
+    public static final String[] ASF_TEXT_LINES = {
+            "Licensed to the Apache Software Foundation (ASF) under one or more",
+            "contributor license agreements.  See the NOTICE file distributed with",
+            "this work for additional information regarding copyright ownership.",
+            "The ASF licenses this file to You under the Apache License, Version 2.0",
+            "(the \"License\"); you may not use this file except in compliance with",
+            "the License.  You may obtain a copy of the License at",
+            "  ",
+            "    https://www.apache.org/licenses/LICENSE-2.0",
+            "  ",
+            "Unless required by applicable law or agreed to in writing, software",
+            "distributed under the License is distributed on an \"AS IS\" BASIS,",
+            "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.",
+            "See the License for the specific language governing permissions and",
+            "limitations under the License."
+    };
+
+    /**
+     * The text for the current ASF license as a block of text with new lines.
+     */
+    public static final String ASF_TEXT = String.join("\n" ,ASF_TEXT_LINES);
+
+    /**
+     * A setup that does nothing.
+     */
+    public static final Consumer<Path> NO_SETUP = basePath -> {
+        DefaultLog.getInstance().warn("no setup for " + basePath);
+    };
+
+    public static final Consumer<ValidatorData> NO_VALIDATOR = validatorData -> {};
+
+    private DataUtils() {
+        // do not instantiate
+    }
+
+    /**
+     * Create a directory name from the option.  Directory names are camel.
+     * @param option the option to create a directory name from.
+     * @return the directory name for the option.
+     */
+    static String asDirName(Option option) {
+        if (option.hasLongOpt()) {
+            return CasedString.StringCase.CAMEL.assemble(CasedString.StringCase.KEBAB.getSegments(option.getLongOpt()));
+        }
+        return option.getOpt().toLowerCase(Locale.ROOT);
+    }
+
+    /**
+     * Generate a simple configuration file that defines one license based on the name of the file and
+     * containing as single text matcher that mateches the {@code text} parameter.
+     * @param fileName The name of the file to create.
+     * @param id the ID for the family.
+     * @param text the text for the matcher.
+     */
+    static void generateTextConfig(Path fileName, String id, String text) {
+        try (XmlWriter writer = new XmlWriter(new OutputStreamWriter(Files.newOutputStream(fileName.toFile().toPath()),
+                        StandardCharsets.UTF_8))) {
+            writer.startDocument()
+                    .comment(ASF_TEXT)
+                    .openElement("rat-config")
+                    .openElement("families")
+                    .openElement("family")
+                    .attribute("id", id)
+                    .attribute("name", "from " + fileName.getFileName())
+                    .closeElement() // family
+                    .closeElement() // families
+                    .openElement("licenses")
+                    .openElement("license")
+                    .attribute("family", id)
+                    .openElement("text")
+                    .content(text)
+                    .closeDocument(); // close all open elements
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+    /**
+     * Generate a simple configuration file that defines one license based on the name of the file and
+     * containing as single text matcher that mateches the {@code text} parameter.
+     * @param fileName The name of the file to create.
+     * @param id the ID for the family.
+     * @param spdxId the SPDX id for the matcher.
+     */
+    static void generateSpdxConfig(Path fileName, String id, String spdxId) {
+        try (XmlWriter writer = new XmlWriter(new OutputStreamWriter(Files.newOutputStream(fileName.toFile().toPath()),
+                StandardCharsets.UTF_8))) {
+            writer.startDocument()
+                    .comment(ASF_TEXT)
+                    .openElement("rat-config")
+                    .openElement("families")
+                    .openElement("family")
+                    .attribute("id", id)
+                    .attribute("name", "from " + fileName.getFileName())
+                    .closeElement() // family
+                    .closeElement() // families
+                    .openElement("licenses")
+                    .openElement("license")
+                    .attribute("family", id)
+                    .openElement("spdx")
+                    .attribute("name", spdxId)
+                    .closeDocument(); // close all open elements
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/data/ReportTestDataProvider.java b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/data/ReportTestDataProvider.java
new file mode 100644
index 000000000..62a0ab968
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/data/ReportTestDataProvider.java
@@ -0,0 +1,1282 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   https://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.testhelpers.data;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
+import org.apache.commons.cli.Option;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.rat.OptionCollectionParser;
+import org.apache.rat.ReportConfiguration;
+import org.apache.rat.api.RatException;
+import org.apache.rat.commandline.Arg;
+import org.apache.rat.commandline.StyleSheets;
+import org.apache.rat.config.exclusion.StandardCollection;
+import org.apache.rat.config.results.ClaimValidator;
+import org.apache.rat.document.DocumentName;
+import org.apache.rat.license.LicenseSetFactory;
+import org.apache.rat.report.claim.ClaimStatistic;
+import org.apache.rat.report.xml.writer.XmlWriter;
+import org.apache.rat.utils.FileUtils;
+import org.apache.rat.testhelpers.TestingLog;
+import org.apache.rat.testhelpers.TextUtils;
+import org.apache.rat.testhelpers.XmlUtils;
+import org.apache.rat.utils.DefaultLog;
+import org.apache.rat.utils.Log;
+import org.w3c.dom.Document;
+
+import static org.apache.rat.utils.FileUtils.writeFile;
+import static org.apache.rat.testhelpers.data.DataUtils.NO_SETUP;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Fail.fail;
+
+/**
+ * Generates a list of TestData for executing the Report.
+ * Use of this interface ensures consistent testing across the UIs. Each method
+ * tests an Option from {@link OptionCollectionParser} that must be implemented in the UI.
+ * These tests generally validate the results in the generated XML are as expected.
+ */
+public class ReportTestDataProvider extends AbstractTestDataProvider {
+
+    public static final RatException NO_LICENSES_EXCEPTION = new RatException("At least one license must be defined");
+
+    private final XPath xpath = XPathFactory.newInstance().newXPath();
+
+    private final Consumer<Path> mkRat = basePath -> {
+        DefaultLog.getInstance().warn("mkRat setup for " + basePath);
+        File baseDir = basePath.toFile();
+        File ratDir = new File(baseDir, ".rat");
+        FileUtils.mkDir(ratDir);
+    };
+
+    private void assertStandardFile(Document document, String fname) {
+        try {
+            XmlUtils.assertIsPresent(document, xpath,
+                    String.format("/rat-report/resource[@name='/%s'][@type='STANDARD']", fname));
+        } catch (XPathExpressionException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void assertIgnoredFile(Document document, String fname) {
+        try {
+            XmlUtils.assertIsPresent(document, xpath,
+                    String.format("/rat-report/resource[@name='/%s'][@type='IGNORED']", fname));
+        } catch (XPathExpressionException e) {
+            throw new RuntimeException(e);
+        }
+    }
+    
+    private void assertCounter(ValidatorData data, ClaimStatistic.Counter counter, int count) {
+        assertThat(data.getStatistic().getCounter(counter)).as(counter.name()).isEqualTo(count);
+    }
+
+    // exclude tests
+    private List<TestData> execExcludeTest(final Option option, final Supplier<String[]> args, Consumer<Path> setupFiles) {
+        Consumer<Path> setup = setupFiles.andThen(mkRat).andThen(basePath -> {
+            DefaultLog.getInstance().warn("execExcludeTest setup for " + basePath);
+            File baseDir = basePath.toFile();
+            writeFile(baseDir, "notbaz");
+            writeFile(baseDir, "well._afile");
+            writeFile(baseDir, "some.foo");
+            writeFile(baseDir, "B.bar");
+            writeFile(baseDir, "justbaz");
+        });
+
+        TestData test1 = new TestData(DataUtils.asDirName(option), NO_OPTIONS,
+                setup,
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating execExcludeTest for " + validatorData.getBaseDir());
+                    assertCounter(validatorData, ClaimStatistic.Counter.STANDARDS, 5);
+                    assertCounter(validatorData, ClaimStatistic.Counter.IGNORED, 1);
+                });
+
+        String[] ignored = {"B.bar", "justbaz", "some.foo", ".rat"};
+        String[] standard = {"well._afile", "notbaz"};
+        TestData test2 = new TestData("", Collections.singletonList(ImmutablePair.of(option, args.get())),
+                setup,
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating execExcludeTest for " + validatorData.getBaseDir());
+                    ClaimStatistic claimStatistic = validatorData.getStatistic();
+                    assertCounter(validatorData, ClaimStatistic.Counter.STANDARDS, standard.length);
+                    assertCounter(validatorData, ClaimStatistic.Counter.IGNORED, ignored.length);
+                    for (String fileName : ignored) {
+                        assertIgnoredFile(validatorData.getDocument(), fileName);
+                    }
+                    for (String fileName : standard) {
+                        assertStandardFile(validatorData.getDocument(), fileName);
+                    }
+                });
+        return Arrays.asList(test1, test2);
+    }
+
+    protected void inputExcludeFileTest(final Set<TestData> result, final Option option) {
+        Consumer<Path> setup = mkRat.andThen(baseDir -> {
+            File dir = baseDir.resolve(".rat").toFile();
+            writeFile(dir, "exclude.txt", Arrays.asList(AbstractTestDataProvider.EXCLUDE_ARGS));
+        });
+        Supplier<String[]> args = () -> new String[]{".rat/exclude.txt"};
+        result.addAll(execExcludeTest(option, args, setup));
+    }
+
+
+    protected void inputExcludeTest(final Set<TestData> result, final Option option) {
+        result.addAll(execExcludeTest(option, () -> AbstractTestDataProvider.EXCLUDE_ARGS, x -> {
+        }));
+    }
+
+    protected void inputExcludeStdTest(final Set<TestData> result, final Option option) {
+        String[] args = {StandardCollection.MAVEN.name()};
+        String[] defaultExcluded = {"afile~", ".#afile", "%afile%", "._afile"};
+        String[] defaultIncluded = {"afile~more", "what.#afile", "%afile%withMore", "well._afile"};
+        String mavenFile = "build.log";
+        Consumer<Path> setup = basePath -> {
+            DefaultLog.getInstance().warn("inputExcludeStdTest setup for " + basePath);
+            File baseDir = basePath.toFile();
+            for (String fileName : defaultExcluded) {
+                writeFile(baseDir, fileName);
+            }
+            for (String fileName : defaultIncluded) {
+                writeFile(baseDir, fileName);
+            }
+            writeFile(baseDir, mavenFile);
+        };
+        result.add(new TestData(DataUtils.asDirName(option), Collections.singletonList(ImmutablePair.nullPair()),
+                setup,
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating inputExcludeStdTest for " + validatorData.getBaseDir());
+                    assertCounter(validatorData, ClaimStatistic.Counter.STANDARDS, defaultIncluded.length + 1);
+                    assertCounter(validatorData, ClaimStatistic.Counter.IGNORED, defaultExcluded.length);
+                    for (String fileName : defaultIncluded) {
+                        assertStandardFile(validatorData.getDocument(), fileName);
+                    }
+                    for (String fileName : defaultExcluded) {
+                        assertIgnoredFile(validatorData.getDocument(), fileName);
+                    }
+                }));
+
+
+        result.add(new TestData("", Collections.singletonList(ImmutablePair.of(option, args)),
+                setup,
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating inputExcludeStdTest for " + validatorData.getBaseDir());
+                    assertCounter(validatorData, ClaimStatistic.Counter.STANDARDS, defaultIncluded.length);
+                    assertCounter(validatorData, ClaimStatistic.Counter.IGNORED, defaultExcluded.length + 1);
+                    for (String fileName : defaultIncluded) {
+                        assertStandardFile(validatorData.getDocument(), fileName);
+                    }
+                    for (String fileName : defaultExcluded) {
+                        assertIgnoredFile(validatorData.getDocument(), fileName);
+                    }
+                    assertIgnoredFile(validatorData.getDocument(), mavenFile);
+                }));
+    }
+
+    protected void inputExcludeParsedScmTest(final Set<TestData> result, final Option option) {
+        Consumer<Path> setup = basePath -> {
+            DefaultLog.getInstance().warn("inputExcludeParsedScmTest setup for " + basePath);
+            File baseDir = basePath.toFile();
+            String[] lines = {
+                    "# somethings",
+                    "!thingone", "thing*", System.lineSeparator(),
+                    "# some fish",
+                    "**/fish", "*_fish",
+                    "# some colorful directories",
+                    "red/", "blue/*/"};
+            writeFile(baseDir, ".gitignore", Arrays.asList(lines));
+            writeFile(baseDir, "thingone");
+            writeFile(baseDir, "thingtwo");
+            File dir = new File(baseDir, "dir");
+            FileUtils.mkDir(dir);
+            FileUtils.writeFile(dir, "fish_two");
+            FileUtils.writeFile(dir, "fish");
+
+            dir = new File(baseDir, "red");
+            FileUtils.mkDir(dir);
+            FileUtils.writeFile(dir, "fish");
+
+            dir = new File(baseDir, "blue/fish");
+            FileUtils.mkDir(dir);
+            FileUtils.writeFile(dir, "dory");
+
+            dir = new File(baseDir, "some");
+            FileUtils.mkDir(dir);
+            FileUtils.writeFile(dir, "fish");
+            FileUtils.writeFile(dir, "things");
+            FileUtils.writeFile(dir, "thingone");
+
+            dir = new File(baseDir, "another");
+            FileUtils.mkDir(dir);
+            FileUtils.writeFile(dir, "red_fish");
+        };
+
+        result.add(new TestData(DataUtils.asDirName(option), Collections.singletonList(ImmutablePair.nullPair()),
+                setup,
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating inputExcludeParsedScmTest for " + validatorData.getBaseDir());
+                    assertCounter(validatorData, ClaimStatistic.Counter.STANDARDS, 11);
+                    // .gitignore is ignored by default as it is hidden
+                    assertCounter(validatorData, ClaimStatistic.Counter.IGNORED, 0);
+                }));
+
+        result.add(new TestData("GIT", Collections.singletonList(ImmutablePair.of(option, new String[]{"GIT"})),
+                setup,
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating inputExcludeParsedScmTest for " + validatorData.getBaseDir());
+                    assertCounter(validatorData, ClaimStatistic.Counter.STANDARDS, 3);
+                    // .gitignore is ignored by default as it is hidden
+                    assertCounter(validatorData, ClaimStatistic.Counter.IGNORED, 8);
+                }));
+    }
+
+    protected void inputExcludeSizeTest(final Set<TestData> result, final Option option) {
+        String[] notExcluded = {"Hello.txt", "HelloWorld.txt"};
+        String[] excluded = {"Hi.txt"};
+
+        Consumer<Path> setup = basePath -> {
+            DefaultLog.getInstance().warn("inputExcludeSizeTest setup for " + basePath);
+            File baseDir = basePath.toFile();
+            writeFile(baseDir, "Hi.txt", Collections.singletonList("Hi"));
+            writeFile(baseDir, "Hello.txt", Collections.singletonList("Hello"));
+            writeFile(baseDir, "HelloWorld.txt", Collections.singletonList("HelloWorld"));
+        };
+
+        result.add(new TestData(DataUtils.asDirName(option), Collections.singletonList(ImmutablePair.of(null, null)),
+                setup,
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating inputExcludeSizeTest for " + validatorData.getBaseDir());
+                    assertCounter(validatorData, ClaimStatistic.Counter.STANDARDS, 3);
+                    assertCounter(validatorData, ClaimStatistic.Counter.IGNORED, 0);
+                    for (String fname : excluded) {
+                        assertStandardFile(validatorData.getDocument(), fname);
+                    }
+                    for (String fname : notExcluded) {
+                        assertStandardFile(validatorData.getDocument(), fname);
+                    }
+                }));
+
+        result.add(new TestData("", Collections.singletonList(ImmutablePair.of(option, new String[]{"5"})),
+                setup,
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating inputExcludeSizeTest for " + validatorData.getBaseDir());
+                    assertCounter(validatorData, ClaimStatistic.Counter.STANDARDS, 2);
+                    assertCounter(validatorData, ClaimStatistic.Counter.IGNORED, 1);
+                    for (String fname : excluded) {
+                        assertIgnoredFile(validatorData.getDocument(), fname);
+                    }
+                    for (String fname : notExcluded) {
+                        assertStandardFile(validatorData.getDocument(), fname);
+                    }
+                }));
+    }
+
+    // include tests
+    private List<TestData> execIncludeTest(final Option option, String[] args, Consumer<Path> setupFiles) {
+        Option excludeOption = Arg.EXCLUDE.option();
+        Consumer<Path> setup = setupFiles.andThen(basePath -> {
+            DefaultLog.getInstance().warn("execIncludeTest setup for " + basePath);
+            File baseDir = basePath.toFile();
+            writeFile(baseDir, "notbaz");
+            writeFile(baseDir, "some.foo");
+            writeFile(baseDir, "B.bar");
+            writeFile(baseDir, "justbaz");
+        });
+
+        // standard without options.
+        TestData test1 = new TestData(DataUtils.asDirName(option), NO_OPTIONS,
+                setup,
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating execIncludeTest for " + validatorData.getBaseDir());
+                    assertCounter(validatorData, ClaimStatistic.Counter.STANDARDS, 4);
+                    assertCounter(validatorData, ClaimStatistic.Counter.IGNORED, 1);
+                });
+
+        // verify exclude removes the files
+        TestData test2 = new TestData(DataUtils.asDirName(option), Collections.singletonList(ImmutablePair.of(excludeOption, AbstractTestDataProvider.EXCLUDE_ARGS)),
+                setup,
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating execIncludeTest for " + validatorData.getBaseDir());
+                    assertCounter(validatorData, ClaimStatistic.Counter.STANDARDS, 1);
+                    // .gitignore is ignored by default as it is hidden but not counted
+                    assertCounter(validatorData, ClaimStatistic.Counter.IGNORED, 4);
+                });
+
+        TestData test3 = new TestData("", Arrays.asList(ImmutablePair.of(option, args), ImmutablePair.of(excludeOption, AbstractTestDataProvider.EXCLUDE_ARGS)),
+                setup,
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating execIncludeTest for " + validatorData.getBaseDir());
+                    assertCounter(validatorData, ClaimStatistic.Counter.STANDARDS, 3);
+                    // .gitignore is ignored by default as it is hidden but not counted
+                    assertCounter(validatorData, ClaimStatistic.Counter.IGNORED, 2);
+                });
+        return Arrays.asList(test1, test2, test3);
+    }
+
+    protected void inputIncludeFileTest(final Set<TestData> result, final Option option) {
+        Consumer<Path> setup = mkRat.andThen(basePath -> {
+            DefaultLog.getInstance().warn("inputIncludeFileTest setup for " + basePath);
+            File dir = basePath.resolve(".rat").toFile();
+            writeFile(dir, "include.txt", Arrays.asList(AbstractTestDataProvider.INCLUDE_ARGS));
+        });
+        result.addAll(execIncludeTest(option, new String[]{".rat/include.txt"}, setup));
+    }
+
+
+    protected void inputIncludeTest(final Set<TestData> result, final Option option) {
+        result.addAll(execIncludeTest(option, AbstractTestDataProvider.INCLUDE_ARGS, mkRat));
+    }
+
+    protected void inputIncludeStdTest(final Set<TestData> result, final Option option) {
+        Consumer<Path> setup = basePath -> {
+            DefaultLog.getInstance().warn("inputIncludeStdTest setup for " + basePath);
+            File baseDir = basePath.toFile();
+            writeFile(baseDir, "afile~more");
+            writeFile(baseDir, "afile~");
+            writeFile(baseDir, ".#afile");
+            writeFile(baseDir, "%afile%");
+            writeFile(baseDir, "._afile");
+            writeFile(baseDir, "what.#afile");
+            writeFile(baseDir, "%afile%withMore");
+            writeFile(baseDir, "well._afile");
+            writeFile(baseDir, ".hiddenFile", "The hidden file");
+            File hiddenDir = new File(baseDir, ".hiddenDir");
+            FileUtils.mkDir(hiddenDir);
+            writeFile(hiddenDir, "aFile", "File in hidden directory");
+        };
+        if (Arg.EXCLUDE.isEmpty()) {
+            throw new RuntimeException(String.format("Can not test %s if there are no exclude file options supported", option.getKey()));
+        }
+        ImmutablePair<Option, String[]> excludes = ImmutablePair.of(Arg.EXCLUDE.option(),
+                new String[]{"*~more", "*~"});
+
+
+        result.add(new TestData("includeStdValidation", Collections.singletonList(excludes),
+                setup,
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating inputIncludeStdTest for " + validatorData.getBaseDir());
+                    assertCounter(validatorData, ClaimStatistic.Counter.STANDARDS, 4);
+                    assertCounter(validatorData, ClaimStatistic.Counter.IGNORED, 6);
+                }));
+
+        if (!option.hasArg()) {
+            if (option.getKey().equals("scan-hidden-directories")) {
+                result.add(new TestData("",
+                        Arrays.asList(ImmutablePair.of(option, null), excludes),
+                        setup,
+                        validatorData -> {
+                            DefaultLog.getInstance().warn("validating inputIncludeStdTest for " + validatorData.getBaseDir());
+                            assertCounter(validatorData, ClaimStatistic.Counter.STANDARDS, 5);
+                            assertCounter(validatorData, ClaimStatistic.Counter.IGNORED, 5);
+                            assertIgnoredFile(validatorData.getDocument(), "._afile");
+                            assertStandardFile(validatorData.getDocument(), ".hiddenDir/aFile");
+                        }));
+            } else {
+                throw new RuntimeException("Unknown option: " + option.getKey());
+            }
+        } else {
+            result.add(new TestData(StandardCollection.MISC.name().toLowerCase(Locale.ROOT), Arrays.asList(ImmutablePair.of(option, new String[]{StandardCollection.MISC.name()}), excludes),
+                    setup,
+                    validatorData -> {
+                        DefaultLog.getInstance().warn("validating inputIncludeStdTest for " + validatorData.getBaseDir());
+                        assertCounter(validatorData, ClaimStatistic.Counter.STANDARDS, 8);
+                        assertCounter(validatorData, ClaimStatistic.Counter.IGNORED, 2);
+                    }));
+
+            result.add(new TestData(StandardCollection.HIDDEN_FILE.name().toLowerCase(Locale.ROOT),
+                    Arrays.asList(ImmutablePair.of(option, new String[]{StandardCollection.HIDDEN_FILE.name()}), excludes),
+                    setup,
+                    validatorData -> {
+                        DefaultLog.getInstance().warn("validating inputIncludeStdTest for " + validatorData.getBaseDir());
+                        assertCounter(validatorData, ClaimStatistic.Counter.STANDARDS, 6);
+                        assertCounter(validatorData, ClaimStatistic.Counter.IGNORED, 4);
+                        assertStandardFile(validatorData.getDocument(), "._afile");
+                        assertIgnoredFile(validatorData.getDocument(), ".hiddenDir");
+                    }));
+
+            result.add(new TestData(StandardCollection.HIDDEN_DIR.name().toLowerCase(Locale.ROOT),
+                    Arrays.asList(ImmutablePair.of(option, new String[]{StandardCollection.HIDDEN_DIR.name()}), excludes),
+                    setup,
+                    validatorData -> {
+                        DefaultLog.getInstance().warn("validating inputIncludeStdTest for " + validatorData.getBaseDir());
+                        assertCounter(validatorData, ClaimStatistic.Counter.STANDARDS, 5);
+                        assertCounter(validatorData, ClaimStatistic.Counter.IGNORED, 5);
+                        assertIgnoredFile(validatorData.getDocument(), "._afile");
+                        assertStandardFile(validatorData.getDocument(), ".hiddenDir/aFile");
+                    }));
+        }
+    }
+
+    protected void inputSourceTest(final Set<TestData> result, final Option option) {
+        Consumer<Path> setup = basePath -> {
+            DefaultLog.getInstance().warn("inputSourceTest setup for " + basePath);
+            File baseDir = basePath.toFile();
+            writeFile(baseDir, "codefile", "https://www.apache.org/licenses/LICENSE-2.0");
+            writeFile(baseDir, "input.txt", "codefile");
+            writeFile(baseDir, "notcodeFile");
+        };
+
+        result.add(new TestData(DataUtils.asDirName(option), NO_OPTIONS,
+                setup,
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating inputSourceTest for " + validatorData.getBaseDir());
+                    assertCounter(validatorData, ClaimStatistic.Counter.STANDARDS, 3);
+                    assertCounter(validatorData, ClaimStatistic.Counter.IGNORED, 0);
+                }));
+
+        result.add(new TestData("", Collections.singletonList(ImmutablePair.of(option, new String[]{"input.txt"})),
+                setup,
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating inputSourceTest for " + validatorData.getBaseDir());
+                    assertCounter(validatorData, ClaimStatistic.Counter.STANDARDS, 1);
+                    assertCounter(validatorData, ClaimStatistic.Counter.IGNORED, 0);
+                }));
+    }
+
+    // LICENSE tests
+    protected List<TestData> execLicensesApprovedTest(final Option option, String[] args, Consumer<Path> extraSetup) {
+        Consumer<Path> setup = extraSetup.andThen(
+                basePath -> {
+                    DefaultLog.getInstance().warn("execLicensesApprovedTest setup for " + basePath);
+                    File baseDir = basePath.toFile();
+                    writeFile(baseDir, "catz.txt", "SPDX-License-Identifier: catz");
+                    writeFile(baseDir, "apl.txt", "SPDX-License-Identifier: Apache-2.0");
+                }
+        );
+
+        TestData test1 = new TestData(DataUtils.asDirName(option), NO_OPTIONS,
+                setup,
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating execLicensesApprovedTest for " + validatorData.getBaseDir());
+                    assertCounter(validatorData, ClaimStatistic.Counter.STANDARDS, 2);
+                    assertCounter(validatorData, ClaimStatistic.Counter.APPROVED, 1);
+                    assertCounter(validatorData, ClaimStatistic.Counter.UNAPPROVED, 1);
+                });
+
+        TestData test2 = new TestData("withoutLicenseDef", Collections.singletonList(ImmutablePair.of(option, args)),
+                setup,
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating execLicensesApprovedTest for " + validatorData.getBaseDir());
+                    assertCounter(validatorData, ClaimStatistic.Counter.STANDARDS, 2);
+                    assertCounter(validatorData, ClaimStatistic.Counter.APPROVED, 1);
+                    assertCounter(validatorData, ClaimStatistic.Counter.UNAPPROVED, 1);
+                });
+
+        Option configOpt = Arg.CONFIGURATION.option();
+        TestData test3 = new TestData("withLicenseDef", Arrays.asList(ImmutablePair.of(option, args),
+                ImmutablePair.of(configOpt, new String[]{".rat/catz.xml"})),
+                setup.andThen(mkRat).andThen(
+                        basePath -> {
+                            DefaultLog.getInstance().warn("withLicenseDef setup for " + basePath);
+                            DataUtils.generateSpdxConfig(basePath.resolve(".rat").resolve("catz.xml"), "catz", "catz");
+                        }),
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating execLicensesApprovedTest for " + validatorData.getBaseDir());
+                    assertCounter(validatorData, ClaimStatistic.Counter.STANDARDS, 2);
+                    assertCounter(validatorData, ClaimStatistic.Counter.APPROVED, 2);
+                    assertCounter(validatorData, ClaimStatistic.Counter.UNAPPROVED, 0);
+                });
+        return Arrays.asList(test1, test2, test3);
+    }
+
+    protected void helpLicenses(final Set<TestData> result, final Option option) {
+        PrintStream origin = System.out;
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        PrintStream out = new PrintStream(baos);
+
+        result.add(new TestData("stdOut",
+                Collections.singletonList(ImmutablePair.of(option, null)),
+                basePath -> {
+                    DefaultLog.getInstance().warn("helpLicenses setup for " + basePath);
+                    System.setOut(out);
+                },
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating helpLicenses for " + validatorData.getBaseDir());
+                    System.setOut(origin);
+                    String txt = baos.toString();
+                    TextUtils.assertContains("====== Licenses ======", txt);
+                    TextUtils.assertContains("====== Defined Matchers ======", txt);
+                    TextUtils.assertContains("====== Defined Families ======", txt);
+                }));
+    }
+
+    protected void licensesApprovedFileTest(final Set<TestData> result, final Option option) {
+        result.addAll(execLicensesApprovedTest(option, new String[]{".rat/licensesApproved.txt"},
+                mkRat.andThen(
+                        basePath -> {
+                            DefaultLog.getInstance().warn("licensesApprovedFileTest setup for " + basePath);
+                            writeFile(basePath.resolve(".rat").toFile(), "licensesApproved.txt", List.of("catz"));
+                        })));
+    }
+
+    protected void licensesApprovedTest(final Set<TestData> result, final Option option) {
+        result.addAll(execLicensesApprovedTest(option, new String[]{"catz"}, NO_SETUP));
+    }
+
+    private List<TestData> execLicensesDeniedTest(final Option option, final String[] args, Consumer<Path> setupFiles) {
+        Consumer<Path> setup = setupFiles.andThen(basePath -> {
+            DefaultLog.getInstance().warn("execLicensesDeniedTest setup for " + basePath);
+            File baseDir = basePath.toFile();
+            writeFile(baseDir, "illumousFile.java", "The contents of this file are " +
+                    "subject to the terms of the Common Development and Distribution License (the \"License\") You " +
+                    "may not use this file except in compliance with the License.");
+        });
+        TestData test1 = new TestData("ILLUMOS", Collections.singletonList(ImmutablePair.of(option, args)),
+                setup,
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating execLicensesDeniedTest for " + validatorData.getBaseDir());
+                    ClaimStatistic claimStatistic = validatorData.getStatistic();
+                    ClaimValidator validator = validatorData.getConfiguration().getClaimValidator();
+                    assertThat(validator.listIssues(claimStatistic)).containsExactly("UNAPPROVED");
+                });
+        return Collections.singletonList(test1);
+    }
+
+    protected void licensesDeniedTest(final Set<TestData> result, final Option option) {
+        result.addAll(execLicensesDeniedTest(option, new String[]{"ILLUMOS"}, NO_SETUP));
+    }
+
+    protected void licensesDeniedFileTest(final Set<TestData> result, final Option option) {
+        result.addAll(execLicensesDeniedTest(option, new String[]{"licensesDenied.txt"},
+                (basePath) -> writeFile(basePath.toFile(), "licensesDenied.txt", Collections.singletonList("ILLUMOS"))));
+    }
+
+    private List<TestData> execLicenseFamiliesApprovedTest(final Option option, final String[] args, Consumer<Path> extraSetup) {
+        Consumer<Path> setup = extraSetup.andThen(
+                basePath -> {
+                    DefaultLog.getInstance().warn("execLicenseFamiliesApprovedTest setup for " + basePath);
+                    File baseDir = basePath.toFile();
+                    writeFile(baseDir, "catz.txt", "SPDX-License-Identifier: catz");
+                });
+
+        TestData test1 = new TestData(DataUtils.asDirName(option), NO_OPTIONS,
+                setup,
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating execLicenseFamiliesApprovedTest for " + validatorData.getBaseDir());
+                    assertCounter(validatorData, ClaimStatistic.Counter.STANDARDS, 1);
+                    assertCounter(validatorData, ClaimStatistic.Counter.APPROVED, 0);
+                    assertCounter(validatorData, ClaimStatistic.Counter.UNAPPROVED, 1);
+                });
+
+        TestData test2 = new TestData("withoutLicenseDef", Collections.singletonList(ImmutablePair.of(option, args)),
+                setup,
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating execLicenseFamiliesApprovedTest for " + validatorData.getBaseDir());
+                    assertCounter(validatorData, ClaimStatistic.Counter.STANDARDS, 1);
+                    assertCounter(validatorData, ClaimStatistic.Counter.APPROVED, 0);
+                    assertCounter(validatorData, ClaimStatistic.Counter.UNAPPROVED, 1);
+                });
+        Option configOpt = Arg.CONFIGURATION.option();
+        TestData test3 = new TestData("withLicenseDef", Arrays.asList(ImmutablePair.of(option, args),
+                ImmutablePair.of(configOpt, new String[]{".rat/catz.xml"})),
+                setup.andThen(mkRat).andThen(
+                        basePath -> {
+                            DefaultLog.getInstance().warn("withLicenseDef setup for " + basePath);
+                            Path ratDir = basePath.resolve(".rat");
+                            Path catzXml = ratDir.resolve("catz.xml");
+                            DataUtils.generateSpdxConfig(catzXml, "catz", "catz");
+                        }),
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating execLicenseFamiliesApprovedTest for " + validatorData.getBaseDir());
+                    assertCounter(validatorData, ClaimStatistic.Counter.STANDARDS, 1);
+                    assertCounter(validatorData, ClaimStatistic.Counter.APPROVED, 1);
+                    assertCounter(validatorData, ClaimStatistic.Counter.UNAPPROVED, 0);
+                });
+        return Arrays.asList(test1, test2, test3);
+    }
+
+    protected void licenseFamiliesApprovedFileTest(final Set<TestData> result, final Option option) {
+        result.addAll(execLicenseFamiliesApprovedTest(option, new String[]{".rat/familiesApproved.txt"},
+                mkRat.andThen(basePath -> {
+                    DefaultLog.getInstance().warn("licenseFamiliesApprovedFileTest setup for " + basePath);
+                    writeFile(basePath.resolve(".rat").toFile(), "familiesApproved.txt", Collections.singletonList("catz"));
+                })));
+    }
+
+    protected void licenseFamiliesApprovedTest(final Set<TestData> result, final Option option) {
+        result.addAll(execLicenseFamiliesApprovedTest(option, new String[]{"catz"}, NO_SETUP));
+    }
+
+    private List<TestData> execLicenseFamiliesDeniedTest(final Option option, final String[] args, Consumer<Path> extraSetup) {
+        Consumer<Path> setup = extraSetup.andThen(
+                basePath -> {
+                    DefaultLog.getInstance().warn("execLicenseFamiliesDeniedTest setup for " + basePath);
+                    File baseDir = basePath.toFile();
+                    writeFile(baseDir, "bsd.txt", "SPDX-License-Identifier: BSD-3-Clause");
+                });
+
+        TestData test1 = new TestData(DataUtils.asDirName(option), NO_OPTIONS,
+                setup,
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating execLicenseFamiliesDeniedTest for " + validatorData.getBaseDir());
+                    assertCounter(validatorData, ClaimStatistic.Counter.STANDARDS, 1);
+                    assertCounter(validatorData, ClaimStatistic.Counter.APPROVED, 1);
+                    assertCounter(validatorData, ClaimStatistic.Counter.UNAPPROVED, 0);
+                });
+
+        TestData test2 = new TestData("", Collections.singletonList(ImmutablePair.of(option, args)),
+                setup,
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating execLicenseFamiliesDeniedTest for " + validatorData.getBaseDir());
+                    assertCounter(validatorData, ClaimStatistic.Counter.STANDARDS, 1);
+                    assertCounter(validatorData, ClaimStatistic.Counter.APPROVED, 0);
+                    assertCounter(validatorData, ClaimStatistic.Counter.UNAPPROVED, 1);
+                });
+
+        return Arrays.asList(test1, test2);
+    }
+
+    protected void licenseFamiliesDeniedFileTest(final Set<TestData> result, final Option option) {
+        result.addAll(execLicenseFamiliesDeniedTest(option, new String[]{".rat/familiesDenied.txt"},
+                mkRat.andThen(
+                        basePath -> {
+                            DefaultLog.getInstance().warn("licenseFamiliesDeniedFileTest setup for " + basePath);
+                            writeFile(basePath.resolve(".rat").toFile(), "familiesDenied.txt", Collections.singletonList("BSD-3"));
+                        })));
+    }
+
+    protected void licenseFamiliesDeniedTest(final Set<TestData> result, final Option option) {
+        result.addAll(execLicenseFamiliesDeniedTest(option, new String[]{"BSD-3"}, NO_SETUP));
+    }
+
+    protected void counterMaxTest(final Set<TestData> result, final Option option) {
+        result.add(new TestData(DataUtils.asDirName(option), Collections.singletonList(ImmutablePair.of(null, null)),
+                basePath -> {
+                    DefaultLog.getInstance().warn("counterMaxTest setup for " + basePath);
+                    File baseDir = basePath.toFile();
+                    writeFile(baseDir, "Test.java", Arrays.asList("/*\n", "SPDX-License-Identifier: Unapproved\n",
+                            "*/\n\n", "class Test {}\n"));
+                },
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating counterMaxTest for " + validatorData.getBaseDir());
+                    ClaimStatistic claimStatistic = validatorData.getStatistic();
+                    ClaimValidator validator = validatorData.getConfiguration().getClaimValidator();
+                    assertThat(validator.listIssues(claimStatistic)).containsExactly("UNAPPROVED");
+                }));
+
+        result.add(new TestData("Unapproved1", Collections.singletonList(ImmutablePair.of(option, new String[]{"Unapproved:1"})),
+                basePath -> {
+                    DefaultLog.getInstance().warn("counterMaxTest setup for " + basePath);
+                    File baseDir = basePath.toFile();
+                    writeFile(baseDir, "Test.java", Arrays.asList("/*\n", "SPDX-License-Identifier: Unapproved\n",
+                            "*/\n\n", "class Test {}\n"));
+                },
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating counterMaxTest for " + validatorData.getBaseDir());
+                    ClaimStatistic claimStatistic = validatorData.getStatistic();
+                    ClaimValidator validator = validatorData.getConfiguration().getClaimValidator();
+                    assertThat(validator.listIssues(claimStatistic)).isEmpty();
+                }));
+    }
+
+    protected void counterMinTest(final Set<TestData> result, final Option option) {
+        result.add(new TestData(DataUtils.asDirName(option), NO_OPTIONS,
+                basePath -> {
+                    DefaultLog.getInstance().warn("counterMinTest setup for " + basePath);
+                    File baseDir = basePath.toFile();
+                    writeFile(baseDir, "Test.java", Arrays.asList("/*\n", "SPDX-License-Identifier: Unapproved\n",
+                            "*/\n\n", "class Test {}\n"));
+                },
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating counterMinTest for " + validatorData.getBaseDir());
+                    ClaimStatistic claimStatistic = validatorData.getStatistic();
+                    ClaimValidator validator = validatorData.getConfiguration().getClaimValidator();
+                    assertThat(validator.listIssues(claimStatistic)).containsExactly("UNAPPROVED");
+                }));
+
+        result.add(new TestData("", Collections.singletonList(ImmutablePair.of(option, new String[]{"Unapproved:1"})),
+                basePath -> {
+                    DefaultLog.getInstance().warn("counterMinTest setup for " + basePath);
+                    File baseDir = basePath.toFile();
+                    writeFile(baseDir, "Test.java", Arrays.asList("/*\n", "SPDX-License-Identifier: Unapproved\n",
+                            "*/\n\n", "class Test {}\n"));
+                },
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating counterMinTest for " + validatorData.getBaseDir());
+                    ClaimStatistic claimStatistic = validatorData.getStatistic();
+                    ClaimValidator validator = validatorData.getConfiguration().getClaimValidator();
+                    assertThat(validator.listIssues(claimStatistic)).isEmpty();
+                }));
+    }
+
+    /**
+     * Add results to the result list.
+     *
+     * @param result the result list.
+     * @param option configuration option we are testing.
+     */
+    protected void configTest(final Set<TestData> result, final Option option) {
+        Consumer<Path> setup = mkRat.andThen(basePath -> {
+            DefaultLog.getInstance().warn("configTest setup for " + basePath);
+            Path ratDir = basePath.resolve(".rat");
+            Path oneXml = ratDir.resolve("One.xml");
+            DataUtils.generateTextConfig(oneXml, "ONE", "one");
+
+            Path twoXml = ratDir.resolve("Two.xml");
+            DataUtils.generateTextConfig(twoXml, "TWO", "two");
+
+            File baseDir = basePath.toFile();
+            writeFile(baseDir, "bsd.txt", "SPDX-License-Identifier: BSD-3-Clause");
+            writeFile(baseDir, "one.txt", "one is the loneliest number");
+        });
+        String[] args = {".rat/One.xml", ".rat/Two.xml"};
+
+        ImmutablePair<Option, String[]> underTest = ImmutablePair.of(option, args);
+
+        result.add(new TestData(DataUtils.asDirName(option), NO_OPTIONS,
+                setup,
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating configTest for " + validatorData.getBaseDir());
+                    assertCounter(validatorData, ClaimStatistic.Counter.STANDARDS, 2);
+                    assertCounter(validatorData, ClaimStatistic.Counter.APPROVED, 1);
+                    assertCounter(validatorData, ClaimStatistic.Counter.UNAPPROVED, 1);
+                }));
+
+        result.add(new TestData("withDefaults", Collections.singletonList(underTest),
+                setup,
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating configTest for " + validatorData.getBaseDir());
+                    assertCounter(validatorData, ClaimStatistic.Counter.STANDARDS, 2);
+                    assertCounter(validatorData, ClaimStatistic.Counter.APPROVED, 2);
+                    assertCounter(validatorData, ClaimStatistic.Counter.UNAPPROVED, 0);
+                }));
+
+        if (!Arg.CONFIGURATION_NO_DEFAULTS.isEmpty()) {
+            result.add(new TestData("noDefaults", Arrays.asList(underTest,
+                    ImmutablePair.of(Arg.CONFIGURATION_NO_DEFAULTS.find("configuration-no-defaults"), null)),
+                    setup,
+                    /** Make validator data a structure with counter countes  and file checks. */
+                    validatorData -> {
+                        DefaultLog.getInstance().warn("validating configTest for " + validatorData.getBaseDir());
+                        assertCounter(validatorData, ClaimStatistic.Counter.STANDARDS, 2);
+                        assertCounter(validatorData, ClaimStatistic.Counter.APPROVED, 1);
+                        assertCounter(validatorData, ClaimStatistic.Counter.UNAPPROVED, 1);
+                    }));
+        }
+    }
+
+    protected void configurationNoDefaultsTest(final Set<TestData> result, final Option option) {
+        TestData test1 = new TestData("", Collections.singletonList(ImmutablePair.of(option, null)),
+                basePath -> {
+                    DefaultLog.getInstance().warn("configurationNoDefaultsTest setup for " + basePath);
+                    File baseDir = basePath.toFile();
+                    writeFile(baseDir, "Test.java", Arrays.asList("/*\n", "SPDX-License-Identifier: Apache-2.0\n",
+                            "*/\n\n", "class Test {}\n"));
+                },
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating configurationNoDefaultsTest for " + validatorData.getBaseDir());
+                    assertThat(validatorData.getConfiguration().getLicenses(LicenseSetFactory.LicenseFilter.ALL)).isEmpty();
+                });
+        test1.setException(NO_LICENSES_EXCEPTION);
+        result.add(test1);
+    }
+
+    protected void dryRunTest(final Set<TestData> result, final Option option) {
+        result.add(new TestData("stdRun", Collections.singletonList(ImmutablePair.of(option, null)),
+                NO_SETUP,
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating dryRunTest for " + validatorData.getBaseDir());
+                    assertThat(validatorData.getConfiguration().isDryRun()).as("testing getConfiguration().isDryRun() flag").isTrue();
+                }));
+
+        result.add(new TestData(DataUtils.asDirName(option), NO_OPTIONS,
+                NO_SETUP,
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating dryRunTest for " + validatorData.getBaseDir());
+                    assertThat(validatorData.getConfiguration().isDryRun()).as("testing getConfiguration().isDryRun() flag").isFalse();
+                }));
+    }
+
+    protected void editCopyrightTest(final Set<TestData> result, final Option option) {
+        Consumer<Path> setup = basePath -> {
+            DefaultLog.getInstance().warn("editCopyrightTest setup for " + basePath);
+            File baseDir = basePath.toFile();
+            writeFile(baseDir, "Missing.java", Arrays.asList("/* no license */\n\n", "class Test {}\n"));
+        };
+        ImmutablePair<Option, String[]> copyright = ImmutablePair.of(option, new String[]{"MyCopyright"});
+        if (Arg.EDIT_ADD.isEmpty()) {
+            throw new RuntimeException("Can not execute copyright tests without an EDIT_ADD option avialable");
+        }
+        ImmutablePair<Option, String[]> editLicense = ImmutablePair.of(Arg.EDIT_ADD.option(), null);
+
+        result.add(new TestData("noEditLicense", Collections.singletonList(copyright),
+                setup,
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating editCopyrightTest for " + validatorData.getBaseDir());
+                    try {
+                        String actualText = TextUtils.readFile(validatorData.getBaseDir().resolve("Missing.java").toFile());
+                        TextUtils.assertNotContains("MyCopyright", actualText);
+                    } catch (IOException ex) {
+                        throw new RuntimeException(ex);
+                    }
+                }));
+
+        result.add(new TestData(DataUtils.asDirName(editLicense.getLeft()), Arrays.asList(copyright, editLicense),
+                setup,
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating editCopyrightTest for " + validatorData.getBaseDir());
+                    try {
+                        String actualText = TextUtils.readFile(validatorData.getBaseDir().resolve("Missing.java").toFile());
+                        TextUtils.assertNotContains("MyCopyright", actualText);
+                        assertThat(validatorData.getBaseDir().resolve("Missing.java.new")).exists();
+                        actualText = TextUtils.readFile(validatorData.getBaseDir().resolve("Missing.java.new").toFile());
+                        TextUtils.assertContains("MyCopyright", actualText);
+                    } catch (IOException ex) {
+                        throw new RuntimeException(ex);
+                    }
+                }));
+
+        if (!Arg.DRY_RUN.isEmpty()) {
+            Option dryRun = Arg.DRY_RUN.option();
+            result.add(new TestData(DataUtils.asDirName(dryRun),
+                    Arrays.asList(copyright, ImmutablePair.of(dryRun, null), editLicense),
+                    setup,
+                    validatorData -> {
+                        DefaultLog.getInstance().warn("validating editCopyrightTest for " + validatorData.getBaseDir());
+                        try {
+                            String actualText = TextUtils.readFile(validatorData.getBaseDir().resolve("Missing.java").toFile());
+                            TextUtils.assertNotContains("MyCopyright", actualText);
+                        } catch (IOException ex) {
+                            throw new RuntimeException(ex);
+                        }
+                        assertThat(validatorData.getBaseDir().resolve("Missing.java.new")).doesNotExist();
+                    }));
+        }
+
+        if (!Arg.EDIT_OVERWRITE.isEmpty()) {
+            Option overwrite = Arg.EDIT_OVERWRITE.option();
+            result.add(new TestData(DataUtils.asDirName(overwrite), Arrays.asList(copyright, editLicense, ImmutablePair.of(overwrite, null)),
+                    setup,
+                    validatorData -> {
+                        DefaultLog.getInstance().warn("validating editCopyrightTest for " + validatorData.getBaseDir());
+                        try {
+                            String actualText = TextUtils.readFile(validatorData.getBaseDir().resolve("Missing.java").toFile());
+                            TextUtils.assertContains("MyCopyright", actualText);
+                            assertThat(validatorData.getBaseDir().resolve("Missing.java.new")).doesNotExist();
+                        } catch (IOException ex) {
+                            throw new RuntimeException(ex);
+                        }
+                    }));
+        }
+    }
+
+    protected void editLicenseTest(final Set<TestData> result, final Option option) {
+        result.add(new TestData("", Collections.singletonList(ImmutablePair.of(option, null)),
+                basePath -> {
+                    DefaultLog.getInstance().warn("editLicenseTest setup for " + basePath);
+                    File baseDir = basePath.toFile();
+                    writeFile(baseDir, "NoLicense.java", "class NoLicense {}");
+                },
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating editLicenseTest for " + validatorData.getBaseDir());
+                    try {
+                        assertThat(validatorData.getStatistic()).isNotNull();
+                        File javaFile = validatorData.getBaseDir().resolve("NoLicense.java").toFile();
+                        String contents = String.join("\n", IOUtils.readLines(new FileReader(javaFile, StandardCharsets.UTF_8)));
+                        assertThat(contents).isEqualTo("class NoLicense {}");
+                        File resultFile = validatorData.getBaseDir().resolve("NoLicense.java.new").toFile();
+                        assertThat(resultFile).exists();
+                        contents = String.join("\n", IOUtils.readLines(new FileReader(resultFile, StandardCharsets.UTF_8)));
+                        assertThat(contents).isEqualTo("""
+                                /*
+                                 * Licensed to the Apache Software Foundation (ASF) under one
+                                 * or more contributor license agreements.  See the NOTICE file
+                                 * distributed with this work for additional information
+                                 * regarding copyright ownership.  The ASF licenses this file
+                                 * to you under the Apache License, Version 2.0 (the
+                                 * "License"); you may not use this file except in compliance
+                                 * with the License.  You may obtain a copy of the License at
+                                 *\s
+                                 *   http://www.apache.org/licenses/LICENSE-2.0
+                                 *\s
+                                 * Unless required by applicable law or agreed to in writing,
+                                 * software distributed under the License is distributed on an
+                                 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+                                 * KIND, either express or implied.  See the License for the
+                                 * specific language governing permissions and limitations
+                                 * under the License.
+                                 */
+                                
+                                class NoLicense {}""");
+                    } catch (IOException e) {
+                        throw new RuntimeException(e);
+                    }
+                }));
+    }
+
+    protected void editOverwriteTest(final Set<TestData> result, final Option option) {
+        result.add(new TestData("noEditLicense", Collections.singletonList(ImmutablePair.of(option, null)),
+                NO_SETUP,
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating editOverwriteTest for " + validatorData.getBaseDir());
+                    assertThat(validatorData.getConfiguration().isAddingLicensesForced())
+                            .describedAs("Without edit-license should be false").isFalse();
+                }));
+
+        if (!Arg.EDIT_ADD.isEmpty()) {
+            result.add(new TestData("", Arrays.asList(ImmutablePair.of(option, null),
+                    ImmutablePair.of(Arg.EDIT_ADD.find("edit-license"), null)),
+                    NO_SETUP,
+                    validatorData -> {
+                        DefaultLog.getInstance().warn("validating editOverwriteTest for " + validatorData.getBaseDir());
+                        assertThat(validatorData.getConfiguration().isAddingLicensesForced())
+                                .as("testing getConfiguration().isAddingLicensesForced() flag").isTrue();
+                    }));
+        }
+    }
+
+    protected void logLevelTest(final Set<TestData> result, final Option option) {
+        final TestingLog testingLog = new TestingLog();
+
+        Consumer<Path> setup = basePath -> {
+            DefaultLog.getInstance().warn("logLevelTest setup for " + basePath);
+            DefaultLog.setInstance(testingLog);
+            testingLog.clear();
+        };
+
+        result.add(new TestData(Log.Level.INFO.name(),
+                Collections.singletonList(ImmutablePair.of(option, new String[]{Log.Level.INFO.name()})),
+                setup,
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating logLevelTest for " + validatorData.getBaseDir());
+                    try {
+                        testingLog.assertNotContains("DEBUG");
+                    } finally {
+                        DefaultLog.setInstance(null);
+                    }
+                }));
+
+        result.add(new TestData(Log.Level.DEBUG.name(),
+                Collections.singletonList(ImmutablePair.of(option, new String[]{Log.Level.DEBUG.name()})),
+                setup,
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating logLevelTest for " + validatorData.getBaseDir());
+                    try {
+                        testingLog.assertContains("DEBUG");
+                    } finally {
+                        DefaultLog.setInstance(null);
+                    }
+                }));
+    }
+
+    protected void outputArchiveTest(final Set<TestData> result, final Option option) {
+        for (ReportConfiguration.Processing processing : ReportConfiguration.Processing.values()) {
+            result.add(new TestData(processing.name().toLowerCase(Locale.ROOT),
+                    Collections.singletonList(ImmutablePair.of(option, new String[]{processing.name()})),
+                    basePath -> {
+                        DefaultLog.getInstance().warn("outputArchiveTest setup for " + basePath);
+                        File localArchive = new File(basePath.toFile(), "dummy.jar");
+                        try (InputStream in = ReportTestDataProvider.class.getResourceAsStream("/tikaFiles/archive/dummy.jar");
+                             OutputStream out = Files.newOutputStream(localArchive.toPath())) {
+                            Objects.requireNonNull(in);
+                            IOUtils.copy(in, out);
+                        } catch (IOException e) {
+                            throw new RuntimeException(e);
+                        }
+                    },
+                    validatorData -> {
+                        DefaultLog.getInstance().warn("validating outputArchiveTest for " + validatorData.getBaseDir());
+                        Document document = validatorData.getDocument();
+                        try {
+                            XmlUtils.assertIsPresent(processing.name(), document, xpath, "/rat-report/resource[@name='/dummy.jar']");
+                            switch (processing) {
+                                case ABSENCE:
+                                    XmlUtils.assertIsPresent(processing.name(), document, xpath, "/rat-report/resource[@name='/dummy.jar']/license[@family='AL   ']");
+                                    XmlUtils.assertIsPresent(processing.name(), document, xpath, "/rat-report/resource[@name='/dummy.jar']/license[@family='?????']");
+                                    break;
+                                case PRESENCE:
+                                    XmlUtils.assertIsPresent(processing.name(), document, xpath, "/rat-report/resource[@name='/dummy.jar']/license[@family='AL   ']");
+                                    XmlUtils.assertIsNotPresent(processing.name(), document, xpath, "/rat-report/resource[@name='/dummy.jar']/license[@family='?????']");
+                                    break;
+                                case NOTIFICATION:
+                                    XmlUtils.assertIsNotPresent(processing.name(), document, xpath, "/rat-report/resource[@name='/dummy.jar']/license[@family='AL   ']");
+                                    XmlUtils.assertIsNotPresent(processing.name(), document, xpath, "/rat-report/resource[@name='/dummy.jar']/license[@family='?????']");
+                                    break;
+                                default:
+                                    throw new IllegalArgumentException("Unexpected processing " + processing);
+                            }
+                        } catch (XPathExpressionException e) {
+                            throw new RuntimeException(e);
+                        }
+                    })
+            );
+        }
+    }
+
+    protected void outputFamiliesTest(final Set<TestData> result, final Option option) {
+        for (LicenseSetFactory.LicenseFilter filter : LicenseSetFactory.LicenseFilter.values()) {
+            result.add(new TestData(filter.name().toLowerCase(Locale.ROOT),
+                    Collections.singletonList(ImmutablePair.of(option, new String[]{filter.name()})),
+                    NO_SETUP,
+                    validatorData -> {
+                        DefaultLog.getInstance().warn("validating outputFamiliesTest for " + validatorData.getBaseDir());
+                        Document document = validatorData.getDocument();
+                        try {
+                            switch (filter) {
+                                case ALL:
+                                    XmlUtils.assertIsPresent(filter.name(), document, xpath, "/rat-report/rat-config/families/family[@id='AL']");
+                                    XmlUtils.assertIsPresent(filter.name(), document, xpath, "/rat-report/rat-config/families/family[@id='GPL']");
+                                    break;
+                                case APPROVED:
+                                    XmlUtils.assertIsPresent(filter.name(), document, xpath, "/rat-report/rat-config/families/family[@id='AL']");
+                                    XmlUtils.assertIsNotPresent(filter.name(), document, xpath, "/rat-report/rat-config/families/family[@id='GPL']");
+                                    break;
+                                case NONE:
+                                    XmlUtils.assertIsNotPresent(filter.name(), document, xpath, "/rat-report/rat-config/families/family[@id='AL']");
+                                    XmlUtils.assertIsNotPresent(filter.name(), document, xpath, "/rat-report/rat-config/families/family[@id='GPL']");
+                                    break;
+                                default:
+                                    throw new IllegalArgumentException("Unexpected filter: " + filter);
+                            }
+                        } catch (XPathExpressionException e) {
+                            throw new RuntimeException(e);
+                        }
+                    })
+            );
+        }
+    }
+
+    protected void outputFileTest(final Set<TestData> result, final Option option) {
+        result.add(new TestData("", Collections.singletonList(ImmutablePair.of(option, new String[]{"outexample"})),
+                basePath -> {
+                    DefaultLog.getInstance().warn("outputFileTest setup for " + basePath);
+                    File baseDir = basePath.toFile();
+                    writeFile(baseDir, "apl.txt", "SPDX-License-Identifier: Apache-2.0");
+                },
+                validatorData -> {
+                    DefaultLog.getInstance().warn("validating outputFamiliesTest for " + validatorData.getBaseDir());
+                    assertCounter(validatorData, ClaimStatistic.Counter.STANDARDS, 1);
+                    assertCounter(validatorData, ClaimStatistic.Counter.APPROVED, 1);
+                    assertCounter(validatorData, ClaimStatistic.Counter.UNAPPROVED, 0);
+                    File outFile = validatorData.getBaseDir().resolve("outexample").toFile();
+
+                    try {
+                        String actualText = TextUtils.readFile(outFile);
+                        TextUtils.assertPatternInTarget("Apache License 2.0: \\d", actualText);
+                        TextUtils.assertPatternInTarget("STANDARD:\\s+\\d", actualText);
+                    } catch (IOException e) {
+                        throw new RuntimeException(e);
+                    }
+                })
+        );
+    }
+
+    protected void outputLicensesTest(final Set<TestData> result, final Option option) {
+        for (LicenseSetFactory.LicenseFilter filter : LicenseSetFactory.LicenseFilter.values()) {
+            result.add(new TestData(filter.name(), Collections.singletonList(ImmutablePair.of(option, new String[]{filter.name()})),
+                    NO_SETUP,
+                    validatorData -> {
+                        DefaultLog.getInstance().warn("validating outputLicensesTest for " + validatorData.getBaseDir());
+                        Document document = validatorData.getDocument();
+                        try {
+                            switch (filter) {
+                                case ALL:
+                                    XmlUtils.assertIsPresent(filter.name(), document, xpath, "/rat-report/rat-config/licenses/license[@id='AL2.0']");
+                                    XmlUtils.assertIsPresent(filter.name(), document, xpath, "/rat-report/rat-config/licenses/license[@id='GPL1']");
+                                    break;
+                                case APPROVED:
+                                    XmlUtils.assertIsPresent(filter.name(), document, xpath, "/rat-report/rat-config/licenses/license[@id='AL2.0']");
+                                    XmlUtils.assertIsNotPresent(filter.name(), document, xpath, "/rat-report/rat-config/licenses/license[@id='GPL1']");
+                                    break;
+                                case NONE:
+                                    XmlUtils.assertIsNotPresent(filter.name(), document, xpath, "/rat-report/rat-config/licenses/license[@id='AL2.0']");
+                                    XmlUtils.assertIsNotPresent(filter.name(), document, xpath, "/rat-report/rat-config/licenses/license[@id='GPL1']");
+                                    break;
+                                default:
+                                    throw new IllegalArgumentException("Unexpected filter: " + filter);
+                            }
+                        } catch (XPathExpressionException e) {
+                            throw new RuntimeException(e);
+                        }
+                    }));
+        }
+    }
+
+
+    protected void outputStandardTest(final Set<TestData> result, final Option option) {
+        for (ReportConfiguration.Processing proc : ReportConfiguration.Processing.values()) {
+            result.add(new TestData(proc.name().toLowerCase(Locale.ROOT), Collections.singletonList(ImmutablePair.of(option, new String[]{proc.name()})),
+                    basePath -> {
+                        DefaultLog.getInstance().warn("outputStandardTest setup for " + basePath);
+                        File baseDir = basePath.toFile();
+                        writeFile(baseDir, "Test.java", Arrays.asList("/*\n", "SPDX-License-Identifier: Apache-2.0\n",
+                                "*/\n\n", "class Test {}\n"));
+                        writeFile(baseDir, "Missing.java", Arrays.asList("/* no license */\n\n", "class Test {}\n"));
+                    },
+                    validatorData -> {
+                        DefaultLog.getInstance().warn("validating outputStandardTest for " + validatorData.getBaseDir());
+                        Document document = validatorData.getDocument();
+                        String testDoc = "/rat-report/resource[@name='/Test.java']";
+                        String missingDoc = "/rat-report/resource[@name='/Missing.java']";
+                        try {
+                            XmlUtils.assertIsPresent(proc.name(), document, xpath, testDoc);
+                            XmlUtils.assertIsPresent(proc.name(), document, xpath, missingDoc);
+
+                            switch (proc) {
+                                case ABSENCE:
+                                    XmlUtils.assertIsPresent(proc.name(), document, xpath, testDoc + "/license[@family='AL   ']");
+                                    XmlUtils.assertIsPresent(proc.name(), document, xpath, missingDoc + "/license[@family='?????']");
+                                    break;
+                                case PRESENCE:
+                                    XmlUtils.assertIsPresent(proc.name(), document, xpath, testDoc + "/license[@family='AL   ']");
+                                    XmlUtils.assertIsNotPresent(proc.name(), document, xpath, missingDoc + "/license[@family='?????']");
+                                    break;
+                                case NOTIFICATION:
+                                    XmlUtils.assertIsNotPresent(proc.name(), document, xpath, testDoc + "/license[@family='AL   ']");
+                                    XmlUtils.assertIsNotPresent(proc.name(), document, xpath, missingDoc + "/license[@family='?????']");
+                                    break;
+                                default:
+                                    throw new IllegalArgumentException("Unexpected processing " + proc);
+                            }
+                        } catch (XPathExpressionException ex) {
+                            throw new RuntimeException(ex);
+                        }
+                    }));
+        }
+    }
+
+
+    protected void outputStyleTest(final Set<TestData> result, final Option option) {
+        Consumer<Path> createFile = basePath -> {
+            DefaultLog.getInstance().warn("outputStyleTest setup for " + basePath);
+            File baseDir = basePath.toFile();
+            writeFile(baseDir, "Test.java", Arrays.asList("/*\n", "SPDX-License-Identifier: Apache-2.0\n",
+                    "*/\n\n", "class Test {}\n"));
+            writeFile(baseDir, "Missing.java", Arrays.asList("/* no license */\n\n", "class Test {}\n"));
+        };
+
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        if (!option.hasArg()) {
+            if (option.getLongOpt().equals("xml")) {
+                result.add(new TestData("", Collections.singletonList(ImmutablePair.of(option, null)),
+                        createFile,
+                        validatorData -> {
+                            DefaultLog.getInstance().warn("validating outputStyleTest for " + validatorData.getBaseDir());
+                            try (InputStream expected = StyleSheets.XML.getStyleSheet().ioSupplier().get();
+                                 InputStream actual = validatorData.getConfiguration().getStyleSheet().get()) {
+                                assertThat(IOUtils.contentEquals(expected, actual)).as(() -> String.format("'%s' does not match", StyleSheets.XML)).isTrue();
+                                baos.reset();
+                                validatorData.getOutput().format(validatorData.getConfiguration().getStyleSheet(), () -> baos);
+                                String actualText = baos.toString();
+                                TextUtils.assertContainsExactly(1, "<resource encoding=\"ISO-8859-1\" mediaType=\"text/x-java-source\" name=\"/Test.java\" type=\"STANDARD\">", actualText);
+                                TextUtils.assertContainsExactly(1, "<resource encoding=\"ISO-8859-2\" mediaType=\"text/x-java-source\" name=\"/Missing.java\" type=\"STANDARD\">", actualText);
+                            } catch (IOException | RatException e) {
+                                throw new RuntimeException(e);
+                            }
+                        }));
+            }
+        } else {
+            for (StyleSheets sheet : StyleSheets.values()) {
+                result.add(new TestData(sheet.name().toLowerCase(Locale.ROOT), Collections.singletonList(ImmutablePair.of(option, new String[]{sheet.arg()})),
+                        createFile,
+                        validatorData -> {
+                            DefaultLog.getInstance().warn("validating outputStyleTest for " + validatorData.getBaseDir());
+                            try (InputStream expected = sheet.getStyleSheet().ioSupplier().get();
+                                 InputStream actual = validatorData.getConfiguration().getStyleSheet().get()) {
+                                assertThat(IOUtils.contentEquals(expected, actual)).as(() -> String.format("'%s' does not match", sheet)).isTrue();
+                                baos.reset();
+                                validatorData.getOutput().format(validatorData.getConfiguration().getStyleSheet(), () -> baos);
+                                String actualText = baos.toString();
+                                switch (sheet) {
+                                    case MISSING_HEADERS:
+                                        TextUtils.assertContainsExactly(1, "Files with missing headers:" + System.lineSeparator() +
+                                                "  /Missing.java", actualText);
+                                        break;
+                                    case PLAIN:
+                                        TextUtils.assertContainsExactly(1, "Unknown license: 1 ", actualText);
+                                        TextUtils.assertContainsExactly(1, "?????: 1 ", actualText);
+                                        break;
+                                    case XML:
+                                        TextUtils.assertContainsExactly(1, "<resource encoding=\"ISO-8859-1\" mediaType=\"text/x-java-source\" name=\"/Test.java\" type=\"STANDARD\">", actualText);
+                                        TextUtils.assertContainsExactly(1, "<resource encoding=\"ISO-8859-2\" mediaType=\"text/x-java-source\" name=\"/Missing.java\" type=\"STANDARD\">", actualText);
+                                        break;
+                                    case UNAPPROVED_LICENSES:
+                                        TextUtils.assertContainsExactly(1, "Files with unapproved licenses:" + System.lineSeparator() + "  /Missing.java", actualText);
+                                        break;
+                                    case XHTML5:
+                                        TextUtils.assertPatternInTarget("<td>Approved<\\/td>\\s+<td>\\d+<\\/td>\\s+<td>A count of approved licenses.<\\/td>", actualText);
+                                        break;
+                                    default:
+                                        fail("No test for stylesheet " + sheet);
+                                        break;
+                                }
+                            } catch (IOException | RatException e) {
+                                throw new RuntimeException(e);
+                            }
+                        }));
+            }
+
+            result.add(new TestData("fileStyleSheet",
+                    Collections.singletonList(ImmutablePair.of(option, new String[]{"fileStyleSheet.xslt"})),
+                    basePath -> {
+                        DefaultLog.getInstance().warn("outputStyleTest setup for " + basePath);
+                        DocumentName name = DocumentName.builder().setName("fileStyleSheet.xslt")
+                                .setBaseName(basePath.toString()).build();
+                        try (FileWriter fileWriter = new FileWriter(name.asFile(), StandardCharsets.UTF_8);
+                             XmlWriter writer = new XmlWriter(fileWriter)) {
+                            writer.startDocument()
+                                    .comment(DataUtils.ASF_TEXT)
+                                    .openElement("xsl:stylesheet")
+                                    .attribute("version", "1.0")
+                                    .attribute("xmlns:xsl", "http://www.w3.org/1999/XSL/Transform")
+                                    .openElement("xsl:template")
+                                    .attribute("match", "@*|node()")
+                                    .content("Hello World")
+                                    .closeDocument();
+                        } catch (IOException e) {
+                            fail(e.getMessage(), e);
+                        }
+                    },
+
+                    validatorData -> {
+                        DefaultLog.getInstance().warn("validating outputStyleTest for " + validatorData.getBaseDir());
+                        try (InputStream expected = StyleSheets.getStyleSheet("fileStyleSheet.xslt", validatorData.getBaseName()).ioSupplier().get();
+                             InputStream actual = validatorData.getConfiguration().getStyleSheet().get()) {
+                            assertThat(IOUtils.contentEquals(expected, actual)).as(() -> "'fileStyleSheet.xslt' does not match").isTrue();
+                            baos.reset();
+                            validatorData.getOutput().format(validatorData.getConfiguration().getStyleSheet(), () -> baos);
+                            String actualText = baos.toString();
+                            TextUtils.assertContainsExactly(1, "Hello World", actualText);
+                        } catch (IOException | RatException e) {
+                            throw new RuntimeException(e);
+                        }
+                    }));
+        }
+    }
+}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/data/TestData.java b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/data/TestData.java
new file mode 100644
index 000000000..84c8c213f
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/data/TestData.java
@@ -0,0 +1,232 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.testhelpers.data;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Consumer;
+import org.apache.commons.cli.Option;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.commons.text.WordUtils;
+import org.apache.rat.ui.ArgumentTracker;
+import org.apache.rat.utils.CasedString;
+import org.apache.rat.utils.FileUtils;
+
+/**
+ * The definition of a test.
+ */
+public final class TestData implements Comparable<TestData> {
+    /** if set, the expected exception from the test. */
+    private Exception expectedException;
+    /** The sub name of the test */
+    private final String name;
+    /** The command line for the test */
+    private final List<ImmutablePair<Option, String[]>> commandLine;
+    /** A function to set up the test in a specific path */
+    private final Consumer<Path> setupFiles;
+    /** A function to test the results of the test. */
+    private final Consumer<ValidatorData> validator;
+
+    /**
+     * Constructs the Test data
+     * @param name the sub name of the test.  May not be {@code null} but may be an empty string.  Should
+     * be specified in Camel case for multiple words.
+     * @param commandLine The command line for the test.  May not be {@code null} but may consist of a single {@link ImmutablePair#nullPair()}.
+     * @param setupFiles the method to set up the files for the test. May not be {@code null}.
+     * @param validator the validator for the results of the test. May not be {@code null}.
+     */
+    public TestData(String name, List<ImmutablePair<Option, String[]>> commandLine,
+             Consumer<Path> setupFiles,
+             Consumer<ValidatorData> validator) {
+        Objects.requireNonNull(name, " name cannot be null");
+        Objects.requireNonNull(commandLine, "commandLine cannot be null");
+        Objects.requireNonNull(setupFiles, "setupFiles cannot be null");
+        Objects.requireNonNull(validator, "validator cannot be null");
+        if (name.contains("/")) {
+            throw new IllegalArgumentException("name may not contain '/', use camel case instead");
+        }
+        if (commandLine.isEmpty()) {
+            throw new IllegalArgumentException("commandLine may not be empty but contain an ImmutablePair.nullPair()");
+        }
+        this.name = name;
+        this.commandLine = commandLine;
+        this.setupFiles = setupFiles;
+        this.validator = validator;
+        this.expectedException = null;
+    }
+
+    @Override
+    public String toString() {
+        return getTestName();
+    }
+
+    /**
+     * Sets the exception expected from this test.
+     * @param expectedException the expected exception.
+     */
+    void setException(Exception expectedException) {
+        this.expectedException = expectedException;
+    }
+
+    /**
+     * The option for the test.  This is the first option specified in the command line.
+     * If the command line is empty this returns {@code null}.
+     * @return the first option in the command line or {@code null} if there is no option.
+     */
+    public Option getOption() {
+        return commandLine.get(0).getLeft();
+    }
+
+    /**
+     * Get the sub name for this test.
+     * @return the sub name for this test.
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Gets the expected exception or {@code null} if not exception is expected.
+     * @return the expected exception or {@code null} if not exception is expected.
+     */
+    public Exception getExpectedException() {
+        return expectedException;
+    }
+
+    /**
+     * Determines if the test is expecting an exception.
+     * @return {@code true} if the test is expecting to throw an exception.
+     */
+    public boolean expectingException() {
+        return expectedException != null;
+    }
+
+    /**
+     * Gets the command line as the string objects that are normally parsed by the
+     * command line parser.
+     * @return the command line strings.
+     */
+    public String[] getCommandLine() {
+        return getCommandLine(null);
+    }
+
+    /**
+     * Gets the command line as the string objects that are normally parsed by the
+     * command line parser. The result will include "--" to terminate a trailing multi
+     * argument option.
+     * @param workingDir the directory to add to the command line.  May be {@code null}.
+     * @return the command line strings.
+     */
+    public String[] getCommandLine(String workingDir) {
+        List<String> args = new ArrayList<>(commandLine.size());
+        final boolean[] lastWasMultiArg = {false};
+        commandLine.forEach(pair -> {
+            if (pair.getKey() != null) {
+                if (pair.getKey().hasLongOpt()) {
+                    args.add("--" + pair.getKey().getLongOpt());
+                } else {
+                    args.add("-" + pair.getKey().getOpt());
+                }
+                if (pair.getValue() != null) {
+                    args.addAll(Arrays.asList(pair.getValue()));
+                }
+                lastWasMultiArg[0] = pair.getKey().hasArgs();
+            } else {
+                lastWasMultiArg[0] = false;
+            }
+        });
+        if (lastWasMultiArg[0]) {
+            args.add("--");
+        }
+        if (workingDir != null) {
+            args.add(workingDir);
+        }
+        return args.toArray(new String[0]);
+    }
+
+    /**
+     * Get the arguments for the command line.
+     * @return the arguments for the command line as Option, String[] pairs.
+     */
+    public List<? extends Pair<Option, String[]>> getArgs() {
+        return commandLine;
+    }
+
+    /**
+     * Gets the validator for the test.
+     * @return the validator for the test.
+     */
+    public Consumer<ValidatorData> getValidator() {
+        return validator;
+    }
+
+    /**
+     * Sets up the files for the test.
+     * @param path the path to use as the base directory.  Subdirectories and files may be added
+     * to this path.
+     */
+    public void setupFiles(Path path) {
+        FileUtils.mkDir(path.toFile());
+        setupFiles.accept(path);
+    }
+
+    /**
+     * Gets the test name.  This is the option concatenated with the name.
+     * @return the unique test name
+     */
+    public String getTestName() {
+         new ArrayList<>();
+        String result = null;
+        if (getOption() == null) {
+            result = name + "_DefaultTest";
+        } else {
+            result = new CasedString(CasedString.StringCase.KEBAB, ArgumentTracker.extractKey(getOption())).toString();
+            if (!name.isEmpty()) {
+                result += "/" + name;
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Gets the test name as a class name.  This is based on the option concatenated with the name.
+     * @return the unique Java class name
+     */
+    public String getClassName() {
+        if (getOption() == null) {
+            return WordUtils.capitalize(name) + "_DefaultTest";
+        } else {
+            List<String> parts = new ArrayList<>(Arrays.asList(new CasedString(CasedString.StringCase.KEBAB, ArgumentTracker.extractKey(getOption())).getSegments()));
+            if (!name.isEmpty()) {
+                parts.addAll(Arrays.asList(new CasedString(CasedString.StringCase.CAMEL, name).getSegments()));
+            }
+            return CasedString.StringCase.PASCAL.assemble(parts.toArray(new String[0]));
+        }
+    }
+
+    @Override
+    public int compareTo(TestData other) {
+        return getTestName().compareTo(other.getTestName());
+    }
+
+}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/data/ValidatorData.java b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/data/ValidatorData.java
new file mode 100644
index 000000000..a4745fe4f
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/data/ValidatorData.java
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.testhelpers.data;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import org.apache.rat.ReportConfiguration;
+import org.apache.rat.Reporter;
+import org.apache.rat.document.DocumentName;
+import org.apache.rat.report.claim.ClaimStatistic;
+import org.w3c.dom.Document;
+
+/**
+ * The validator for test data.
+ */
+public final class ValidatorData {
+    /** The report output */
+    private final Reporter.Output output;
+    /** the base directory where the test setup was created */
+    private final Path baseDir;
+
+    /**
+     * Constructor.
+     * @param output The report output.
+     * @param baseDir the directory where the test setup was created.
+     */
+    public ValidatorData(final Reporter.Output output, final String baseDir) {
+        this.output = output;
+        this.baseDir = Paths.get(baseDir);
+    }
+
+    /**
+     * Gets the directory where the test setup was created as a DocumentName.
+     * @return the DocumentName for the baseDir directory.
+     */
+    public DocumentName getBaseName() {
+        return DocumentName.builder(baseDir.toFile()).build();
+    }
+
+    /**
+     * Creates a DocumentName for a file name.  The root of the document Name will be the baseDir.
+     * @param fileName the file name to create a document name for.
+     * @return the Document name for the file.
+     */
+    public DocumentName mkDocName(String fileName) {
+        return DocumentName.builder().setBaseName(baseDir.toFile()).setName(fileName).build();
+    }
+
+    public Reporter.Output getOutput() {
+        return output;
+    }
+    /**
+     * Gets the document that was generated during execution.
+     * @return the document that was generated during execution.
+     */
+    public Document getDocument() {
+        return output.getDocument();
+    }
+
+    /**
+     * Gets the claim statistics from the run
+     * @return the ClaimStatistic from the run.
+     */
+    public ClaimStatistic getStatistic() {
+        return output.getStatistic();
+    }
+
+    /**
+     * Gets the configuration from the run.
+     * @return the configuration from the run.
+     */
+    public ReportConfiguration getConfiguration() {
+        return output.getConfiguration();
+    }
+
+    public Path getBaseDir() {
+        return baseDir;
+    }
+
+}
diff --git a/apache-rat-plugin/src/it/RAT-469/invoker.properties b/apache-rat-plugin/src/it/RAT-469/invoker.properties
index 6486eb1de..0e632cdef 100644
--- a/apache-rat-plugin/src/it/RAT-469/invoker.properties
+++ b/apache-rat-plugin/src/it/RAT-469/invoker.properties
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-invoker.goals = clean apache-rat:rat
+invoker.goals = clean apache-rat:check apache-rat:rat
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java
index 7bd6b1da0..1cc128b87 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java
@@ -36,6 +36,7 @@
 import org.apache.rat.commandline.Arg;
 import org.apache.rat.commandline.StyleSheets;
 import org.apache.rat.config.exclusion.StandardCollection;
+import org.apache.rat.config.results.ClaimValidator;
 import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.report.claim.ClaimStatistic;
 import org.apache.rat.utils.DefaultLog;
@@ -209,11 +210,12 @@ public void execute() throws MojoExecutionException, MojoFailureException {
             }
             try {
                 this.reporter = new Reporter(config);
-                reporter.output();
+                Reporter.Output output = reporter.execute();
                 if (verbose) {
-                    reporter.writeSummary(logWriter);
+                    output.writeSummary(logWriter);
                 }
-                check(config);
+                output.format(config);
+                check(output);
             } catch (MojoFailureException e) {
                 throw e;
             } catch (Exception e) {
@@ -224,17 +226,18 @@ public void execute() throws MojoExecutionException, MojoFailureException {
         }
     }
 
-    protected void check(final ReportConfiguration config) throws MojoFailureException {
-        ClaimStatistic statistics = reporter.getClaimsStatistic();
+    protected void check(final Reporter.Output output) throws MojoFailureException {
+        ClaimStatistic statistics = output.getStatistic();
+        ClaimValidator validator = output.getConfiguration().getClaimValidator();
         try {
-           reporter.writeSummary(DefaultLog.getInstance().asWriter(Log.Level.DEBUG));
-           if (config.getClaimValidator().hasErrors()) {
-               config.getClaimValidator().logIssues(statistics);
+           output.writeSummary(DefaultLog.getInstance().asWriter(Log.Level.DEBUG));
+           if (validator.hasErrors()) {
+               validator.logIssues(statistics);
                if (consoleOutput &&
-                       !config.getClaimValidator().isValid(ClaimStatistic.Counter.UNAPPROVED, statistics.getCounter(ClaimStatistic.Counter.UNAPPROVED))) {
+                       !validator.isValid(ClaimStatistic.Counter.UNAPPROVED, statistics.getCounter(ClaimStatistic.Counter.UNAPPROVED))) {
                    try {
                        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                       reporter.output(StyleSheets.UNAPPROVED_LICENSES.getStyleSheet(), () -> baos);
+                       output.format(StyleSheets.UNAPPROVED_LICENSES.getStyleSheet().ioSupplier(), () -> baos);
                        getLog().warn(baos.toString(StandardCharsets.UTF_8));
                    } catch (RuntimeException rte) {
                        throw rte;
@@ -244,7 +247,7 @@ protected void check(final ReportConfiguration config) throws MojoFailureExcepti
                }
 
                String msg = format("Counter(s) %s exceeded minimum or maximum values. See RAT report in: '%s'.",
-                       String.join(", ", config.getClaimValidator().listIssues(statistics)),
+                       String.join(", ", validator.listIssues(statistics)),
                        getRatTxtFile());
 
                if (!ignoreErrors) {
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
index 330d3c5e1..a367c1de9 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
@@ -446,11 +446,12 @@ protected void executeReport(final Locale locale) throws MavenReportException {
                     config.reportExclusions(logWriter);
                 }
                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                config.setOut(() -> baos);
+                config.setOut(new ReportConfiguration.IODescriptor<>("streaming output", () -> baos));
                 Reporter reporter = new Reporter(config);
-                reporter.output();
+                Reporter.Output output = reporter.execute();
+                output.format(config);
                 if (verbose) {
-                    reporter.writeSummary(logWriter);
+                    output.writeSummary(logWriter);
                 }
                 sink.text(baos.toString(StandardCharsets.UTF_8.name()));
             } catch (IOException | MojoExecutionException | RatException e) {
diff --git a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
index 5734ab73e..3013df2ac 100644
--- a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
+++ b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
@@ -247,7 +247,7 @@ void it5() throws Exception {
         assertThat(config.isAddingLicenses()).as("Should not be adding licenses").isFalse();
         assertThat(config.isAddingLicensesForced()).as("Should not be forcing licenses").isFalse();
 
-        ReportConfigurationTest.validateDefaultApprovedLicenses(config, 1);
+        ReportConfigurationTest.validateDefaultApprovedLicenses(config, "CC-BY-NC-ND");
         assertThat(config.getLicenseCategories(LicenseFilter.APPROVED)).doesNotContain(ILicenseFamily.makeCategory("YAL"))
                 .contains(ILicenseFamily.makeCategory("CC"));
         ReportConfigurationTest.validateDefaultLicenseFamilies(config, "YAL", "CC");
@@ -332,7 +332,7 @@ void rat343() throws Exception {
         assertThat(config.getCopyrightMessage()).isNull();
         assertThat(config.getStyleSheet()).withFailMessage("Stylesheet should not be null").isNotNull();
 
-        ReportConfigurationTest.validateDefaultApprovedLicenses(config, 1);
+        ReportConfigurationTest.validateDefaultApprovedLicenses(config, "BSD");
         ReportConfigurationTest.validateDefaultLicenseFamilies(config, "BSD", "CC BY");
         ReportConfigurationTest.validateDefaultLicenses(config, "BSD", "CC BY");
 
diff --git a/apache-rat-tasks/pom.xml b/apache-rat-tasks/pom.xml
index aca9d90b7..312d9f160 100644
--- a/apache-rat-tasks/pom.xml
+++ b/apache-rat-tasks/pom.xml
@@ -188,6 +188,25 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
+        <configuration>
+          <skip>${skipTests}</skip>
+          <target>
+            <ant antfile="src/test/resources/antunit/report-bad-configurations.xml" inheritAll="false" inheritRefs="false">
+              <property name="jar.name" location="${project.build.outputDirectory}"/>
+              <property name="base.dir" location="${basedir}"/>
+              <property name="antunit.jar.name" location="${project.build.directory}/dependencies/ant-antunit.jar"/>
+              <property name="test.skipped" value="${skipTests}"/>
+              <property name="test.classpath" refid="maven.test.classpath"/>
+            </ant>
+            <ant antfile="src/test/resources/antunit/report-normal-operation.xml" inheritAll="false" inheritRefs="false">
+              <property name="jar.name" location="${project.build.outputDirectory}"/>
+              <property name="base.dir" location="${basedir}"/>
+              <property name="antunit.jar.name" location="${project.build.directory}/dependencies/ant-antunit.jar"/>
+              <property name="test.skipped" value="${maven.test.skip}"/>
+              <property name="test.classpath" refid="maven.test.classpath"/>
+            </ant>
+          </target>
+        </configuration>
         <executions>
           <execution>
             <phase>test</phase>
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
index a069084f2..efb28ab30 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
@@ -29,7 +29,6 @@
 
 import org.apache.commons.cli.Option;
 import org.apache.commons.io.filefilter.IOFileFilter;
-import org.apache.commons.io.output.CloseShieldOutputStream;
 import org.apache.rat.ConfigurationException;
 import org.apache.rat.DeprecationReporter;
 import org.apache.rat.ImplementationException;
@@ -411,14 +410,15 @@ public ReportConfiguration getConfiguration() {
         try {
             boolean helpLicenses = !getValues(Arg.HELP_LICENSES).isEmpty();
             removeKey(Arg.HELP_LICENSES);
-
-            final ReportConfiguration configuration = OptionCollection.parseCommands(new File("."), args().toArray(new String[0]),
+            File antFileDir = new File(getProject().getProperty("ant.file")).getParentFile();
+            DocumentName name = DocumentName.builder(antFileDir).build();;
+            final ReportConfiguration configuration = OptionCollection.parseCommands(antFileDir, args().toArray(new String[0]),
                     o -> DefaultLog.getInstance().warn("Help option not supported"),
                     true);
             if (getValues(Arg.OUTPUT_FILE).isEmpty()) {
-                configuration.setOut(() -> new LogOutputStream(this, Project.MSG_INFO));
+                configuration.setOut(new ReportConfiguration.IODescriptor<>("log output", () -> new LogOutputStream(this, Project.MSG_INFO)));
             }
-            DocumentName name = DocumentName.builder(getProject().getBaseDir()).build();
+
             configuration.addSource(new ResourceCollectionContainer(name, configuration, nestedResources));
             configuration.addApprovedLicenseCategories(deprecatedConfig.approvedLicenseCategories);
             configuration.removeApprovedLicenseCategories(deprecatedConfig.removedLicenseCategories);
@@ -443,9 +443,9 @@ public ReportConfiguration getConfiguration() {
     @Override
     public void execute() {
         try {
-            Reporter r = new Reporter(validate(getConfiguration()));
-            r.output(StyleSheets.PLAIN.getStyleSheet(), () -> CloseShieldOutputStream.wrap(System.out));
-            r.output();
+            Reporter.Output output = new Reporter(validate(getConfiguration())).execute();
+            output.format(StyleSheets.PLAIN.getStyleSheet().ioSupplier(), ReportConfiguration.SYSTEM_OUT.ioSupplier());
+            output.format(output.getConfiguration());
         } catch (BuildException e) {
             throw e;
         } catch (Exception ioex) {
@@ -458,7 +458,7 @@ public void execute() {
      */
     protected ReportConfiguration validate(final ReportConfiguration cfg) {
         try {
-            cfg.validate(s -> log(s, Project.MSG_WARN));
+            cfg.validate();
         } catch (ConfigurationException e) {
             throw new BuildException(e.getMessage(), e.getCause());
         }
@@ -474,7 +474,7 @@ protected ReportConfiguration validate(final ReportConfiguration cfg) {
      * @deprecated use &lt;editCopyright&gt; amd &lt;editOverwrite&gt; instead.
      */
     @Deprecated
-    public static class AddLicenseHeaders extends EnumeratedAttribute {
+    public static final class AddLicenseHeaders extends EnumeratedAttribute {
         /**
          * add license headers and create *.new file
          */
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java
index df911ad4d..b9ddddfd0 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java
@@ -59,7 +59,7 @@ public void run(final RatReport report) throws RatException {
     }
 
     @Override
-    public DocumentName getName() {
+    public DocumentName name() {
         return name;
     }
 }
diff --git a/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java b/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
index ad44dda17..e4ecdc6f2 100644
--- a/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
+++ b/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
@@ -198,7 +198,7 @@ public void testNoLicenseMatchers() {
             buildRule.executeTarget("testNoLicenseMatchers");
             fail("Expected Exception");
         } catch (BuildException e) {
-            final String expect = "at least one license";
+            final String expect = "At least one license";
             assertThat(e.getMessage()).describedAs("Expected " + expect).contains(expect);
         }
     }
diff --git a/apache-rat-tasks/src/test/resources/antunit/report-bad-configurations.xml b/apache-rat-tasks/src/test/resources/antunit/report-bad-configurations.xml
index 56d1e8d7a..bf43ff943 100644
--- a/apache-rat-tasks/src/test/resources/antunit/report-bad-configurations.xml
+++ b/apache-rat-tasks/src/test/resources/antunit/report-bad-configurations.xml
@@ -31,7 +31,7 @@
 
   <taskdef uri="antlib:org.apache.rat.anttasks" resource="org/apache/rat/anttasks/antlib.xml">
     <classpath>
-      <pathelement location="${jar.name}" />
+        <pathelement location="${jar.name}" />
       <pathelement path='${test.classpath}' />
     </classpath>
   </taskdef>
@@ -50,7 +50,7 @@
   </target>
 
   <target name="testNoLicenseMatchers">
-    <au:expectfailure expectedMessage="at least one license">
+    <au:expectfailure expectedMessage="At least one license">
       <rat:report useDefaultLicenses="false">
         <file file="${ant.file}"/>
       </rat:report>
diff --git a/apache-rat-tasks/src/test/resources/antunit/report-junit.xml b/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
index 81827d40f..3b64f5356 100644
--- a/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
+++ b/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
@@ -226,7 +226,7 @@ public class InlineMatcher extends AbstractHeaderMatcher {
 		<file file="${ant.file}"/>
 		<rat:report>
 			<rat:stylesheet>
-				<file file="${ant.file}"/>
+				<file file="stylesheet.xslt"/>
 			</rat:stylesheet>
 		</rat:report>
 	</target>
@@ -235,7 +235,7 @@ public class InlineMatcher extends AbstractHeaderMatcher {
 		<file file="${ant.file}"/>
 		<rat:report>
 			<rat:stylesheet>
-				<file file="${ant.file}"/>
+				<file file="stylesheet.xslt"/>
 			</rat:stylesheet>
 		</rat:report>
 	</target>
diff --git a/apache-rat-tasks/src/test/resources/antunit/stylesheet.xslt b/apache-rat-tasks/src/test/resources/antunit/stylesheet.xslt
new file mode 100644
index 000000000..008412298
--- /dev/null
+++ b/apache-rat-tasks/src/test/resources/antunit/stylesheet.xslt
@@ -0,0 +1,2 @@
+The text to match
+more text to match
\ No newline at end of file
diff --git a/apache-rat-tools/src/main/java/org/apache/rat/documentation/options/AntOptionCollection.java b/apache-rat-tools/src/main/java/org/apache/rat/documentation/options/AntOptionCollection.java
index 8b8182ba1..eb5930716 100644
--- a/apache-rat-tools/src/main/java/org/apache/rat/documentation/options/AntOptionCollection.java
+++ b/apache-rat-tools/src/main/java/org/apache/rat/documentation/options/AntOptionCollection.java
@@ -34,6 +34,7 @@
 import org.apache.commons.text.WordUtils;
 import org.apache.rat.OptionCollection;
 import org.apache.rat.commandline.Arg;
+import org.apache.rat.document.DocumentName;
 import org.apache.rat.ui.ArgumentTracker;
 import org.apache.rat.ui.UIOptionCollection;
 import org.apache.rat.utils.CasedString;
@@ -78,6 +79,7 @@ public final class AntOptionCollection extends UIOptionCollection<AntOption> {
         ATTRIBUTE_TYPES.add(Integer.class);
         ATTRIBUTE_TYPES.add(Long.class);
         ATTRIBUTE_TYPES.add(File.class);
+        ATTRIBUTE_TYPES.add(DocumentName.class);
     }
 
     public static Map<String, String> getRenameMap() {
diff --git a/apache-rat-tools/src/main/java/org/apache/rat/documentation/velocity/RatTool.java b/apache-rat-tools/src/main/java/org/apache/rat/documentation/velocity/RatTool.java
index 820e246ea..ca1adadfd 100644
--- a/apache-rat-tools/src/main/java/org/apache/rat/documentation/velocity/RatTool.java
+++ b/apache-rat-tools/src/main/java/org/apache/rat/documentation/velocity/RatTool.java
@@ -24,11 +24,11 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 import org.apache.commons.cli.Option;
+import org.apache.commons.collections4.set.UnmodifiableSortedSet;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rat.CLIOption;
 import org.apache.rat.CLIOptionCollection;
@@ -187,9 +187,8 @@ public List<EnvVar> environmentVariables() {
      * @return the set of Matchers.
      */
     public Set<Matcher> matchers() {
-        MatcherBuilderTracker tracker = MatcherBuilderTracker.instance();
         Set<Matcher> documentationSet = new TreeSet<>(Comparator.comparing(Matcher::getName));
-        for (Class<?> clazz : tracker.getClasses()) {
+        for (Class<?> clazz : MatcherBuilderTracker.instance().getClasses()) {
             Description desc = DescriptionBuilder.buildMap(clazz);
             documentationSet.add(new Matcher(desc, null));
         }
@@ -246,7 +245,7 @@ public String doubleLine() {
      * @return a list of license property descriptions.
      */
     public List<Description> licenseProperties() {
-        SortedSet<ILicense> licenses = licenseSetFactory.getLicenses(LicenseSetFactory.LicenseFilter.ALL);
+        UnmodifiableSortedSet<ILicense> licenses = licenseSetFactory.getLicenses(LicenseSetFactory.LicenseFilter.ALL);
         Description licenseDescription = DescriptionBuilder.build(licenses.first());
         List<Description> descriptions = new ArrayList<>(licenseDescription.filterChildren(d -> d.getType() == ComponentType.PARAMETER));
         descriptions.sort(Comparator.comparing(Description::getCommonName));
@@ -258,7 +257,7 @@ public List<Description> licenseProperties() {
      * @return the list of defined licenses.
      */
     public List<License> licenses() {
-        Set<ILicense> licenses = licenseSetFactory.getLicenses(LicenseSetFactory.LicenseFilter.ALL);
+        UnmodifiableSortedSet<ILicense> licenses = licenseSetFactory.getLicenses(LicenseSetFactory.LicenseFilter.ALL);
         return licenses.stream().map(License::new).collect(Collectors.toList());
     }
 
diff --git a/apache-rat-tools/src/main/java/org/apache/rat/tools/xsd/XsdGenerator.java b/apache-rat-tools/src/main/java/org/apache/rat/tools/xsd/XsdGenerator.java
index a3ceb01c4..5f466cb06 100644
--- a/apache-rat-tools/src/main/java/org/apache/rat/tools/xsd/XsdGenerator.java
+++ b/apache-rat-tools/src/main/java/org/apache/rat/tools/xsd/XsdGenerator.java
@@ -71,7 +71,7 @@ public static void main(final String[] args) throws IOException, TransformerExce
         XsdGenerator generator = new XsdGenerator();
 
         try (InputStream in = generator.getInputStream();
-             InputStream styleIn = StyleSheets.XML.getStyleSheet().get()) {
+             InputStream styleIn = StyleSheets.XML.getStyleSheet().ioSupplier().get()) {
             Transformer transformer = StandardXmlFactory.create(styleIn);
             transformer.transform(new StreamSource(in),
                     new StreamResult(new OutputStreamWriter(System.out, StandardCharsets.UTF_8)));
@@ -179,11 +179,10 @@ private void writeMatchers() throws IOException {
     }
 
     private void writeMatcherElements() throws IOException {
-        MatcherBuilderTracker tracker = MatcherBuilderTracker.instance();
         writer.open(Type.ELEMENT, "name", XMLConfig.MATCHER, "abstract", "true").close(Type.ELEMENT);
 
         // matchers
-        for (Class<?> clazz : tracker.getClasses()) {
+        for (Class<?> clazz : MatcherBuilderTracker.instance().getClasses()) {
             Description desc = DescriptionBuilder.buildMap(clazz);
             if (desc != null) {
                 boolean hasResourceAttr = false;
diff --git a/apache-rat/pom.xml b/apache-rat/pom.xml
index f915d7b05..8b4ea0f61 100644
--- a/apache-rat/pom.xml
+++ b/apache-rat/pom.xml
@@ -48,6 +48,13 @@
   </dependencies>
   <build>
     <plugins>
+      <plugin>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-maven-plugin</artifactId>
+        <configuration>
+          <excludeFilterFile>spotbugs-ignore.xml</excludeFilterFile>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
diff --git a/apache-rat/spotbugs-ignore.xml b/apache-rat/spotbugs-ignore.xml
index 085293a2b..b0a2af2a3 100644
--- a/apache-rat/spotbugs-ignore.xml
+++ b/apache-rat/spotbugs-ignore.xml
@@ -24,6 +24,10 @@
     <Bug pattern='EI_EXPOSE_REP'/>
   </Match>
 
+  <Match>
+    <Bug pattern='EI_EXPOSE_REP2'/>
+  </Match>q
+
   <Match>
     <Class name="org.apache.rat.configuration.XMLConfigurationReader"/>
     <Bug pattern='XXE_DOCUMENT'/>
diff --git a/src/site/markdown/development/ui_implementation.md b/src/site/markdown/development/ui_implementation.md
index c70733ab3..cf6a35f69 100644
--- a/src/site/markdown/development/ui_implementation.md
+++ b/src/site/markdown/development/ui_implementation.md
@@ -20,6 +20,12 @@
 
 The RAT architecture supports multiple UIs. By default, RAT provides a command line implementation (CLI) as well as implementations for the Ant and Maven build system. The source code for those implementation provide a good roadmap for implementing any new UI.
 
+Our UI strategy is for core to provide basic functionality to process an Apache Commons CLI definition and arguments.  UIs will process input as per their style and standards, translate those input into RAT UI options and arguments.  These are used to create a `ReportConfiguration`.  The `ReportConfiguration` is the constructor argument for a RAT `Reporter` which is executed and the resulting `Reporter.Output` used to update the UI as necessary.
+
+In addition, RAT provides a collection of `TestData` objects which define tests that the UI must pass.  Each `TestData` provides a unique name for the test, the command line that should be created from the UI, a funstion to create the test directory and contents setup. and a validator to validate the results.
+
+Implementors are expected to create a directory, call the setup to populate it with the test data, process the commandLine to create a UI specific equivalent, execute the `Reporter` using a configuration generated by the UI and then verify the `Reporter.Output` using  the `TestData` validator.
+
 ### CLI first
 
 RAT is designed as a CLI first architecture. This means that every new functionality is introduced as a CLI option first. All tests cases are built and the implementation verified before it is released. Additional native UIs are build on top of the CLI implementation.