diff --git a/src/test/java/osm/jp/gpx/Expecter.java b/src/test/java/osm/jp/gpx/Expecter.java
index e08e01e..d202408 100644
--- a/src/test/java/osm/jp/gpx/Expecter.java
+++ b/src/test/java/osm/jp/gpx/Expecter.java
@@ -11,16 +11,11 @@
 import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.common.ImageMetadata;
 import org.apache.commons.imaging.common.ImageMetadata.ImageMetadataItem;
-import org.apache.commons.imaging.common.RationalNumber;
 import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
 import org.apache.commons.imaging.formats.tiff.TiffImageMetadata;
 import org.apache.commons.imaging.formats.tiff.TiffImageMetadata.GPSInfo;
 import org.apache.commons.imaging.formats.tiff.constants.ExifTagConstants;
 import org.apache.commons.imaging.formats.tiff.constants.GpsTagConstants;
-import org.apache.commons.imaging.formats.tiff.taginfos.TagInfoRational;
-import org.apache.commons.imaging.formats.tiff.write.TiffOutputDirectory;
-import org.apache.commons.imaging.formats.tiff.write.TiffOutputField;
-import org.apache.commons.imaging.formats.tiff.write.TiffOutputSet;
 
 public class Expecter {
     String value;
@@ -28,9 +23,9 @@
     String timeStr;
     double latD;
     double lonD;
-    boolean magvar;
+    String magvar;
 
-    public Expecter(String value, boolean expect, String timeStr, double latD, double lonD, boolean magvar) {
+    public Expecter(String value, boolean expect, String timeStr, double latD, double lonD, String magvar) {
         this.value = value;
         this.expect = expect;
         this.timeStr = timeStr;
@@ -85,31 +80,7 @@
 	                //RationalNumber[] ele = (RationalNumber[]) exif.getFieldValue(GpsTagConstants.GPS_TAG_GPS_ALTITUDE);
 	                
 	                // MAGVAR
-	                if (e.magvar) {
-	                	boolean ismagvar = false;
-	                	List<? extends ImageMetadataItem> dirs = exif.getDirectories();
-	                	for (ImageMetadataItem dir : dirs) {
-	                		if (dir instanceof TiffImageMetadata.Directory) {
-	                			List<? extends ImageMetadataItem> items = ((TiffImageMetadata.Directory)dir).getItems();
-	                			for (ImageMetadataItem item : items) {
-		                			if (item instanceof TiffImageMetadata.TiffMetadataItem) {
-		                				String str = item.toString();
-		                				assertNotNull(str);
-		                				TiffImageMetadata.TiffMetadataItem tiffitem = (TiffImageMetadata.TiffMetadataItem)item;
-		                				String name = GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION.name;
-		                				if (tiffitem.getKeyword() == name) {
-		                					str = tiffitem.getText();
-			                				assertNotNull(str);
-			                				ismagvar = true;	// MAGVARが設定されている
-		                				}
-		                			}
-	                			}
-	                		}
-	                	}
-	                	if (!ismagvar) {
-	                		fail("MAGVARが設定されていない");
-	                	}
-	                }
+                	checkItem(exif, GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION.name, e.magvar);
 	                
 	                // SPEED
 	                
@@ -119,4 +90,70 @@
 			fail("予期しない例外: "+ e1.toString());
 		}
     }
+    
+    /**
+     * 指定のEXIFアイテムが設定されているかどうかのテスト
+     * @param exif
+     * @param keyword	例：GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION.name;
+     */
+    static void checkItem(TiffImageMetadata exif, String keyword) {
+    	boolean ismagvar = false;
+    	List<? extends ImageMetadataItem> dirs = exif.getDirectories();
+    	for (ImageMetadataItem dir : dirs) {
+    		if (dir instanceof TiffImageMetadata.Directory) {
+    			List<? extends ImageMetadataItem> items = ((TiffImageMetadata.Directory)dir).getItems();
+    			for (ImageMetadataItem item : items) {
+        			if (item instanceof TiffImageMetadata.TiffMetadataItem) {
+        				String str = item.toString();
+        				assertNotNull(str);
+        				TiffImageMetadata.TiffMetadataItem tiffitem = (TiffImageMetadata.TiffMetadataItem)item;
+        				if (tiffitem.getKeyword() == keyword) {
+        					str = tiffitem.getText();
+            				assertNotNull(str);
+            				ismagvar = true;	// MAGVARが設定されている
+        				}
+        			}
+    			}
+    		}
+    	}
+    	if (!ismagvar) {
+    		fail("MAGVARが設定されていない");
+    	}
+    	
+    }
+    
+    /**
+     * 指定のEXIFアイテムが設定されているかどうかのテスト
+     * @param exif
+     * @param keyword	例：GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION.name;
+     * @param value		期待する値（nullの場合はアイテムが設定されていないことを期待する）
+     */
+    static void checkItem(TiffImageMetadata exif, String keyword, String value) {
+    	boolean is = false;
+    	List<? extends ImageMetadataItem> dirs = exif.getDirectories();
+    	for (ImageMetadataItem dir : dirs) {
+    		if (dir instanceof TiffImageMetadata.Directory) {
+    			List<? extends ImageMetadataItem> items = ((TiffImageMetadata.Directory)dir).getItems();
+    			for (ImageMetadataItem item : items) {
+        			if (item instanceof TiffImageMetadata.TiffMetadataItem) {
+        				String str = item.toString();
+        				assertNotNull(str);
+        				TiffImageMetadata.TiffMetadataItem tiffitem = (TiffImageMetadata.TiffMetadataItem)item;
+        				if (tiffitem.getKeyword() == keyword) {
+        					if (value == null) {
+        			    		fail("MAGVARが設定されている");
+        					}
+        					str = tiffitem.getText();
+            				assertNotNull(str);
+            				assertThat(str, is(value));
+            				is = true;	// MAGVARが設定されている
+        				}
+        			}
+    			}
+    		}
+    	}
+    	if (!is && (value != null)) {
+    		fail("MAGVARが設定されていない");
+    	}
+    }
 }
