From 9c70c55af17648fa9c1831b5e7816e396e013075 Mon Sep 17 00:00:00 2001
From: Peter Winckles <pwinckles@pm.me>
Date: Mon, 28 Nov 2022 19:59:08 -0600
Subject: [PATCH] do not run NZME on image files by default

---
 CHANGELOG.md                                  |  1 +
 .../GLOBE1.JPG_XmlUnitExpectedOutput.xml      | 12 +-------
 ...A.1524-small.jpg_XmlUnitExpectedOutput.xml | 22 +++++---------
 ...st_20170591.jpeg_XmlUnitExpectedOutput.xml | 29 +++++++------------
 .../output/gps.jpg_XmlUnitExpectedOutput.xml  | 28 +++++++-----------
 .../properties/fits-full-with-tool-output.xml |  2 +-
 .../properties/fits-no-consolidation.xml      |  2 +-
 xml/fits.xml                                  |  2 +-
 8 files changed, 33 insertions(+), 65 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 969c0d9b..99565c99 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@ to `true` in your `fits.xml`.
 - Do not infer a timezone for exif timestamps.
 - Preserve whitespace within text elements. This ensures that significant spaces aren't trimmed from codec codes,
 but could also result in unwanted whitespace in other elements.
+- No longer run NZME on image files by default.
 - General internal dependency upgrades.
 
 ## Version 1.5.5 (5/10/2022)
diff --git a/testfiles/output/GLOBE1.JPG_XmlUnitExpectedOutput.xml b/testfiles/output/GLOBE1.JPG_XmlUnitExpectedOutput.xml
index 522f0f71..71e7a28b 100644
--- a/testfiles/output/GLOBE1.JPG_XmlUnitExpectedOutput.xml
+++ b/testfiles/output/GLOBE1.JPG_XmlUnitExpectedOutput.xml
@@ -6,7 +6,6 @@
       <tool toolname="Jhove" toolversion="1.26.0" />
       <tool toolname="file utility" toolversion="5.41" />
       <tool toolname="Exiftool" toolversion="12.40" />
-      <tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" />
       <version toolname="Droid" toolversion="6.5.2">1.01</version>
       <externalIdentifier toolname="Droid" toolversion="6.5.2" type="puid">fmt/43</externalIdentifier>
     </identity>
@@ -35,7 +34,6 @@
       <ySamplingFrequency toolname="Exiftool" toolversion="12.40">1</ySamplingFrequency>
       <bitsPerSample toolname="Jhove" toolversion="1.26.0">8 8 8</bitsPerSample>
       <samplesPerPixel toolname="Jhove" toolversion="1.26.0" status="SINGLE_RESULT">3</samplesPerPixel>
-      <lightSource toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="SINGLE_RESULT">unknown</lightSource>
       <standard>
         <mix:mix xmlns:mix="http://www.loc.gov/mix/v20">
           <mix:BasicDigitalObjectInformation>
@@ -61,14 +59,6 @@
           </mix:BasicImageInformation>
           <mix:ImageCaptureMetadata>
             <mix:GeneralCaptureInformation />
-            <mix:DigitalCameraCapture>
-              <mix:DigitalCameraModel />
-              <mix:CameraCaptureSettings>
-                <mix:ImageData>
-                  <mix:lightSource>unknown</mix:lightSource>
-                </mix:ImageData>
-              </mix:CameraCaptureSettings>
-            </mix:DigitalCameraCapture>
           </mix:ImageCaptureMetadata>
           <mix:ImageAssessmentMetadata>
             <mix:SpatialMetrics>
@@ -106,7 +96,7 @@
     <tool toolname="embARC" toolversion="0.2" status="did not run" />
     <tool toolname="file utility" toolversion="5.41" executionTime="117" />
     <tool toolname="Exiftool" toolversion="12.40" executionTime="319" />
-    <tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" executionTime="116" />
+    <tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="did not run" />
     <tool toolname="OIS File Information" toolversion="1.0" executionTime="37" />
     <tool toolname="OIS XML Metadata" toolversion="0.2" status="did not run" />
     <tool toolname="ffident" toolversion="0.2" executionTime="60" />
