--- a/imagej2_macros.xml	Tue Sep 17 16:55:25 2019 -0400
+++ b/imagej2_macros.xml	Mon Sep 28 16:44:56 2020 +0000
@@ -1,9 +1,9 @@
-<?xml version='1.0' encoding='UTF-8'?>
 <macros>
     <token name="@WRAPPER_VERSION@">3.0</token>
     <xml name="fiji_requirements">
         <requirements>
             <requirement type="package" version="20170530">fiji</requirement>
+            <requirement type="package" version="3.4">grep</requirement>
         </requirements>
     </xml>
     <xml name="stdio">
@@ -16,7 +16,7 @@
     </xml>
     <xml name="image_type">
         <param name="image_type" type="select" label="Image type">
-            <option value="8-bit_white" selected="True">8-bit white</option>
+            <option value="8-bit_white" selected="true">8-bit white</option>
             <option value="8-bit_black">8-bit black</option>
             <option value="8-bit_random">8-bit random</option>
             <option value="8-bit_ramp">8-bit ramp</option>
@@ -38,20 +38,45 @@
         <param name="iterations" type="integer" value="1" min="1" max="100" label="Iterations" help="The number of times (1-100) erosion, dilation, opening, and closing are performed."/>
         <param name="count" type="integer" value="1" min="1" max="8" label="Count" help="The number of adjacent background pixels necessary (1-8) for erosion or dilation."/>
         <param name="black_background" type="select" label="Black background" help="If Yes, the background is black and the foreground is white (no implies the opposite).">
-            <option value="no" selected="True">No</option>
+            <option value="no" selected="true">No</option>
             <option value="yes">Yes</option>
         </param>
         <param name="pad_edges_when_eroding" type="select" label="Pad edges when eroding" help="If Yes, eroding does not erode from the edges of the image.">
-            <option value="no" selected="True">No</option>
+            <option value="no" selected="true">No</option>
             <option value="yes">Yes</option>
         </param>
     </xml>
     <xml name="black_background_param">
         <param name="black_background" type="select" label="Black background" help="If Yes, the background is black and the foreground is white (no implies the opposite).">
-            <option value="no" selected="True">No</option>
+            <option value="no" selected="true">No</option>
             <option value="yes">Yes</option>
         </param>
     </xml>
+    <xml name="param_input">
+        <param format="bmp,eps,gif,jpg,pcx,pgm,png,psd,tiff" name="input" type="data" label="Select image"/>
+    </xml>
+    <xml name="param_source_image">
+        <param format="bmp,eps,gif,jpg,pcx,pgm,png,psd,tiff" name="source_image" type="data" label="Source image"/>
+    </xml>
+    <xml name="param_source_mask">
+        <param format="bmp,eps,gif,jpg,pcx,pgm,png,psd,tiff" name="source_mask" type="data" label="Source mask"/>
+    </xml>
+    <xml name="param_target_image">
+        <param format="bmp,eps,gif,jpg,pcx,pgm,png,psd,tiff" name="target_image" type="data" label="Target image"/>
+    </xml>
+    <xml name="param_target_mask">
+        <param format="bmp,eps,gif,jpg,pcx,pgm,png,psd,tiff" name="target_mask" type="data" label="Target mask"/>
+    </xml>
+    <xml name="test_bunwarpj_raw_transform">
+        <param name="target_image" value="dotblot.jpg"/>
+        <param name="source_image" value="blobs.gif"/>
+        <param name="target_raw_transformation" value="target_raw_transformation.txt"/>
+        <param name="source_raw_transformation" value="source_raw_transformation.txt"/>
+    </xml>
+    <xml name="test_target_source_images">
+        <param name="target_image" value="dotblot.jpg"/>
+        <param name="source_image" value="blobs.gif"/>
+    </xml>
     <token name="@make_binary_args@">
         --iterations $iterations
         --count $count