--- parser3/tests/results/315.processed	2015/09/21 22:45:16	1.2
+++ parser3/tests/results/315.processed	2015/09/22 13:56:23	1.4
@@ -1,5 +1,5 @@
 Content-Type: text/html
-Content-Length: 6799
+Content-Length: 7184
 
 [ ]
 Type: date.format,
@@ -11,26 +11,26 @@ Source: create,
 Comment: number expected in date '+'
 [1-1- -1T10:10:10.0+5]
 [1-1- -1T10:10:10.0+5] timestamp: -62135750990
-[1-1- -1T10:10:10.0+5] sql-string: 0000-12-30 10:10:10 SUB-5
+[1-1- -1T10:10:10.0+5] sql-string: 0000-12-30 10:10:10 SUB-5
 [1-1- -1T10:10:10.0+5] iso-string: 0000-12-30T10:10:10+5:00
 [same] timestamp: -62135750990
 [same] sql-string: 0000-12-30 08:10:10 SUB-3
 [same] iso-string: 0000-12-30T08:10:10+3:00
 [1980-1-1T10:10:10.0+5]
 [1980-1-1T10:10:10.0+5] timestamp: 315551410
-[1980-1-1T10:10:10.0+5] sql-string: 1980-01-01 10:10:10 SUB-5
+[1980-1-1T10:10:10.0+5] sql-string: 1980-01-01 10:10:10 SUB-5
 [1980-1-1T10:10:10.0+5] iso-string: 1980-01-01T10:10:10+5:00
 [same] timestamp: 315551410
 [same] sql-string: 1980-01-01 08:10:10 [same] iso-string: 1980-01-01T08:10:10+3:00
 [9999-12-31T10:10:10.0+5]
 [9999-12-31T10:10:10.0+5] timestamp: 253402233010
-[9999-12-31T10:10:10.0+5] sql-string: 9999-12-31 10:10:10 SUB-5
+[9999-12-31T10:10:10.0+5] sql-string: 9999-12-31 10:10:10 SUB-5
 [9999-12-31T10:10:10.0+5] iso-string: 9999-12-31T10:10:10+5:00
 [same] timestamp: 253402233010
 [same] sql-string: 9999-12-31 08:10:10 [same] iso-string: 9999-12-31T08:10:10+3:00
 [9999-12-31T23:59:59-5]
-[9999-12-31T23:59:59-5] timestamp: 253402300799
-[9999-12-31T23:59:59-5] sql-string: 9999-12-31 23:59:59 SUB+5
+[9999-12-31T23:59:59-5] timestamp: 253402318799
+[9999-12-31T23:59:59-5] sql-string: 9999-12-31 23:59:59 SUB+5
 [9999-12-31T23:59:59-5] iso-string: 9999-12-31T23:59:59-5:00
 Type: date.range,
 Source: roll,
@@ -71,6 +71,22 @@ Comment: invalid timezone '+22:100'
 Type: date.format,
 Source: create,
 Comment: invalid timezone '+0 2:10 '
+[2000-1-31T 23:59:59 +02 X]
+Type: date.format,
+Source: create,
+Comment: invalid timezone '+02 X'
+[2000-1-31T 23:59:59+02:10 X]
+Type: date.format,
+Source: create,
+Comment: invalid timezone '+02:10 X'
+[2000-1-31T 23:59:59+02-10]
+Type: date.format,
+Source: create,
+Comment: invalid timezone '+02-10'
+[2000-1-31T 23:59:59Z X]
+Type: date.format,
+Source: create,
+Comment: invalid timezone 'Z X'
 [-1-31 23:59:59]
 Type: date.format,
 Source: create,