diff --git a/testfiles/output/ICFA.KC.BIA.1524-small.jpg_XmlUnitExpectedOutput.xml b/testfiles/output/ICFA.KC.BIA.1524-small.jpg_XmlUnitExpectedOutput.xml
index 6b09f27e..66f41c53 100644
--- a/testfiles/output/ICFA.KC.BIA.1524-small.jpg_XmlUnitExpectedOutput.xml
+++ b/testfiles/output/ICFA.KC.BIA.1524-small.jpg_XmlUnitExpectedOutput.xml
@@ -6,7 +6,6 @@
       <tool toolname="Jhove" toolversion="1.20.1" />
       <tool toolname="file utility" toolversion="5.39" />
       <tool toolname="Exiftool" toolversion="11.54" />
-      <tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" />
       <version toolname="Droid" toolversion="6.4" status="CONFLICT">2.2.1</version>
       <version toolname="file utility" toolversion="5.39" status="CONFLICT">16</version>
       <version toolname="Exiftool" toolversion="11.54" status="CONFLICT">5.5</version>
@@ -15,11 +14,9 @@
   </identification>
   <fileinfo>
     <size toolname="Jhove" toolversion="1.20.1">38829</size>
-    <creatingApplicationName toolname="Exiftool" toolversion="11.54" status="CONFLICT">Canon EOS 5D Mark II</creatingApplicationName>
-    <creatingApplicationName toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">Adobe Photoshop CS6 (Windows)</creatingApplicationName>
+    <creatingApplicationName toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">Canon EOS 5D Mark II</creatingApplicationName>
     <lastmodified toolname="Exiftool" toolversion="12.50">2017-01-30T11:39:51</lastmodified>
-    <created toolname="Exiftool" toolversion="12.40" status="CONFLICT">2010-07-07T14:22:53</created>
-    <created toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">2017-01-30T11:39:51</created>
+    <created toolname="Exiftool" toolversion="12.40">2010-07-07T14:22:53</created>
     <filepath toolname="OIS File Information" toolversion="1.0" status="SINGLE_RESULT">/Users/dan179/git/git-daveneiman/fits/testfiles/ICFA.KC.BIA.1524-small.jpg</filepath>
     <filename toolname="OIS File Information" toolversion="1.0" status="SINGLE_RESULT">ICFA.KC.BIA.1524-small.jpg</filename>
     <md5checksum toolname="OIS File Information" toolversion="1.0" status="SINGLE_RESULT">0108175c9153da1d41278066a2e3c1a2</md5checksum>
@@ -43,7 +40,7 @@
       <colorSpace toolname="Exiftool" toolversion="12.40" status="CONFLICT">RGB</colorSpace>
       <iccProfileName toolname="Jhove" toolversion="1.20.1">Adobe RGB (1998)</iccProfileName>
       <YCbCrSubSampling toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">1 1</YCbCrSubSampling>
-      <orientation toolname="Exiftool" toolversion="11.54">normal*</orientation>
+      <orientation toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">normal*</orientation>
       <samplingFrequencyUnit toolname="Jhove" toolversion="1.20.1">in.</samplingFrequencyUnit>
       <xSamplingFrequency toolname="Jhove" toolversion="1.20.1">350</xSamplingFrequency>
       <ySamplingFrequency toolname="Jhove" toolversion="1.20.1">350</ySamplingFrequency>
@@ -55,18 +52,14 @@
       <exposureTime toolname="Jhove" toolversion="1.20.1">0.125</exposureTime>
       <isoSpeedRating toolname="Jhove" toolversion="1.20.1">100</isoSpeedRating>
       <exposureBiasValue toolname="Jhove" toolversion="1.20.1">0</exposureBiasValue>
-      <lightSource toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="SINGLE_RESULT">unknown</lightSource>
       <flash toolname="Jhove" toolversion="1.20.1" status="SINGLE_RESULT">Flash did not fire, compulsory flash mode</flash>
       <focalLength toolname="Jhove" toolversion="1.20.1">50</focalLength>
       <iccProfileVersion toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">2.1.0</iccProfileVersion>
       <digitalCameraManufacturer toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">Canon</digitalCameraManufacturer>
-      <exifVersion toolname="Exiftool" toolversion="11.54" status="CONFLICT">0221</exifVersion>
-      <exifVersion toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">1220</exifVersion>
+      <exifVersion toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">0221</exifVersion>
       <shutterSpeedValue toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">1/8</shutterSpeedValue>