diff --git a/src/test/java/osm/jp/gpx/Fixture.java b/src/test/java/osm/jp/gpx/Fixture.java
index 8fdc8a3..bc20a28 100644
--- a/src/test/java/osm/jp/gpx/Fixture.java
+++ b/src/test/java/osm/jp/gpx/Fixture.java
@@ -52,18 +52,18 @@
 		    "target/test-classes/cameradata/",
 		    "target/test-classes/cameradata/AdjustTime.ini",
 		    new Expecter[] {
-		        new Expecter("109_0426/IMG_0001.JPG", false, null, 90.0D, 180.0D, false),
-		        new Expecter("109_0426/IMG_0004.JPG", true, "2020:04:26 10:58:18", 35.4393043555D, 139.4478441775D, false),
-		        new Expecter("109_0426/IMG_0007.JPG", true, "2020:04:26 11:17:48", 35.4382312205D, 139.4584579300D, false),
-		        new Expecter("109_0426/IMG_0010.JPG", true, "2020:04:26 11:20:42", 35.4374477640D, 139.4604294375D, false),
-		        new Expecter("109_0426/IMG_0013.JPG", true, "2020:04:26 12:11:28", 35.4209551122D, 139.4677959569D, false),
-		        new Expecter("109_0426/IMG_0016.JPG", true, "2020:04:26 12:19:42", 35.4202432372D, 139.4685635716D, false),
-		        new Expecter("109_0426/IMG_0019.JPG", true, "2020:04:26 12:21:48", 35.4181452468D, 139.4684348255D, false),
-		        new Expecter("109_0426/IMG_0022.JPG", false, null, 90.0D, 180.0D, false),
-		        new Expecter("109_0426/IMG_0025.JPG", false, null, 90.0D, 180.0D, false),
-		        new Expecter("109_0426/IMG_0028.JPG", false, null, 90.0D, 180.0D, false),
-		        new Expecter("109_0426/IMG_0031.JPG", false, null, 90.0D, 180.0D, false),
-		        new Expecter("109_0426/IMG_0034.JPG", false, null, 90.0D, 180.0D, false),
+		        new Expecter("109_0426/IMG_0001.JPG", false, null, 90.0D, 180.0D, null),
+		        new Expecter("109_0426/IMG_0004.JPG", true, "2020:04:26 10:58:18", 35.4393043555D, 139.4478441775D, null),
+		        new Expecter("109_0426/IMG_0007.JPG", true, "2020:04:26 11:17:48", 35.4382312205D, 139.4584579300D, null),
+		        new Expecter("109_0426/IMG_0010.JPG", true, "2020:04:26 11:20:42", 35.4374477640D, 139.4604294375D, null),
+		        new Expecter("109_0426/IMG_0013.JPG", true, "2020:04:26 12:11:28", 35.4209551122D, 139.4677959569D, null),
+		        new Expecter("109_0426/IMG_0016.JPG", true, "2020:04:26 12:19:42", 35.4202432372D, 139.4685635716D, null),
+		        new Expecter("109_0426/IMG_0019.JPG", true, "2020:04:26 12:21:48", 35.4181452468D, 139.4684348255D, null),
+		        new Expecter("109_0426/IMG_0022.JPG", false, null, 90.0D, 180.0D, null),
+		        new Expecter("109_0426/IMG_0025.JPG", false, null, 90.0D, 180.0D, null),
+		        new Expecter("109_0426/IMG_0028.JPG", false, null, 90.0D, 180.0D, null),
+		        new Expecter("109_0426/IMG_0031.JPG", false, null, 90.0D, 180.0D, null),
+		        new Expecter("109_0426/IMG_0034.JPG", false, null, 90.0D, 180.0D, null),
 		    }
 		),
 		new Fixture(
@@ -73,18 +73,18 @@
 			    "target/test-classes/cameradata/",
 			    "target/test-classes/cameradata/AdjustTime.magvar.ini",
 			    new Expecter[] {
-			        new Expecter("109_0426/IMG_0001.JPG", false, null, 90.0D, 180.0D, false),
-			        new Expecter("109_0426/IMG_0004.JPG", true, "2020:04:26 10:58:18", 35.4393043555D, 139.4478441775D, true),
-			        new Expecter("109_0426/IMG_0007.JPG", true, "2020:04:26 11:17:48", 35.4382312205D, 139.4584579300D, true),
-			        new Expecter("109_0426/IMG_0010.JPG", true, "2020:04:26 11:20:42", 35.4374477640D, 139.4604294375D, true),
-			        new Expecter("109_0426/IMG_0013.JPG", true, "2020:04:26 12:11:28", 35.4209551122D, 139.4677959569D, true),
-			        new Expecter("109_0426/IMG_0016.JPG", true, "2020:04:26 12:19:42", 35.4202432372D, 139.4685635716D, true),
-			        new Expecter("109_0426/IMG_0019.JPG", true, "2020:04:26 12:21:48", 35.4181452468D, 139.4684348255D, true),
-			        new Expecter("109_0426/IMG_0022.JPG", false, null, 90.0D, 180.0D, false),
-			        new Expecter("109_0426/IMG_0025.JPG", false, null, 90.0D, 180.0D, false),
-			        new Expecter("109_0426/IMG_0028.JPG", false, null, 90.0D, 180.0D, false),
-			        new Expecter("109_0426/IMG_0031.JPG", false, null, 90.0D, 180.0D, false),
-			        new Expecter("109_0426/IMG_0034.JPG", false, null, 90.0D, 180.0D, false),
+			        new Expecter("109_0426/IMG_0001.JPG", false, null, 90.0D, 180.0D, null),
+			        new Expecter("109_0426/IMG_0004.JPG", true, "2020:04:26 10:58:18", 35.4393043555D, 139.4478441775D, "348"),
+			        new Expecter("109_0426/IMG_0007.JPG", true, "2020:04:26 11:17:48", 35.4382312205D, 139.4584579300D, "126"),
+			        new Expecter("109_0426/IMG_0010.JPG", true, "2020:04:26 11:20:42", 35.4374477640D, 139.4604294375D, "115"),
+			        new Expecter("109_0426/IMG_0013.JPG", true, "2020:04:26 12:11:28", 35.4209551122D, 139.4677959569D, "101"),
+			        new Expecter("109_0426/IMG_0016.JPG", true, "2020:04:26 12:19:42", 35.4202432372D, 139.4685635716D, "189"),
+			        new Expecter("109_0426/IMG_0019.JPG", true, "2020:04:26 12:21:48", 35.4181452468D, 139.4684348255D, "173"),
+			        new Expecter("109_0426/IMG_0022.JPG", false, null, 90.0D, 180.0D, null),
+			        new Expecter("109_0426/IMG_0025.JPG", false, null, 90.0D, 180.0D, null),
+			        new Expecter("109_0426/IMG_0028.JPG", false, null, 90.0D, 180.0D, null),
+			        new Expecter("109_0426/IMG_0031.JPG", false, null, 90.0D, 180.0D, null),
+			        new Expecter("109_0426/IMG_0034.JPG", false, null, 90.0D, 180.0D, null),
 			    }
 			),
     };