-      <apertureValue toolname="Exiftool" toolversion="11.54" status="CONFLICT">11.0</apertureValue>
-      <apertureValue toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">6.918863</apertureValue>
-      <maxApertureValue toolname="Exiftool" toolversion="11.54" status="CONFLICT">2.5</maxApertureValue>
-      <maxApertureValue toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">2.625</maxApertureValue>
+      <apertureValue toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">11.0</apertureValue>
+      <maxApertureValue toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">2.5</maxApertureValue>
       <standard>
         <mix:mix xmlns:mix="http://www.loc.gov/mix/v20">
           <mix:BasicDigitalObjectInformation>
@@ -132,7 +125,6 @@
                     <mix:numerator>250</mix:numerator>
                     <mix:denominator>100</mix:denominator>
                   </mix:maxApertureValue>
-                  <mix:lightSource>unknown</mix:lightSource>
                   <mix:flash>Flash did not fire, compulsory flash mode</mix:flash>
                   <mix:focalLength>50.0</mix:focalLength>
                 </mix:ImageData>
@@ -176,7 +168,7 @@
     <tool toolname="embARC" toolversion="0.2" status="did not run" />
     <tool toolname="file utility" toolversion="5.39" executionTime="45" />
     <tool toolname="Exiftool" toolversion="11.54" executionTime="401" />
-    <tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" executionTime="154" />
+    <tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="did not run" />
     <tool toolname="OIS File Information" toolversion="1.0" executionTime="5" />
     <tool toolname="OIS XML Metadata" toolversion="0.2" status="did not run" />
     <tool toolname="ffident" toolversion="0.2" executionTime="10" />
diff --git a/testfiles/output/JPEGTest_20170591--JPEGTest_20170591.jpeg_XmlUnitExpectedOutput.xml b/testfiles/output/JPEGTest_20170591--JPEGTest_20170591.jpeg_XmlUnitExpectedOutput.xml
index 3c0ffbed..38b34cdf 100644
--- a/testfiles/output/JPEGTest_20170591--JPEGTest_20170591.jpeg_XmlUnitExpectedOutput.xml
+++ b/testfiles/output/JPEGTest_20170591--JPEGTest_20170591.jpeg_XmlUnitExpectedOutput.xml
@@ -6,7 +6,6 @@
       <tool toolname="Jhove" toolversion="1.20.1" />
       <tool toolname="file utility" toolversion="5.39" />
       <tool toolname="Exiftool" toolversion="11.54" />
-      <tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" />
       <version toolname="Droid" toolversion="6.4" status="CONFLICT">2.2.1</version>
       <version toolname="file utility" toolversion="5.39" status="CONFLICT">16</version>
       <externalIdentifier toolname="Droid" toolversion="6.4" type="puid">fmt/645</externalIdentifier>
@@ -14,11 +13,9 @@
   </identification>
   <fileinfo>
     <size toolname="Jhove" toolversion="1.20.1">4324778</size>
-    <creatingApplicationName toolname="Exiftool" toolversion="11.54" status="CONFLICT">HERO3+ Black Edition</creatingApplicationName>
-    <creatingApplicationName toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">Adobe Photoshop CS6 (Macintosh)</creatingApplicationName>
+    <creatingApplicationName toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">HERO3+ Black Edition</creatingApplicationName>
     <lastmodified toolname="Exiftool" toolversion="12.50">2015-06-25T11:03:38</lastmodified>
-    <created toolname="Exiftool" toolversion="12.40" status="CONFLICT">2014-10-27T12:34:43</created>
-    <created toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">2015-06-25T11:03:38</created>
+    <created toolname="Exiftool" toolversion="12.40">2014-10-27T12:34:43</created>
     <filepath toolname="OIS File Information" toolversion="1.0" status="SINGLE_RESULT">/Users/dan179/git/git-daveneiman/fits/testfiles/JPEGTest_20170591--JPEGTest_20170591.jpeg</filepath>
     <filename toolname="OIS File Information" toolversion="1.0" status="SINGLE_RESULT">JPEGTest_20170591--JPEGTest_20170591.jpeg</filename>
     <md5checksum toolname="OIS File Information" toolversion="1.0" status="SINGLE_RESULT">3c5a86c471809d347e99d19c51bd1b94</md5checksum>
@@ -37,8 +34,8 @@
       <colorSpace toolname="Jhove" toolversion="1.24.9">RGB</colorSpace>
       <iccProfileName toolname="Jhove" toolversion="1.20.1">sRGB IEC61966-2.1</iccProfileName>
       <YCbCrSubSampling toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">1 1</YCbCrSubSampling>