@@ -102,11 +102,11 @@
             "target/test-classes/cameradata/20170518.gpx",
             "target/test-classes/ini/AdjustTime.20170518.A1.ini",
             new Expecter[] {
-                new Expecter("10170518/DSC05183.JPG", false, null, 90.0D, 180.0D, false),
-                new Expecter("10170518/DSC05184.JPG", true, "2017:05:18 09:34:44", 35.4367520000D, 139.4082730000D, false),
-                new Expecter("10170518/DSC05196.JPG", true, "2017:05:18 09:37:32", 35.4376820000D, 139.4085150000D, false),
-                new Expecter("10170518/DSC05204.JPG", true, "2017:05:18 09:46:48", 35.4368560000D, 139.4082190000D, false),
-                new Expecter("10170518/DSC05205.JPG", false, null, 90.0D, 180.0D, false),
+                new Expecter("10170518/DSC05183.JPG", false, null, 90.0D, 180.0D, null),
+                new Expecter("10170518/DSC05184.JPG", true, "2017:05:18 09:34:44", 35.4367520000D, 139.4082730000D, null),
+                new Expecter("10170518/DSC05196.JPG", true, "2017:05:18 09:37:32", 35.4376820000D, 139.4085150000D, null),
+                new Expecter("10170518/DSC05204.JPG", true, "2017:05:18 09:46:48", 35.4368560000D, 139.4082190000D, null),
+                new Expecter("10170518/DSC05205.JPG", false, null, 90.0D, 180.0D, null),
             }
         ),
         // 2
@@ -117,11 +117,11 @@
             "target/test-classes/cameradata/20170518.gpx",
             "target/test-classes/ini/AdjustTime.20170518.A2.ini",
             new Expecter[] {
-                new Expecter("10170518/DSC05183.JPG", true, "2017:05:18 09:16:48", 90.0D, 180.0D, false),
-                new Expecter("10170518/DSC05184.JPG", true, "2017:05:18 09:34:44", 35.4367520000D, 139.4082730000D, false),
-                new Expecter("10170518/DSC05196.JPG", true, "2017:05:18 09:37:32", 35.4376820000D, 139.4085150000D, false),
-                new Expecter("10170518/DSC05204.JPG", true, "2017:05:18 09:46:48", 35.4368560000D, 139.4082190000D, false),
-                new Expecter("10170518/DSC05205.JPG", true, "2017:05:18 09:48:04", 90.0D, 180.0D, false),
+                new Expecter("10170518/DSC05183.JPG", true, "2017:05:18 09:16:48", 90.0D, 180.0D, null),
+                new Expecter("10170518/DSC05184.JPG", true, "2017:05:18 09:34:44", 35.4367520000D, 139.4082730000D, null),
+                new Expecter("10170518/DSC05196.JPG", true, "2017:05:18 09:37:32", 35.4376820000D, 139.4085150000D, null),
+                new Expecter("10170518/DSC05204.JPG", true, "2017:05:18 09:46:48", 35.4368560000D, 139.4082190000D, null),
+                new Expecter("10170518/DSC05205.JPG", true, "2017:05:18 09:48:04", 90.0D, 180.0D, null),
             }
         ),
         // 3.