-      <YCbCrPositioning toolname="Exiftool" toolversion="11.54">1</YCbCrPositioning>
-      <orientation toolname="Exiftool" toolversion="11.54">normal*</orientation>
+      <YCbCrPositioning toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">1</YCbCrPositioning>
+      <orientation toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">normal*</orientation>
       <samplingFrequencyUnit toolname="Jhove" toolversion="1.20.1">in.</samplingFrequencyUnit>
       <xSamplingFrequency toolname="Jhove" toolversion="1.20.1">72</xSamplingFrequency>
       <ySamplingFrequency toolname="Jhove" toolversion="1.20.1">72</ySamplingFrequency>
@@ -49,12 +46,10 @@
       <fNumber toolname="Jhove" toolversion="1.20.1">2.8</fNumber>
       <exposureTime toolname="Jhove" toolversion="1.20.1" status="CONFLICT">0.008</exposureTime>
       <exposureTime toolname="Exiftool" toolversion="11.54" status="CONFLICT">0.0083</exposureTime>
-      <exposureTime toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">0.008340283569641367</exposureTime>
       <isoSpeedRating toolname="Jhove" toolversion="1.20.1">142</isoSpeedRating>
       <exposureBiasValue toolname="Jhove" toolversion="1.20.1">0</exposureBiasValue>
       <lightSource toolname="Jhove" toolversion="1.20.1">unknown</lightSource>
-      <subjectDistance toolname="Exiftool" toolversion="11.54" status="CONFLICT">undef</subjectDistance>
-      <subjectDistance toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">NaN</subjectDistance>
+      <subjectDistance toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">undef</subjectDistance>
       <meteringMode toolname="Jhove" toolversion="1.20.1">Center weighted average</meteringMode>
       <flash toolname="Jhove" toolversion="1.20.1">No flash function</flash>
       <focalLength toolname="Jhove" toolversion="1.20.1" status="CONFLICT">2.77</focalLength>
@@ -64,14 +59,12 @@
       <iccProfileVersion toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">2.1.0</iccProfileVersion>
       <captureDevice toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">digital still camera</captureDevice>
       <digitalCameraManufacturer toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">GoPro</digitalCameraManufacturer>
-      <exposureProgram toolname="Exiftool" toolversion="11.54">Normal program</exposureProgram>
-      <exifVersion toolname="Exiftool" toolversion="11.54">0221</exifVersion>
+      <exposureProgram toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">Normal program</exposureProgram>
+      <exifVersion toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">0221</exifVersion>
       <shutterSpeedValue toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">1/120</shutterSpeedValue>
-      <apertureValue toolname="Exiftool" toolversion="11.54" status="CONFLICT">2.8</apertureValue>
-      <apertureValue toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">2.97</apertureValue>
-      <maxApertureValue toolname="Exiftool" toolversion="11.54" status="CONFLICT">2.8</maxApertureValue>
-      <maxApertureValue toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">2.97</maxApertureValue>
-      <sensingMethod toolname="Exiftool" toolversion="11.54">One-chip color area sensor</sensingMethod>
+      <apertureValue toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">2.8</apertureValue>
+      <maxApertureValue toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">2.8</maxApertureValue>
+      <sensingMethod toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">One-chip color area sensor</sensingMethod>
       <standard>
         <mix:mix xmlns:mix="http://www.loc.gov/mix/v20">
           <mix:BasicDigitalObjectInformation>
@@ -185,7 +178,7 @@
     <tool toolname="embARC" toolversion="0.2" status="did not run" />
     <tool toolname="file utility" toolversion="5.39" executionTime="53" />
     <tool toolname="Exiftool" toolversion="11.54" executionTime="352" />
-    <tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" executionTime="31" />
+    <tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="did not run" />
     <tool toolname="OIS File Information" toolversion="1.0" executionTime="49" />
     <tool toolname="OIS XML Metadata" toolversion="0.2" status="did not run" />
     <tool toolname="ffident" toolversion="0.2" executionTime="6" />
diff --git a/testfiles/output/gps.jpg_XmlUnitExpectedOutput.xml b/testfiles/output/gps.jpg_XmlUnitExpectedOutput.xml
index 0a7fbc6a..d92a04551 100644
--- a/testfiles/output/gps.jpg_XmlUnitExpectedOutput.xml
+++ b/testfiles/output/gps.jpg_XmlUnitExpectedOutput.xml
@@ -6,7 +6,6 @@
       <tool toolname="Jhove" toolversion="1.20.1" />
       <tool toolname="file utility" toolversion="5.39" />
       <tool toolname="Exiftool" toolversion="11.54" />
-      <tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" />
       <version toolname="Droid" toolversion="6.4" status="CONFLICT">2.2.1</version>
       <version toolname="Jhove" toolversion="1.20.1" status="CONFLICT">1.01</version>
       <version toolname="file utility" toolversion="5.39" status="CONFLICT">13</version>
@@ -15,11 +14,9 @@
   </identification>
   <fileinfo>
     <size toolname="Jhove" toolversion="1.20.1">41851</size>
-    <creatingApplicationName toolname="Exiftool" toolversion="11.54" status="CONFLICT">FinePix F30</creatingApplicationName>
-    <creatingApplicationName toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">Digital Camera FinePix F30     Ver1.02</creatingApplicationName>
+    <creatingApplicationName toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">FinePix F30</creatingApplicationName>
     <lastmodified toolname="Exiftool" toolversion="12.50">2006-11-03T02:26:02</lastmodified>
-    <created toolname="Exiftool" toolversion="12.40" status="CONFLICT">2006-11-03T07:14:39</created>
-    <created toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">2006-11-03T02:26:02</created>
+    <created toolname="Exiftool" toolversion="12.40">2006-11-03T07:14:39</created>
     <filepath toolname="OIS File Information" toolversion="1.0" status="SINGLE_RESULT">/Users/dan179/git/git-daveneiman/fits/testfiles/gps.jpg</filepath>
     <filename toolname="OIS File Information" toolversion="1.0" status="SINGLE_RESULT">gps.jpg</filename>
     <md5checksum toolname="OIS File Information" toolversion="1.0" status="SINGLE_RESULT">201f1db44775631d307b3ffd62acb3ac</md5checksum>
@@ -38,8 +35,8 @@
       <imageHeight toolname="Jhove" toolversion="1.20.1">800</imageHeight>
       <colorSpace toolname="Jhove" toolversion="1.20.1" status="SINGLE_RESULT">YCbCr</colorSpace>
       <YCbCrSubSampling toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">2 2</YCbCrSubSampling>
-      <YCbCrPositioning toolname="Exiftool" toolversion="11.54">2</YCbCrPositioning>
-      <orientation toolname="Exiftool" toolversion="11.54">normal*</orientation>
+      <YCbCrPositioning toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">2</YCbCrPositioning>
+      <orientation toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">normal*</orientation>
       <samplingFrequencyUnit toolname="Jhove" toolversion="1.20.1">in.</samplingFrequencyUnit>
       <xSamplingFrequency toolname="Exiftool" toolversion="11.54">72</xSamplingFrequency>
       <ySamplingFrequency toolname="Exiftool" toolversion="11.54">72</ySamplingFrequency>
@@ -50,7 +47,6 @@
       <fNumber toolname="Jhove" toolversion="1.20.1">2.8</fNumber>
       <exposureTime toolname="Jhove" toolversion="1.20.1" status="CONFLICT">0.008</exposureTime>
       <exposureTime toolname="Exiftool" toolversion="11.54" status="CONFLICT">0.0083</exposureTime>
-      <exposureTime toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">0.008333333333333333</exposureTime>
       <isoSpeedRating toolname="Jhove" toolversion="1.20.1">400</isoSpeedRating>
       <brightnessValue toolname="Jhove" toolversion="1.24.9" status="CONFLICT">302100</brightnessValue>
       <brightnessValue toolname="Exiftool" toolversion="12.40" status="CONFLICT">3.02</brightnessValue>
@@ -61,15 +57,12 @@
       <focalLength toolname="Jhove" toolversion="1.20.1">8</focalLength>
       <captureDevice toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">digital still camera</captureDevice>
       <digitalCameraManufacturer toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">FUJIFILM</digitalCameraManufacturer>
-      <exposureProgram toolname="Exiftool" toolversion="11.54">Normal program</exposureProgram>
-      <exifVersion toolname="Exiftool" toolversion="11.54" status="CONFLICT">0221</exifVersion>
-      <exifVersion toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">1220</exifVersion>
+      <exposureProgram toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">Normal program</exposureProgram>
+      <exifVersion toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">0221</exifVersion>
       <shutterSpeedValue toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">1/124</shutterSpeedValue>