@@ -132,10 +132,10 @@
             "target/test-classes/cameradata/20170518.gpx",
             "target/test-classes/ini/AdjustTime.20170518.B1.ini",
             new Expecter[] {
-                new Expecter("cameradata/20170518_092031A.jpg", false, null, 90.0D, 180.0D, false),
-                new Expecter("cameradata/20170518_094226A_snap.jpg", true, "2017:05:18 09:42:26", 35.4366860000D, 139.4082650000D, false),
-                new Expecter("cameradata/20170518_094737A.jpg", true, "2017:05:18 09:47:36", 35.4368200000D, 139.4082810000D, false),
-                new Expecter("cameradata/20170518_094827A.jpg", false, null, 90.0D, 180.0D, false),
+                new Expecter("cameradata/20170518_092031A.jpg", false, null, 90.0D, 180.0D, null),
+                new Expecter("cameradata/20170518_094226A_snap.jpg", true, "2017:05:18 09:42:26", 35.4366860000D, 139.4082650000D, null),
+                new Expecter("cameradata/20170518_094737A.jpg", true, "2017:05:18 09:47:36", 35.4368200000D, 139.4082810000D, null),
+                new Expecter("cameradata/20170518_094827A.jpg", false, null, 90.0D, 180.0D, null),
             }
         ),
         // 4.
@@ -146,10 +146,10 @@
             "target/test-classes/cameradata/20170518.gpx",
             "target/test-classes/ini/AdjustTime.20170518.B2.ini",
             new Expecter[] {
-                new Expecter("cameradata/20170518_092031A.jpg", true, "2017:05:18 09:20:30", 90.0D, 180.0D, false),
-                new Expecter("cameradata/20170518_094226A_snap.jpg", true, "2017:05:18 09:42:26", 35.4366860000D, 139.4082650000D, false),
-                new Expecter("cameradata/20170518_094737A.jpg", true, "2017:05:18 09:47:36", 35.4368200000D, 139.4082810000D, false),
-                new Expecter("cameradata/20170518_094827A.jpg", true, "2017:05:18 09:48:26", 90.0D, 180.0D, false),
+                new Expecter("cameradata/20170518_092031A.jpg", true, "2017:05:18 09:20:30", 90.0D, 180.0D, null),
+                new Expecter("cameradata/20170518_094226A_snap.jpg", true, "2017:05:18 09:42:26", 35.4366860000D, 139.4082650000D, null),
+                new Expecter("cameradata/20170518_094737A.jpg", true, "2017:05:18 09:47:36", 35.4368200000D, 139.4082810000D, null),
+                new Expecter("cameradata/20170518_094827A.jpg", true, "2017:05:18 09:48:26", 90.0D, 180.0D, null),
             }
         ),
         // 5.
@@ -161,29 +161,29 @@
             "target/test-classes/ini/AdjustTime.M1a.separate.ini",
             new Expecter[] {
                 // out of time ( - 2017-05-29T01:23:18)
-                new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, null),
 
                 // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-                new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, false),
-                new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
-                new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808881603D, 137.9979396332D, true),
+                new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, null),
+                new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, "191"),
+                new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808881603D, 137.9979396332D, "100"),
 
                 // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
-                new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, null),
 
                 // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-                new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
-                new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
+                new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, "178"),
+                new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, "95"),
 
                 // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
-                new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, null),
 
                 // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-                new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
-                new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, true),
+                new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, "111"),
+                new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, "344"),
             }
         ),
 
@@ -195,29 +195,29 @@
             "target/test-classes/ini/AdjustTime.M1b.separate.ini",
             new Expecter[] {
                 // out of time ( - 2017-05-29T01:23:18)
-                new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:06", 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:06", 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, null),
 
                 // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-                new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, false),
-                new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
-                new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808881603D, 137.9979396332D, true),
+                new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, null),
+                new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, "191"),
+                new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808641881D, 137.9979D, "100"),
 
                 // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