-      <apertureValue toolname="Exiftool" toolversion="11.54" status="CONFLICT">2.8</apertureValue>
-      <apertureValue toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">3.0</apertureValue>
-      <maxApertureValue toolname="Exiftool" toolversion="11.54" status="CONFLICT">2.8</maxApertureValue>
-      <maxApertureValue toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">3.0</maxApertureValue>
-      <sensingMethod toolname="Exiftool" toolversion="11.54">One-chip color area sensor</sensingMethod>
+      <apertureValue toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">2.8</apertureValue>
+      <maxApertureValue toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">2.8</maxApertureValue>
+      <sensingMethod toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">One-chip color area sensor</sensingMethod>
       <gpsVersionID toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">2.2.0.0</gpsVersionID>
       <gpsLatitudeRef toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">N</gpsLatitudeRef>
       <gpsLatitude toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">33 deg 24' 51.80" N</gpsLatitude>
@@ -79,7 +72,6 @@
       <gpsStatus toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">A</gpsStatus>
       <gpsMapDatum toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">WGS-84</gpsMapDatum>
       <gpsDateStamp toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">2006-11-02</gpsDateStamp>
-      <brightnessvalue toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="SINGLE_RESULT">3737910</brightnessvalue>
       <standard>
         <mix:mix xmlns:mix="http://www.loc.gov/mix/v20">
           <mix:BasicDigitalObjectInformation>
@@ -228,7 +220,7 @@
     <tool toolname="embARC" toolversion="0.2" status="did not run" />
     <tool toolname="file utility" toolversion="5.39" executionTime="41" />
     <tool toolname="Exiftool" toolversion="11.54" executionTime="251" />
-    <tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" executionTime="27" />
+    <tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="did not run" />
     <tool toolname="OIS File Information" toolversion="1.0" executionTime="2" />
     <tool toolname="OIS XML Metadata" toolversion="0.2" status="did not run" />
     <tool toolname="ffident" toolversion="0.2" executionTime="6" />
diff --git a/testfiles/properties/fits-full-with-tool-output.xml b/testfiles/properties/fits-full-with-tool-output.xml
index b2693e03..575952d9 100644
--- a/testfiles/properties/fits-full-with-tool-output.xml
+++ b/testfiles/properties/fits-full-with-tool-output.xml
@@ -15,7 +15,7 @@
         <tool class="edu.harvard.hul.ois.fits.tools.embarc.EmbARC" include-exts="dpx" />
         <tool class="edu.harvard.hul.ois.fits.tools.fileutility.FileUtility" exclude-exts="dng,wps,adl,jar,csv,m4a" classpath-dirs="lib/fileutility" />
         <tool class="edu.harvard.hul.ois.fits.tools.exiftool.Exiftool" exclude-exts="wps,vsd,jar,avi,mov,mpg,mpeg,mkv,mp4,mxf,ogv,mj2,divx,dv,m4v,m2v,ismv,m2ts,mpeg4,rmvb,rm,wmv,vtt,adl" classpath-dirs="lib/exiftool" />
-        <tool class="edu.harvard.hul.ois.fits.tools.nlnz.MetadataExtractor" include-exts="bmp,gif,jpg,jpeg,wp,wpd,odt,doc,pdf,mp3,bfw,flac,html,xml,arc" classpath-dirs="lib/nzmetool,xml/nlnz"/>
+        <tool class="edu.harvard.hul.ois.fits.tools.nlnz.MetadataExtractor" include-exts="wp,wpd,odt,doc,pdf,mp3,bfw,flac,html,xml,arc" classpath-dirs="lib/nzmetool,xml/nlnz"/>
         <tool class="edu.harvard.hul.ois.fits.tools.oisfileinfo.FileInfo" classpath-dirs="lib/fileinfo" />
         <tool class="edu.harvard.hul.ois.fits.tools.oisfileinfo.XmlMetadata" include-exts="xml" classpath-dirs="lib/xmlmetadata" />
         <tool class="edu.harvard.hul.ois.fits.tools.ffident.FFIdent" exclude-exts="dng,wps,vsd,jar,ppt,rtf" classpath-dirs="lib/ffident" />
diff --git a/testfiles/properties/fits-no-consolidation.xml b/testfiles/properties/fits-no-consolidation.xml
index baacc1ca..1831ee36 100644
--- a/testfiles/properties/fits-no-consolidation.xml
+++ b/testfiles/properties/fits-no-consolidation.xml
@@ -13,7 +13,7 @@
         <tool class="edu.harvard.hul.ois.fits.tools.jhove.Jhove" exclude-exts="dng,mbx,mbox,arw,adl,eml,java,doc,docx,docm,odt,rtf,pages,wpd,wp,epub,csv,avi,mov,mpg,mpeg,mkv,mp3,mp4,mpeg4,m2ts,mxf,ogv,mj2,divx,dv,m4v,m2v,ismv,pcd,zip" classpath-dirs="lib/jhove" />
         <tool class="edu.harvard.hul.ois.fits.tools.fileutility.FileUtility" exclude-exts="dng,wps,adl,jar,epub,csv,m4a" classpath-dirs="lib/fileutility" />
         <tool class="edu.harvard.hul.ois.fits.tools.exiftool.Exiftool" exclude-exts="wps,vsd,jar,avi,mov,mpg,mpeg,mkv,mp4,mxf,ogv,mj2,divx,dv,m4v,m2v,ismv,m2ts,mpeg4,rmvb,rm,wmv,vtt,adl" classpath-dirs="lib/exiftool" />
-        <tool class="edu.harvard.hul.ois.fits.tools.nlnz.MetadataExtractor" include-exts="bmp,gif,jpg,jpeg,wp,wpd,odt,doc,pdf,mp3,bfw,flac,html,xml,arc" classpath-dirs="lib/nzmetool,xml/nlnz"/>
+        <tool class="edu.harvard.hul.ois.fits.tools.nlnz.MetadataExtractor" include-exts="wp,wpd,odt,doc,pdf,mp3,bfw,flac,html,xml,arc" classpath-dirs="lib/nzmetool,xml/nlnz"/>
         <tool class="edu.harvard.hul.ois.fits.tools.oisfileinfo.FileInfo" classpath-dirs="lib/fileinfo" />
         <tool class="edu.harvard.hul.ois.fits.tools.oisfileinfo.XmlMetadata" include-exts="xml" classpath-dirs="lib/xmlmetadata" />
         <tool class="edu.harvard.hul.ois.fits.tools.ffident.FFIdent" exclude-exts="dng,wps,vsd,jar,ppt,rtf" classpath-dirs="lib/ffident" />
diff --git a/xml/fits.xml b/xml/fits.xml
index c0c4542f..bb08a4d3 100644
--- a/xml/fits.xml
+++ b/xml/fits.xml
@@ -14,7 +14,7 @@
         <tool class="edu.harvard.hul.ois.fits.tools.embarc.EmbARC" include-exts="dpx" classpath-dirs="lib/embarc" />
         <tool class="edu.harvard.hul.ois.fits.tools.fileutility.FileUtility" exclude-exts="dng,wps,adl,jar,csv,m4a,dpx" classpath-dirs="lib/fileutility" />
         <tool class="edu.harvard.hul.ois.fits.tools.exiftool.Exiftool" exclude-exts="wps,vsd,jar,avi,mov,mpg,mpeg,mkv,mp4,mxf,ogv,mj2,divx,dv,m4v,m2v,ismv,m2ts,mpeg4,rmvb,rm,wmv,vtt,adl" classpath-dirs="lib/exiftool" />
-        <tool class="edu.harvard.hul.ois.fits.tools.nlnz.MetadataExtractor" include-exts="bmp,gif,jpg,jpeg,wp,wpd,odt,doc,mp3,bfw,flac,html,xml,arc" classpath-dirs="lib/nzmetool,xml/nlnz"/>
+        <tool class="edu.harvard.hul.ois.fits.tools.nlnz.MetadataExtractor" include-exts="wp,wpd,odt,doc,mp3,bfw,flac,html,xml,arc" classpath-dirs="lib/nzmetool,xml/nlnz"/>
         <tool class="edu.harvard.hul.ois.fits.tools.oisfileinfo.FileInfo" classpath-dirs="lib/fileinfo" />
         <tool class="edu.harvard.hul.ois.fits.tools.oisfileinfo.XmlMetadata" include-exts="xml" classpath-dirs="lib/xmlmetadata" />
         <tool class="edu.harvard.hul.ois.fits.tools.ffident.FFIdent" exclude-exts="dng,wps,vsd,jar,ppt,rtf" classpath-dirs="lib/ffident" />