-                new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:10", 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:10", 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, null),
 
                 // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-                new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
-                new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
+                new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, "178"),
+                new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, "95"),
 
                 // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
-                new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:14", 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:44", 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:14", 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:44", 90.0D, 180.0D, null),
 
                 // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-                new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
-                new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, true),
+                new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, "111"),
+                new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, "344"),
             }
         ),
 
@@ -229,29 +229,29 @@
             "target/test-classes/ini/AdjustTime.M1c.separate.ini",
             new Expecter[] {
                 // out of time ( - 2017-05-29T01:23:18)
-                new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, null),
 
                 // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-                new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, false),
-                new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
-                new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, true),
+                new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, null),
+                new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, "191"),
+                new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, "100"),
 
                 // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
-                new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, null),
 
                 // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-                new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
-                new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
+                new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, "178"),
+                new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, "95"),
 
                 // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
-                new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, null),
 
                 // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-                new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
-                new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339846227D, 138.0625408050D, true),
+                new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, "111"),
+                new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339846227D, 138.0625408050D, "345"),
             }
         ),
 
@@ -263,29 +263,29 @@
             "target/test-classes/ini/AdjustTime.M1d.separate.ini",
             new Expecter[] {
                 // out of time ( - 2017-05-29T01:23:18)
-                new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:05", 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:05", 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, null),
 
                 // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-                new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, false),
-                new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
-                new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, true),
+                new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, null),
+                new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, "191"),
+                new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, "100"),
 
                 // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
-                new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:09", 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:09", 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, null),
 
                 // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-                new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
-                new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
+                new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, "178"),
+                new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, "95"),
 
                 // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
-                new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:15", 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:45", 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:15", 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:45", 90.0D, 180.0D, null),
 
                 // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-                new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
-                new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339846227D, 138.0625408050D, true),
+                new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, "111"),
+                new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339846227D, 138.0625408050D, "345"),
             }
         ),
 
@@ -298,29 +298,29 @@
             "target/test-classes/ini/AdjustTime.M2a.separate.ini",
             new Expecter[] {
                 // out of time ( - 2017-05-29T01:23:18)
-                new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, null),
 
                 // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-                new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, false),
-                new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
-                new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808881603D, 137.9979396332D, true),
+                new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, null),
+                new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, "191"),
+                new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808641881D, 137.9979, "100"),
 
                 // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
-                new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, null),
 
                 // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-                new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
-                new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
+                new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, "178"),
+                new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, "95"),
 
                 // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
-                new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, null),
 
                 // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-                new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
-                new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, true),
+                new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, "111"),
+                new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, "344"),
             }
         ),
 
@@ -332,29 +332,29 @@
             "target/test-classes/ini/AdjustTime.M2b.separate.ini",
             new Expecter[] {
                 // out of time ( - 2017-05-29T01:23:18)
-                new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:06", 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:06", 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, null),
 
                 // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-                new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, false),
-                new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
-                new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808881603D, 137.9979396332D, true),
+                new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, null),
+                new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, "191"),
+                new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808641881D, 137.9979, "100"),
 
                 // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
-                new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:10", 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:10", 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, null),
 
                 // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-                new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
-                new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
+                new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, "178"),
+                new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, "95"),
 
                 // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
-                new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:14", 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:44", 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:14", 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:44", 90.0D, 180.0D, null),
 
                 // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-                new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
-                new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, true),
+                new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, "111"),
+                new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, "344"),
             }
         ),
 
@@ -366,29 +366,29 @@
             "target/test-classes/ini/AdjustTime.M2c.separate.ini",
             new Expecter[] {
                 // out of time ( - 2017-05-29T01:23:18)
-                new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, null),
 
                 // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-                new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, false),
-                new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
-                new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, true),
+                new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, null),
+                new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, "191"),
+                new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, "100"),
 
                 // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
-                new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, null),
 
                 // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-                new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
-                new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
+                new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, "178"),
+                new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, "95"),
 
                 // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
-                new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, null),
 
                 // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-                new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
-                new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339889813D, 138.0625394639D, true),
+                new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, "111"),
+                new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339846227D, 138.0625408050D, "345"),
             }
         ),
 
@@ -400,29 +400,29 @@
             "target/test-classes/ini/AdjustTime.M2d.separate.ini",
             new Expecter[] {
                 // out of time ( - 2017-05-29T01:23:18)
-                new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:05", 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:05", 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, null),
 
                 // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-                new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, false),
-                new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
-                new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, true),
+                new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, null),
+                new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, "191"),
+                new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, "100"),
 
                 // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
-                new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:09", 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:09", 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, null),
 
                 // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-                new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
-                new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
+                new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, "178"),
+                new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, "95"),
 
                 // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
-                new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:15", 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:45", 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:15", 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:45", 90.0D, 180.0D, null),
 
                 // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-                new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
-                new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339889813D, 138.0625394639D, true),
+                new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, "111"),
+                new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339846227D, 138.0625408050D, "345"),
             }
         ),
 
@@ -434,29 +434,29 @@
             "target/test-classes/ini/AdjustTime.M2a.separate.ini",
             new Expecter[] {
                 // out of time ( - 2017-05-29T01:23:18)
-                new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, null),
 
                 // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-                new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, false),
-                new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
-                new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808881603D, 137.9979396332D, true),
+                new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, null),
+                new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, "191"),
+                new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808641881D, 137.9979, "100"),
 
                 // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
-                new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, null),
 
                 // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-                new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
-                new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
+                new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, "178"),
+                new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, "95"),
 
                 // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
-                new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, null),
 
                 // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-                new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
-                new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, true),
+                new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, "111"),
+                new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, "344"),
             }
         ),
 
@@ -468,29 +468,29 @@
             "target/test-classes/ini/AdjustTime.M2b.separate.ini",
             new Expecter[] {
                 // out of time ( - 2017-05-29T01:23:18)
-                new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:06", 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:06", 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, null),
 
                 // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-                new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, false),
-                new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
-                new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808881603D, 137.9979396332D, true),
+                new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, null),
+                new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, "191"),
+                new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808641881D, 137.9979D, "100"),
 
                 // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
-                new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:10", 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:10", 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, null),
 
                 // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-                new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
-                new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
+                new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, "178"),
+                new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, "95"),
 
                 // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
-                new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:14", 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:44", 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:14", 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:44", 90.0D, 180.0D, null),
 
                 // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-                new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
-                new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, true),
+                new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, "111"),
+                new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, "344"),
             }
         ),
 
@@ -502,29 +502,29 @@
             "target/test-classes/ini/AdjustTime.M2c.separate.ini",
             new Expecter[] {
                 // out of time ( - 2017-05-29T01:23:18)
-                new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, null),
 
                 // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-                new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, false),
-                new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
-                new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, true),
+                new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, null),
+                new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, "191"),
+                new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, "100"),
 
                 // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
-                new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, null),
 
                 // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-                new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
-                new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
+                new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, "178"),
+                new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, "95"),
 
                 // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
-                new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, null),
 
                 // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-                new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
-                new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339889813D, 138.0625394639D, true),
+                new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, "111"),
+                new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339846227D, 138.0625408050D, "345"),
             }
         ),
 
@@ -536,29 +536,29 @@
             "target/test-classes/ini/AdjustTime.M2d.separate.ini",
             new Expecter[] {
                 // out of time ( - 2017-05-29T01:23:18)
-                new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:05", 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:05", 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, null),
 
                 // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-                new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, false),
-                new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
-                new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, true),
+                new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, null),
+                new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, "191"),
+                new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, "100"),
 
                 // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
-                new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:09", 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:09", 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, null),
 
                 // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-                new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
-                new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
+                new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, "178"),
+                new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, "95"),
 
                 // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
-                new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:15", 90.0D, 180.0D, false),
-                new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:45", 90.0D, 180.0D, false),
+                new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:15", 90.0D, 180.0D, null),
+                new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:45", 90.0D, 180.0D, null),
 
                 // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-                new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
-                new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339889813D, 138.0625394639D, true),
+                new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, "111"),
+                new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339846227D, 138.0625408050D, "345"),
             }
         ),
     };