diff --git a/_test/definitions/lastseqnumprocessed/fix42/LastProcessedMsgSeqNum.def b/_test/definitions/lastseqnumprocessed/fix42/LastProcessedMsgSeqNum.def
index 1486575da..1a9de8932 100644
--- a/_test/definitions/lastseqnumprocessed/fix42/LastProcessedMsgSeqNum.def
+++ b/_test/definitions/lastseqnumprocessed/fix42/LastProcessedMsgSeqNum.def
@@ -1,7 +1,7 @@
 iCONNECT
 
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
369=0
98=0
108=2

-E8=FIX.4.2
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
369=1
98=0
108=2
10=0

+E8=FIX.4.2
9=72
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
369=1
98=0
108=2
141=Y
10=0

 
 I8=FIX.4.2
35=1
34=2
49=TW
52=<TIME>
56=ISLD
369=1
112=HELLO

 E8=FIX.4.2
9=65
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
369=2
112=HELLO
10=0

diff --git a/_test/definitions/lastseqnumprocessed/fix43/LastProcessedMsgSeqNum.def b/_test/definitions/lastseqnumprocessed/fix43/LastProcessedMsgSeqNum.def
index e87be0773..c02021e79 100644
--- a/_test/definitions/lastseqnumprocessed/fix43/LastProcessedMsgSeqNum.def
+++ b/_test/definitions/lastseqnumprocessed/fix43/LastProcessedMsgSeqNum.def
@@ -1,7 +1,7 @@
 iCONNECT
 
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
369=0
98=0
108=2

-E8=FIX.4.3
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
369=1
98=0
108=2
10=0

+E8=FIX.4.3
9=72
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
369=1
98=0
108=2
141=Y
10=0

 
 I8=FIX.4.3
35=1
34=2
49=TW
52=<TIME>
56=ISLD
369=1
112=HELLO

 E8=FIX.4.3
9=65
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
369=2
112=HELLO
10=0

diff --git a/_test/definitions/lastseqnumprocessed/fix44/LastProcessedMsgSeqNum.def b/_test/definitions/lastseqnumprocessed/fix44/LastProcessedMsgSeqNum.def
index be02244f1..7613b3009 100644
--- a/_test/definitions/lastseqnumprocessed/fix44/LastProcessedMsgSeqNum.def
+++ b/_test/definitions/lastseqnumprocessed/fix44/LastProcessedMsgSeqNum.def
@@ -1,7 +1,7 @@
 iCONNECT
 
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
369=0
98=0
108=2

-E8=FIX.4.4
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
369=1
98=0
108=2
10=0

+E8=FIX.4.4
9=72
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
369=1
98=0
108=2
141=Y
10=0

 
 I8=FIX.4.4
35=1
34=2
49=TW
52=<TIME>
56=ISLD
369=1
112=HELLO

 E8=FIX.4.4
9=65
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
369=2
112=HELLO
10=0

diff --git a/_test/definitions/lastseqnumprocessed/fix50/LastProcessedMsgSeqNum.def b/_test/definitions/lastseqnumprocessed/fix50/LastProcessedMsgSeqNum.def
index 9484e9299..325f56075 100644
--- a/_test/definitions/lastseqnumprocessed/fix50/LastProcessedMsgSeqNum.def
+++ b/_test/definitions/lastseqnumprocessed/fix50/LastProcessedMsgSeqNum.def
@@ -1,7 +1,7 @@
 iCONNECT
 
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
369=0
98=0
108=2
1137=7

-E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
369=1
98=0
108=2
1137=7
10=0

+E8=FIXT.1.1
9=79
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
369=1
98=0
108=2
141=Y
1137=7
10=0

 
 I8=FIXT.1.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
369=1
112=HELLO

 E8=FIXT.1.1
9=65
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
369=2
112=HELLO
10=0

diff --git a/_test/definitions/lastseqnumprocessed/fix50sp1/LastProcessedMsgSeqNum.def b/_test/definitions/lastseqnumprocessed/fix50sp1/LastProcessedMsgSeqNum.def
index b09b04a40..6c209e1ce 100644
--- a/_test/definitions/lastseqnumprocessed/fix50sp1/LastProcessedMsgSeqNum.def
+++ b/_test/definitions/lastseqnumprocessed/fix50sp1/LastProcessedMsgSeqNum.def
@@ -1,7 +1,7 @@
 iCONNECT
 
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
369=0
98=0
108=2
1137=8

-E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
369=1
98=0
108=2
1137=8
10=0

+E8=FIXT.1.1
9=79
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
369=1
98=0
108=2
141=Y
1137=8
10=0

 
 I8=FIXT.1.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
369=1
112=HELLO

 E8=FIXT.1.1
9=65
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
369=2
112=HELLO
10=0

diff --git a/_test/definitions/lastseqnumprocessed/fix50sp2/LastProcessedMsgSeqNum.def b/_test/definitions/lastseqnumprocessed/fix50sp2/LastProcessedMsgSeqNum.def
index e94dcbee4..82550741d 100644
--- a/_test/definitions/lastseqnumprocessed/fix50sp2/LastProcessedMsgSeqNum.def
+++ b/_test/definitions/lastseqnumprocessed/fix50sp2/LastProcessedMsgSeqNum.def
@@ -1,7 +1,7 @@
 iCONNECT
 
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
369=0
98=0
108=2
1137=9

-E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
369=1
98=0
108=2
1137=9
10=0

+E8=FIXT.1.1
9=79
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
369=1
98=0
108=2
141=Y
1137=9
10=0

 
 I8=FIXT.1.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
369=1
112=HELLO

 E8=FIXT.1.1
9=65
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
369=2
112=HELLO
10=0

diff --git a/_test/definitions/resendreqchunksize/fix41/SequenceGapFollowedByMessageResent.def b/_test/definitions/resendreqchunksize/fix41/SequenceGapFollowedByMessageResent.def
index d32fcfe72..72fc8c33a 100644
--- a/_test/definitions/resendreqchunksize/fix41/SequenceGapFollowedByMessageResent.def
+++ b/_test/definitions/resendreqchunksize/fix41/SequenceGapFollowedByMessageResent.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 I8=FIX.4.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC

 E8=FIX.4.1
9=81
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
10=0

diff --git a/_test/definitions/resendreqchunksize/fix41/SequenceGapFollowedBySequenceResetWithGapFill.def b/_test/definitions/resendreqchunksize/fix41/SequenceGapFollowedBySequenceResetWithGapFill.def
index ec414aef6..613162219 100644
--- a/_test/definitions/resendreqchunksize/fix41/SequenceGapFollowedBySequenceResetWithGapFill.def
+++ b/_test/definitions/resendreqchunksize/fix41/SequenceGapFollowedBySequenceResetWithGapFill.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 I8=FIX.4.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC

 E8=FIX.4.1
9=81
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
10=0

diff --git a/_test/definitions/resendreqchunksize/fix42/SequenceGapFollowedByMessageResent.def b/_test/definitions/resendreqchunksize/fix42/SequenceGapFollowedByMessageResent.def
index 0380bf01f..8ff882279 100644
--- a/_test/definitions/resendreqchunksize/fix42/SequenceGapFollowedByMessageResent.def
+++ b/_test/definitions/resendreqchunksize/fix42/SequenceGapFollowedByMessageResent.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 I8=FIX.4.2
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

 E8=FIX.4.2
9=106
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

diff --git a/_test/definitions/resendreqchunksize/fix42/SequenceGapFollowedBySequenceResetWithGapFill.def b/_test/definitions/resendreqchunksize/fix42/SequenceGapFollowedBySequenceResetWithGapFill.def
index 0e2842311..8d50c37ef 100644
--- a/_test/definitions/resendreqchunksize/fix42/SequenceGapFollowedBySequenceResetWithGapFill.def
+++ b/_test/definitions/resendreqchunksize/fix42/SequenceGapFollowedBySequenceResetWithGapFill.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 I8=FIX.4.2
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

 E8=FIX.4.2
9=106
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

diff --git a/_test/definitions/resendreqchunksize/fix43/SequenceGapFollowedByMessageResent.def b/_test/definitions/resendreqchunksize/fix43/SequenceGapFollowedByMessageResent.def
index 7a53185b7..d3659857e 100644
--- a/_test/definitions/resendreqchunksize/fix43/SequenceGapFollowedByMessageResent.def
+++ b/_test/definitions/resendreqchunksize/fix43/SequenceGapFollowedByMessageResent.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 I8=FIX.4.3
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

 E8=FIX.4.3
9=106
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

diff --git a/_test/definitions/resendreqchunksize/fix43/SequenceGapFollowedBySequenceResetWithGapFill.def b/_test/definitions/resendreqchunksize/fix43/SequenceGapFollowedBySequenceResetWithGapFill.def
index 9401dd6b3..d23f28247 100644
--- a/_test/definitions/resendreqchunksize/fix43/SequenceGapFollowedBySequenceResetWithGapFill.def
+++ b/_test/definitions/resendreqchunksize/fix43/SequenceGapFollowedBySequenceResetWithGapFill.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 I8=FIX.4.3
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

 E8=FIX.4.3
9=106
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

diff --git a/_test/definitions/resendreqchunksize/fix44/SequenceGapFollowedByMessageResent.def b/_test/definitions/resendreqchunksize/fix44/SequenceGapFollowedByMessageResent.def
index 59ce6f208..4b5aa84af 100644
--- a/_test/definitions/resendreqchunksize/fix44/SequenceGapFollowedByMessageResent.def
+++ b/_test/definitions/resendreqchunksize/fix44/SequenceGapFollowedByMessageResent.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 I8=FIX.4.4
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

 E8=FIX.4.4
9=106
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

diff --git a/_test/definitions/resendreqchunksize/fix44/SequenceGapFollowedBySequenceResetWithGapFill.def b/_test/definitions/resendreqchunksize/fix44/SequenceGapFollowedBySequenceResetWithGapFill.def
index d40f04cc0..447114d4c 100644
--- a/_test/definitions/resendreqchunksize/fix44/SequenceGapFollowedBySequenceResetWithGapFill.def
+++ b/_test/definitions/resendreqchunksize/fix44/SequenceGapFollowedBySequenceResetWithGapFill.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 I8=FIX.4.4
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

 E8=FIX.4.4
9=106
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

diff --git a/_test/definitions/resendreqchunksize/fix50/SequenceGapFollowedByMessageResent.def b/_test/definitions/resendreqchunksize/fix50/SequenceGapFollowedByMessageResent.def
index 9dbb21eb7..53e7bfd6c 100644
--- a/_test/definitions/resendreqchunksize/fix50/SequenceGapFollowedByMessageResent.def
+++ b/_test/definitions/resendreqchunksize/fix50/SequenceGapFollowedByMessageResent.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

 E8=FIXT.1.1
9=106
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

diff --git a/_test/definitions/resendreqchunksize/fix50/SequenceGapFollowedBySequenceResetWithGapFill.def b/_test/definitions/resendreqchunksize/fix50/SequenceGapFollowedBySequenceResetWithGapFill.def
index 1106ee5a3..3577a2040 100644
--- a/_test/definitions/resendreqchunksize/fix50/SequenceGapFollowedBySequenceResetWithGapFill.def
+++ b/_test/definitions/resendreqchunksize/fix50/SequenceGapFollowedBySequenceResetWithGapFill.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=7

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=2
1137=7
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=2
141=Y
1137=7
10=0

 
 I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

 E8=FIXT.1.1
9=106
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

diff --git a/_test/definitions/resendreqchunksize/fix50sp1/SequenceGapFollowedByMessageResent.def b/_test/definitions/resendreqchunksize/fix50sp1/SequenceGapFollowedByMessageResent.def
index 9d047c4ec..06d1c1619 100644
--- a/_test/definitions/resendreqchunksize/fix50sp1/SequenceGapFollowedByMessageResent.def
+++ b/_test/definitions/resendreqchunksize/fix50sp1/SequenceGapFollowedByMessageResent.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

 E8=FIXT.1.1
9=106
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

diff --git a/_test/definitions/resendreqchunksize/fix50sp1/SequenceGapFollowedBySequenceResetWithGapFill.def b/_test/definitions/resendreqchunksize/fix50sp1/SequenceGapFollowedBySequenceResetWithGapFill.def
index 846f09b14..975bd9dca 100644
--- a/_test/definitions/resendreqchunksize/fix50sp1/SequenceGapFollowedBySequenceResetWithGapFill.def
+++ b/_test/definitions/resendreqchunksize/fix50sp1/SequenceGapFollowedBySequenceResetWithGapFill.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=8

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=2
1137=8
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=2
141=Y
1137=8
10=0

 
 I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

 E8=FIXT.1.1
9=106
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

diff --git a/_test/definitions/resendreqchunksize/fix50sp2/SequenceGapFollowedByMessageResent.def b/_test/definitions/resendreqchunksize/fix50sp2/SequenceGapFollowedByMessageResent.def
index 4659731e1..dc4f4701c 100644
--- a/_test/definitions/resendreqchunksize/fix50sp2/SequenceGapFollowedByMessageResent.def
+++ b/_test/definitions/resendreqchunksize/fix50sp2/SequenceGapFollowedByMessageResent.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

 E8=FIXT.1.1
9=106
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

diff --git a/_test/definitions/resendreqchunksize/fix50sp2/SequenceGapFollowedBySequenceResetWithGapFill.def b/_test/definitions/resendreqchunksize/fix50sp2/SequenceGapFollowedBySequenceResetWithGapFill.def
index 943b9790f..82939227d 100644
--- a/_test/definitions/resendreqchunksize/fix50sp2/SequenceGapFollowedBySequenceResetWithGapFill.def
+++ b/_test/definitions/resendreqchunksize/fix50sp2/SequenceGapFollowedBySequenceResetWithGapFill.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=9

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=2
1137=9
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=2
141=Y
1137=9
10=0

 
 I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

 E8=FIXT.1.1
9=106
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

diff --git a/_test/definitions/server/fix41/10_MsgSeqNumEqual.def b/_test/definitions/server/fix41/10_MsgSeqNumEqual.def
index 54f8498e0..ad4e96e77 100644
--- a/_test/definitions/server/fix41/10_MsgSeqNumEqual.def
+++ b/_test/definitions/server/fix41/10_MsgSeqNumEqual.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 # sequence reset with gap fill flag set to Y
 I8=FIX.4.1
35=4
34=2
49=TW
52=<TIME>
56=ISLD
36=20
123=Y

diff --git a/_test/definitions/server/fix41/10_MsgSeqNumGreater.def b/_test/definitions/server/fix41/10_MsgSeqNumGreater.def
index c8327a49c..a5c31b179 100644
--- a/_test/definitions/server/fix41/10_MsgSeqNumGreater.def
+++ b/_test/definitions/server/fix41/10_MsgSeqNumGreater.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 # sequence reset with gap fill flag set to Y
 I8=FIX.4.1
35=4
34=10
49=TW
52=<TIME>
56=ISLD
36=20
123=Y

diff --git a/_test/definitions/server/fix41/10_MsgSeqNumLess.def b/_test/definitions/server/fix41/10_MsgSeqNumLess.def
index 227978c7b..b109b6c0c 100644
--- a/_test/definitions/server/fix41/10_MsgSeqNumLess.def
+++ b/_test/definitions/server/fix41/10_MsgSeqNumLess.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 # sequence reset with gap fill flag set to Y, PosDupFlag set to Y
 I8=FIX.4.1
35=4
34=1
49=TW
52=<TIME>
56=ISLD
43=Y
122=<TIME-1>
36=20
123=Y

diff --git a/_test/definitions/server/fix41/11a_NewSeqNoGreater.def b/_test/definitions/server/fix41/11a_NewSeqNoGreater.def
index 4015d9134..1521c016a 100644
--- a/_test/definitions/server/fix41/11a_NewSeqNoGreater.def
+++ b/_test/definitions/server/fix41/11a_NewSeqNoGreater.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 # sequence reset without gap fill flag (default to N)
 I8=FIX.4.1
35=4
34=0
49=TW
52=<TIME>
56=ISLD
36=25

diff --git a/_test/definitions/server/fix41/11b_NewSeqNoEqual.def b/_test/definitions/server/fix41/11b_NewSeqNoEqual.def
index 1154111d0..1fda54b74 100644
--- a/_test/definitions/server/fix41/11b_NewSeqNoEqual.def
+++ b/_test/definitions/server/fix41/11b_NewSeqNoEqual.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 # sequence reset without gap fill flag (default to N)
 I8=FIX.4.1
35=4
34=0
49=TW
52=<TIME>
56=ISLD
36=2

diff --git a/_test/definitions/server/fix41/11c_NewSeqNoLess.def b/_test/definitions/server/fix41/11c_NewSeqNoLess.def
index c921e2518..8fd2a5169 100644
--- a/_test/definitions/server/fix41/11c_NewSeqNoLess.def
+++ b/_test/definitions/server/fix41/11c_NewSeqNoLess.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 # sequence reset without gap fill flag (default to N)
 I8=FIX.4.1
35=4
34=0
49=TW
52=<TIME>
56=ISLD
36=1

diff --git a/_test/definitions/server/fix41/13b_UnsolicitedLogoutMessage.def b/_test/definitions/server/fix41/13b_UnsolicitedLogoutMessage.def
index f99db3eff..9e02d0d6b 100644
--- a/_test/definitions/server/fix41/13b_UnsolicitedLogoutMessage.def
+++ b/_test/definitions/server/fix41/13b_UnsolicitedLogoutMessage.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.1
35=5
34=2
49=TW
52=<TIME>
56=ISLD

 E8=FIX.4.1
9=45
35=5
34=2
49=ISLD
52=00000000-00:00:00
56=TW
10=0

 eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/server/fix41/14a_BadField.def b/_test/definitions/server/fix41/14a_BadField.def
index 91b18cd27..81926d9e9 100644
--- a/_test/definitions/server/fix41/14a_BadField.def
+++ b/_test/definitions/server/fix41/14a_BadField.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.1
9=56
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=2
10=0

+E8=FIX.4.1
9=62
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix41/14b_RequiredFieldMissing.def b/_test/definitions/server/fix41/14b_RequiredFieldMissing.def
index fc5a19fc6..a33fac422 100644
--- a/_test/definitions/server/fix41/14b_RequiredFieldMissing.def
+++ b/_test/definitions/server/fix41/14b_RequiredFieldMissing.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.1
9=56
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=2
10=0

+E8=FIX.4.1
9=62
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix41/14c_TagNotDefinedForMsgType.def b/_test/definitions/server/fix41/14c_TagNotDefinedForMsgType.def
index 57a8761aa..53e01241e 100644
--- a/_test/definitions/server/fix41/14c_TagNotDefinedForMsgType.def
+++ b/_test/definitions/server/fix41/14c_TagNotDefinedForMsgType.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.1
9=56
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=2
10=0

+E8=FIX.4.1
9=62
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix41/14d_TagSpecifiedWithoutValue.def b/_test/definitions/server/fix41/14d_TagSpecifiedWithoutValue.def
index a14d65696..ea83c229b 100644
--- a/_test/definitions/server/fix41/14d_TagSpecifiedWithoutValue.def
+++ b/_test/definitions/server/fix41/14d_TagSpecifiedWithoutValue.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.1
9=56
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=2
10=0

+E8=FIX.4.1
9=62
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix41/14e_IncorrectEnumValue.def b/_test/definitions/server/fix41/14e_IncorrectEnumValue.def
index 82055eeb6..1d8df017c 100644
--- a/_test/definitions/server/fix41/14e_IncorrectEnumValue.def
+++ b/_test/definitions/server/fix41/14e_IncorrectEnumValue.def
@@ -4,7 +4,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.1
9=56
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=2
10=0

+E8=FIX.4.1
9=62
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix41/14f_IncorrectDataFormat.def b/_test/definitions/server/fix41/14f_IncorrectDataFormat.def
index b68e29c38..16e9cf6c8 100644
--- a/_test/definitions/server/fix41/14f_IncorrectDataFormat.def
+++ b/_test/definitions/server/fix41/14f_IncorrectDataFormat.def
@@ -4,7 +4,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.1
9=56
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=2
10=0

+E8=FIX.4.1
9=62
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix41/14g_HeaderBodyTrailerFieldsOutOfOrder.def b/_test/definitions/server/fix41/14g_HeaderBodyTrailerFieldsOutOfOrder.def
index 3e2393be1..a264e74e1 100644
--- a/_test/definitions/server/fix41/14g_HeaderBodyTrailerFieldsOutOfOrder.def
+++ b/_test/definitions/server/fix41/14g_HeaderBodyTrailerFieldsOutOfOrder.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.1
9=56
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=2
10=0

+E8=FIX.4.1
9=62
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix41/14h_RepeatedTag.def b/_test/definitions/server/fix41/14h_RepeatedTag.def
index bca7dd58d..af2051bdb 100644
--- a/_test/definitions/server/fix41/14h_RepeatedTag.def
+++ b/_test/definitions/server/fix41/14h_RepeatedTag.def
@@ -4,7 +4,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.1
9=56
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=2
10=0

+E8=FIX.4.1
9=62
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix41/15_HeaderAndBodyFieldsOrderedDifferently.def b/_test/definitions/server/fix41/15_HeaderAndBodyFieldsOrderedDifferently.def
index 405507d53..e52fd023b 100644
--- a/_test/definitions/server/fix41/15_HeaderAndBodyFieldsOrderedDifferently.def
+++ b/_test/definitions/server/fix41/15_HeaderAndBodyFieldsOrderedDifferently.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.1
9=56
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=2
10=0

+E8=FIX.4.1
9=62
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix41/19a_PossResendMessageThatHAsAlreadyBeenSent.def b/_test/definitions/server/fix41/19a_PossResendMessageThatHAsAlreadyBeenSent.def
index 8fea180dc..3ffb9d179 100644
--- a/_test/definitions/server/fix41/19a_PossResendMessageThatHAsAlreadyBeenSent.def
+++ b/_test/definitions/server/fix41/19a_PossResendMessageThatHAsAlreadyBeenSent.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.1
9=56
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=2
10=0

+E8=FIX.4.1
9=62
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix41/19b_PossResendMessageThatHasNotBeenSent.def b/_test/definitions/server/fix41/19b_PossResendMessageThatHasNotBeenSent.def
index 8f2c83bee..45a384211 100644
--- a/_test/definitions/server/fix41/19b_PossResendMessageThatHasNotBeenSent.def
+++ b/_test/definitions/server/fix41/19b_PossResendMessageThatHasNotBeenSent.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.1
9=56
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=2
10=0

+E8=FIX.4.1
9=62
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix41/1a_ValidLogonMsgSeqNumTooHigh.def b/_test/definitions/server/fix41/1a_ValidLogonMsgSeqNumTooHigh.def
index 2251f7609..9eca5f276 100644
--- a/_test/definitions/server/fix41/1a_ValidLogonMsgSeqNumTooHigh.def
+++ b/_test/definitions/server/fix41/1a_ValidLogonMsgSeqNumTooHigh.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=5
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 E8=FIX.4.1
9=59
35=2
34=2
49=ISLD
52=00000000-00:00:00
56=TW
7=1
16=999999
10=0

 
 # logout message and response
diff --git a/_test/definitions/server/fix41/1a_ValidLogonWithCorrectMsgSeqNum.def b/_test/definitions/server/fix41/1a_ValidLogonWithCorrectMsgSeqNum.def
index bfa789ec6..737ffa38d 100644
--- a/_test/definitions/server/fix41/1a_ValidLogonWithCorrectMsgSeqNum.def
+++ b/_test/definitions/server/fix41/1a_ValidLogonWithCorrectMsgSeqNum.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # logout message and response
 I8=FIX.4.1
35=5
34=2
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix41/1b_DuplicateIdentity.def b/_test/definitions/server/fix41/1b_DuplicateIdentity.def
index 77723cb5b..2d6844335 100644
--- a/_test/definitions/server/fix41/1b_DuplicateIdentity.def
+++ b/_test/definitions/server/fix41/1b_DuplicateIdentity.def
@@ -4,7 +4,7 @@
 # First logon, succesful
 i1,CONNECT
 I1,8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E1,8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E1,8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 # Second logon, unsuccesful
 i2,CONNECT
diff --git a/_test/definitions/server/fix41/20_SimultaneousResendRequest.def b/_test/definitions/server/fix41/20_SimultaneousResendRequest.def
index c446da576..81cd9ce8a 100644
--- a/_test/definitions/server/fix41/20_SimultaneousResendRequest.def
+++ b/_test/definitions/server/fix41/20_SimultaneousResendRequest.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 I8=FIX.4.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC

 E8=FIX.4.1
9=81
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
10=0

diff --git a/_test/definitions/server/fix41/2a_MsgSeqNumCorrect.def b/_test/definitions/server/fix41/2a_MsgSeqNumCorrect.def
index 83d0899b6..898ad44cf 100644
--- a/_test/definitions/server/fix41/2a_MsgSeqNumCorrect.def
+++ b/_test/definitions/server/fix41/2a_MsgSeqNumCorrect.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.1
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.1
35=0
34=3
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.1
35=0
34=4
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix41/2b_MsgSeqNumTooHigh.def b/_test/definitions/server/fix41/2b_MsgSeqNumTooHigh.def
index 76360b3d1..10f55b3cf 100644
--- a/_test/definitions/server/fix41/2b_MsgSeqNumTooHigh.def
+++ b/_test/definitions/server/fix41/2b_MsgSeqNumTooHigh.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.1
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.1
35=0
34=3
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.1
35=0
34=4
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix41/2c_MsgSeqNumTooLow.def b/_test/definitions/server/fix41/2c_MsgSeqNumTooLow.def
index 29dcd113f..3339923c0 100644
--- a/_test/definitions/server/fix41/2c_MsgSeqNumTooLow.def
+++ b/_test/definitions/server/fix41/2c_MsgSeqNumTooLow.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.1
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.1
35=0
34=3
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.1
35=0
34=4
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix41/2d_GarbledMessage.def b/_test/definitions/server/fix41/2d_GarbledMessage.def
index 650d47672..5c62e76f8 100644
--- a/_test/definitions/server/fix41/2d_GarbledMessage.def
+++ b/_test/definitions/server/fix41/2d_GarbledMessage.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30

+E8=FIX.4.1
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y

 
 # Garbled message
 I8=FIX.4.1
9=52
35=0
34=2
4garbled9=TW
52=<TIME>
56=ISLD
10=0

diff --git a/_test/definitions/server/fix41/2e_PossDupAlreadyReceived.def b/_test/definitions/server/fix41/2e_PossDupAlreadyReceived.def
index be01405b7..1e0685b00 100644
--- a/_test/definitions/server/fix41/2e_PossDupAlreadyReceived.def
+++ b/_test/definitions/server/fix41/2e_PossDupAlreadyReceived.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=7

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=7

 I8=FIX.4.1
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.1
35=0
34=2
49=TW
52=<TIME>
122=<TIME>
56=ISLD
43=Y
112=<TIME>

 I8=FIX.4.1
35=0
34=3
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix41/2e_PossDupNotReceived.def b/_test/definitions/server/fix41/2e_PossDupNotReceived.def
index 57e78a49b..903a682e7 100644
--- a/_test/definitions/server/fix41/2e_PossDupNotReceived.def
+++ b/_test/definitions/server/fix41/2e_PossDupNotReceived.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.1
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 
 # Already received, this should be ignored
diff --git a/_test/definitions/server/fix41/2f_PossDupOrigSendingTimeTooHigh.def b/_test/definitions/server/fix41/2f_PossDupOrigSendingTimeTooHigh.def
index 3f39ec5d1..4506ec664 100644
--- a/_test/definitions/server/fix41/2f_PossDupOrigSendingTimeTooHigh.def
+++ b/_test/definitions/server/fix41/2f_PossDupOrigSendingTimeTooHigh.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 # send two orders in sequence
 I8=FIX.4.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC

diff --git a/_test/definitions/server/fix41/2g_PossDupNoOrigSendingTime.def b/_test/definitions/server/fix41/2g_PossDupNoOrigSendingTime.def
index 900eea836..5cf98f8f7 100644
--- a/_test/definitions/server/fix41/2g_PossDupNoOrigSendingTime.def
+++ b/_test/definitions/server/fix41/2g_PossDupNoOrigSendingTime.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 # send two orders in sequence
 I8=FIX.4.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC

diff --git a/_test/definitions/server/fix41/2i_BeginStringValueUnexpected.def b/_test/definitions/server/fix41/2i_BeginStringValueUnexpected.def
index 89b4fa3ca..2e61ff54b 100644
--- a/_test/definitions/server/fix41/2i_BeginStringValueUnexpected.def
+++ b/_test/definitions/server/fix41/2i_BeginStringValueUnexpected.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 # Send with incorrect begin string and respond to logout
 I8=FIX.4.0
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=id

@@ -12,7 +12,7 @@ eDISCONNECT
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 # Send with incorrect begin string and don't respond to logout
 I8=FIX.4.0
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=id

diff --git a/_test/definitions/server/fix41/2k_CompIDDoesNotMatchProfile.def b/_test/definitions/server/fix41/2k_CompIDDoesNotMatchProfile.def
index 6b6a60c17..b7e81451f 100644
--- a/_test/definitions/server/fix41/2k_CompIDDoesNotMatchProfile.def
+++ b/_test/definitions/server/fix41/2k_CompIDDoesNotMatchProfile.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 # send order with bad SenderCompID
 I8=FIX.4.1
35=D
34=2
49=WT
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC

@@ -18,7 +18,7 @@ eDISCONNECT
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 # send order with bad TargetCompID
 I8=FIX.4.1
35=D
34=2
49=TW
52=<TIME>
56=DLSI
11=ID
21=3
38=100
40=1
54=1
55=INTC

@@ -34,7 +34,7 @@ eDISCONNECT
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 # send order with bad SenderCompID and TargetCompID
 I8=FIX.4.1
35=D
34=2
49=WT
52=<TIME>
56=DLSI
11=ID
21=3
38=100
40=1
54=1
55=INTC

diff --git a/_test/definitions/server/fix41/2m_BodyLengthValueNotCorrect.def b/_test/definitions/server/fix41/2m_BodyLengthValueNotCorrect.def
index 1a2a352f1..ff8f927c0 100644
--- a/_test/definitions/server/fix41/2m_BodyLengthValueNotCorrect.def
+++ b/_test/definitions/server/fix41/2m_BodyLengthValueNotCorrect.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 # Send a message with a length that is too short
 I8=FIX.4.1
9=30
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC

diff --git a/_test/definitions/server/fix41/2o_SendingTimeValueOutOfRange.def b/_test/definitions/server/fix41/2o_SendingTimeValueOutOfRange.def
index b4900c074..58bdf6404 100644
--- a/_test/definitions/server/fix41/2o_SendingTimeValueOutOfRange.def
+++ b/_test/definitions/server/fix41/2o_SendingTimeValueOutOfRange.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 # send heartbeat more than 2 minutes early
 I8=FIX.4.1
35=0
34=2
49=TW
52=<TIME-121>
56=ISLD

 # reject and logoff
@@ -15,7 +15,7 @@ eDISCONNECT
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 # send heartbeat more than 2 minutes late
 I8=FIX.4.1
35=0
34=2
49=TW
52=<TIME+121>
56=ISLD

 # reject and logoff
diff --git a/_test/definitions/server/fix41/2q_MsgTypeNotValid.def b/_test/definitions/server/fix41/2q_MsgTypeNotValid.def
index f9429ac3d..361efffd1 100644
--- a/_test/definitions/server/fix41/2q_MsgTypeNotValid.def
+++ b/_test/definitions/server/fix41/2q_MsgTypeNotValid.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.1
35=*
34=2
49=TW
52=<TIME>
56=ISLD

 # reject
 E8=FIX.4.1
9=69
35=3
34=2
49=ISLD
52=00000000-00:00:00
56=TW
45=2
58=Invalid MsgType
10=0

diff --git a/_test/definitions/server/fix41/2r_UnregisteredMsgType.def b/_test/definitions/server/fix41/2r_UnregisteredMsgType.def
index 930f518e2..816501b32 100644
--- a/_test/definitions/server/fix41/2r_UnregisteredMsgType.def
+++ b/_test/definitions/server/fix41/2r_UnregisteredMsgType.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 I8=FIX.4.1
35=8
34=2
49=TW
52=<TIME>
56=ISLD
11=id
31=10.5
32=100
37=id
38=100
17=1
20=0
39=0
55=WLRI
54=1
14=0
6=0.0
150=1
151=0

 E8=FIX.4.1
9=78
35=3
34=2
49=ISLD
52=00000000-00:00:00
56=TW
45=2
58=Unsupported Message Type
10=0

diff --git a/_test/definitions/server/fix41/2t_FirstThreeFieldsOutOfOrder.def b/_test/definitions/server/fix41/2t_FirstThreeFieldsOutOfOrder.def
index 68296ab9e..4b6642beb 100644
--- a/_test/definitions/server/fix41/2t_FirstThreeFieldsOutOfOrder.def
+++ b/_test/definitions/server/fix41/2t_FirstThreeFieldsOutOfOrder.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 # 35 is first, should be second
 I35=0
8=FIX.4.1
9=29
34=2
49=TW
52=<TIME>
56=ISLD
10=121

diff --git a/_test/definitions/server/fix41/3b_InvalidChecksum.def b/_test/definitions/server/fix41/3b_InvalidChecksum.def
index f258b5b0e..4901089dc 100644
--- a/_test/definitions/server/fix41/3b_InvalidChecksum.def
+++ b/_test/definitions/server/fix41/3b_InvalidChecksum.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=7

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=7

 
 # Incorrect checksum
 I8=FIX.4.1
35=0
34=2
49=TW
52=<TIME>
56=ISLD
10=256

diff --git a/_test/definitions/server/fix41/3c_GarbledMessage.def b/_test/definitions/server/fix41/3c_GarbledMessage.def
index 128340788..735ba32f9 100644
--- a/_test/definitions/server/fix41/3c_GarbledMessage.def
+++ b/_test/definitions/server/fix41/3c_GarbledMessage.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30

+E8=FIX.4.1
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y

 
 # Garbled message
 I8=FIX.4.1
9=52
35=0
34=2
4garbled9=TW
52=<TIME>
56=ISLD
10=0

diff --git a/_test/definitions/server/fix41/4a_NoDataSentDuringHeartBtInt.def b/_test/definitions/server/fix41/4a_NoDataSentDuringHeartBtInt.def
index 5284feeb8..a4e434ecf 100644
--- a/_test/definitions/server/fix41/4a_NoDataSentDuringHeartBtInt.def
+++ b/_test/definitions/server/fix41/4a_NoDataSentDuringHeartBtInt.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=6

-E8=FIX.4.1
9=56
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=6
10=0

+E8=FIX.4.1
9=62
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=6
141=Y
10=0

 
 # Wait for quickfix to send a heartbeat to us
 E8=FIX.4.1
9=45
35=0
34=2
49=ISLD
52=00000000-00:00:00
56=TW
10=0

diff --git a/_test/definitions/server/fix41/4b_ReceivedTestRequest.def b/_test/definitions/server/fix41/4b_ReceivedTestRequest.def
index 9ef74f666..999dcf71c 100644
--- a/_test/definitions/server/fix41/4b_ReceivedTestRequest.def
+++ b/_test/definitions/server/fix41/4b_ReceivedTestRequest.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=HELLO

 E8=FIX.4.1
9=55
35=0
34=2
49=ISLD
52=00000000-00:00:00
56=TW
112=HELLO
10=0

 
diff --git a/_test/definitions/server/fix41/6_SendTestRequest.def b/_test/definitions/server/fix41/6_SendTestRequest.def
index 40884d505..775410047 100644
--- a/_test/definitions/server/fix41/6_SendTestRequest.def
+++ b/_test/definitions/server/fix41/6_SendTestRequest.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=6

-E8=FIX.4.1
9=56
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=6
10=0

+E8=FIX.4.1
9=62
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=6
141=Y
10=0

 
 # wait for two heartbeats
 E8=FIX.4.1
9=45
35=0
34=2
49=ISLD
52=00000000-00:00:00
56=TW
10=0

diff --git a/_test/definitions/server/fix41/7_ReceiveRejectMessage.def b/_test/definitions/server/fix41/7_ReceiveRejectMessage.def
index b8c154f07..ba62448da 100644
--- a/_test/definitions/server/fix41/7_ReceiveRejectMessage.def
+++ b/_test/definitions/server/fix41/7_ReceiveRejectMessage.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 # reject
 I8=FIX.4.1
35=3
34=2
49=TW
52=<TIME>
56=ISLD
45=1

diff --git a/_test/definitions/server/fix41/8_AdminAndApplicationMessages.def b/_test/definitions/server/fix41/8_AdminAndApplicationMessages.def
index 089c62e62..5c6613186 100644
--- a/_test/definitions/server/fix41/8_AdminAndApplicationMessages.def
+++ b/_test/definitions/server/fix41/8_AdminAndApplicationMessages.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 # Admin messages 2-4
 I8=FIX.4.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=HELLO

diff --git a/_test/definitions/server/fix41/8_OnlyAdminMessages.def b/_test/definitions/server/fix41/8_OnlyAdminMessages.def
index d5f34a5af..488ad2ec8 100644
--- a/_test/definitions/server/fix41/8_OnlyAdminMessages.def
+++ b/_test/definitions/server/fix41/8_OnlyAdminMessages.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=HELLO

 E8=FIX.4.1
9=55
35=0
34=2
49=ISLD
52=00000000-00:00:00
56=TW
112=HELLO
10=0

 I8=FIX.4.1
35=1
34=3
49=TW
52=<TIME>
56=ISLD
112=HELLO

diff --git a/_test/definitions/server/fix41/8_OnlyApplicationMessages.def b/_test/definitions/server/fix41/8_OnlyApplicationMessages.def
index f5a14056d..20a8897e9 100644
--- a/_test/definitions/server/fix41/8_OnlyApplicationMessages.def
+++ b/_test/definitions/server/fix41/8_OnlyApplicationMessages.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 I8=FIX.4.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC

 E8=FIX.4.1
9=81
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
10=0

diff --git a/_test/definitions/server/fix41/AlreadyLoggedOn.def b/_test/definitions/server/fix41/AlreadyLoggedOn.def
index 741db916b..38592566b 100644
--- a/_test/definitions/server/fix41/AlreadyLoggedOn.def
+++ b/_test/definitions/server/fix41/AlreadyLoggedOn.def
@@ -2,7 +2,7 @@
 
 i1,CONNECT
 I1,8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E1,8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E1,8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 i2,CONNECT
 I2,8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

diff --git a/_test/definitions/server/fix41/RejectResentMessage.def b/_test/definitions/server/fix41/RejectResentMessage.def
index 4d31e706d..9c760a227 100644
--- a/_test/definitions/server/fix41/RejectResentMessage.def
+++ b/_test/definitions/server/fix41/RejectResentMessage.def
@@ -3,7 +3,7 @@
 iCONNECT
 #Logon
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 # send in a test request one number too high
 I8=FIX.4.1
35=1
34=3
49=TW
52=<TIME>
56=ISLD
112=HELLO1

diff --git a/_test/definitions/server/fix41/ReverseRoute.def b/_test/definitions/server/fix41/ReverseRoute.def
index cb6509288..e43bcff01 100644
--- a/_test/definitions/server/fix41/ReverseRoute.def
+++ b/_test/definitions/server/fix41/ReverseRoute.def
@@ -3,7 +3,7 @@
 iCONNECT
 #Logon
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 # Send an order with OnBehalfOfCompID (115) set with bad field value 40=w
 I8=FIX.4.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
115=JCD
11=ID
21=3
38=100
40=w
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix41/ReverseRouteWithEmptyRoutingTags.def b/_test/definitions/server/fix41/ReverseRouteWithEmptyRoutingTags.def
index e9708a9d2..8e3556c63 100644
--- a/_test/definitions/server/fix41/ReverseRouteWithEmptyRoutingTags.def
+++ b/_test/definitions/server/fix41/ReverseRouteWithEmptyRoutingTags.def
@@ -3,7 +3,7 @@
 iCONNECT
 #Logon
 I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.1
9=63
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 # Send an order with OnBehalfOfCompID (115) empty 
 I8=FIX.4.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
115=
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix42/10_MsgSeqNumEqual.def b/_test/definitions/server/fix42/10_MsgSeqNumEqual.def
index 2151312a3..f866e8fdd 100644
--- a/_test/definitions/server/fix42/10_MsgSeqNumEqual.def
+++ b/_test/definitions/server/fix42/10_MsgSeqNumEqual.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # sequence reset with gap fill flag set to Y
 I8=FIX.4.2
35=4
34=2
49=TW
52=<TIME>
56=ISLD
36=20
123=Y

diff --git a/_test/definitions/server/fix42/10_MsgSeqNumGreater.def b/_test/definitions/server/fix42/10_MsgSeqNumGreater.def
index 31fbdeae1..0fa294c2f 100644
--- a/_test/definitions/server/fix42/10_MsgSeqNumGreater.def
+++ b/_test/definitions/server/fix42/10_MsgSeqNumGreater.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # sequence reset with gap fill flag set to Y
 I8=FIX.4.2
35=4
34=10
49=TW
52=<TIME>
56=ISLD
36=20
123=Y

diff --git a/_test/definitions/server/fix42/10_MsgSeqNumLess.def b/_test/definitions/server/fix42/10_MsgSeqNumLess.def
index 115c6fa33..e0b736634 100644
--- a/_test/definitions/server/fix42/10_MsgSeqNumLess.def
+++ b/_test/definitions/server/fix42/10_MsgSeqNumLess.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # sequence reset with gap fill flag set to Y, PosDupFlag set to Y
 I8=FIX.4.2
35=4
34=1
49=TW
52=<TIME>
56=ISLD
43=Y
122=<TIME-1>
36=20
123=Y

diff --git a/_test/definitions/server/fix42/11a_NewSeqNoGreater.def b/_test/definitions/server/fix42/11a_NewSeqNoGreater.def
index da1ca2097..27f9bb3e4 100644
--- a/_test/definitions/server/fix42/11a_NewSeqNoGreater.def
+++ b/_test/definitions/server/fix42/11a_NewSeqNoGreater.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # sequence reset without gap fill flag (default to N)
 I8=FIX.4.2
35=4
34=0
49=TW
52=<TIME>
56=ISLD
36=25

diff --git a/_test/definitions/server/fix42/11b_NewSeqNoEqual.def b/_test/definitions/server/fix42/11b_NewSeqNoEqual.def
index ddf0acd7c..699e06150 100644
--- a/_test/definitions/server/fix42/11b_NewSeqNoEqual.def
+++ b/_test/definitions/server/fix42/11b_NewSeqNoEqual.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # sequence reset without gap fill flag (default to N)
 I8=FIX.4.2
35=4
34=0
49=TW
52=<TIME>
56=ISLD
36=2

diff --git a/_test/definitions/server/fix42/11c_NewSeqNoLess.def b/_test/definitions/server/fix42/11c_NewSeqNoLess.def
index f3de05238..ffc7bfeac 100644
--- a/_test/definitions/server/fix42/11c_NewSeqNoLess.def
+++ b/_test/definitions/server/fix42/11c_NewSeqNoLess.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # sequence reset without gap fill flag (default to N)
 I8=FIX.4.2
35=4
34=0
49=TW
52=<TIME>
56=ISLD
36=1

diff --git a/_test/definitions/server/fix42/13b_UnsolicitedLogoutMessage.def b/_test/definitions/server/fix42/13b_UnsolicitedLogoutMessage.def
index d4213e88a..794737f6d 100644
--- a/_test/definitions/server/fix42/13b_UnsolicitedLogoutMessage.def
+++ b/_test/definitions/server/fix42/13b_UnsolicitedLogoutMessage.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.2
35=5
34=2
49=TW
52=<TIME>
56=ISLD

 E8=FIX.4.2
9=49
35=5
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

 eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/server/fix42/14a_BadField.def b/_test/definitions/server/fix42/14a_BadField.def
index a5f9c17ae..a6c173620 100644
--- a/_test/definitions/server/fix42/14a_BadField.def
+++ b/_test/definitions/server/fix42/14a_BadField.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.2
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.2
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix42/14b_RequiredFieldMissing.def b/_test/definitions/server/fix42/14b_RequiredFieldMissing.def
index 0869784c6..dc27b580e 100644
--- a/_test/definitions/server/fix42/14b_RequiredFieldMissing.def
+++ b/_test/definitions/server/fix42/14b_RequiredFieldMissing.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.2
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.2
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix42/14c_TagNotDefinedForMsgType.def b/_test/definitions/server/fix42/14c_TagNotDefinedForMsgType.def
index 5478fb1f7..a205f42d4 100644
--- a/_test/definitions/server/fix42/14c_TagNotDefinedForMsgType.def
+++ b/_test/definitions/server/fix42/14c_TagNotDefinedForMsgType.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.2
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.2
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix42/14d_TagSpecifiedWithoutValue.def b/_test/definitions/server/fix42/14d_TagSpecifiedWithoutValue.def
index c4da5894b..afc443094 100644
--- a/_test/definitions/server/fix42/14d_TagSpecifiedWithoutValue.def
+++ b/_test/definitions/server/fix42/14d_TagSpecifiedWithoutValue.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.2
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.2
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix42/14e_IncorrectEnumValue.def b/_test/definitions/server/fix42/14e_IncorrectEnumValue.def
index 10530ed00..c0e081b20 100644
--- a/_test/definitions/server/fix42/14e_IncorrectEnumValue.def
+++ b/_test/definitions/server/fix42/14e_IncorrectEnumValue.def
@@ -4,7 +4,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.2
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.2
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix42/14f_IncorrectDataFormat.def b/_test/definitions/server/fix42/14f_IncorrectDataFormat.def
index 0add73e5d..0431ea211 100644
--- a/_test/definitions/server/fix42/14f_IncorrectDataFormat.def
+++ b/_test/definitions/server/fix42/14f_IncorrectDataFormat.def
@@ -4,7 +4,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.2
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.2
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix42/14g_HeaderBodyTrailerFieldsOutOfOrder.def b/_test/definitions/server/fix42/14g_HeaderBodyTrailerFieldsOutOfOrder.def
index a14dcfaf7..dc72425fc 100644
--- a/_test/definitions/server/fix42/14g_HeaderBodyTrailerFieldsOutOfOrder.def
+++ b/_test/definitions/server/fix42/14g_HeaderBodyTrailerFieldsOutOfOrder.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.2
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.2
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix42/14h_RepeatedTag.def b/_test/definitions/server/fix42/14h_RepeatedTag.def
index 78e9dd373..5aa87c75f 100644
--- a/_test/definitions/server/fix42/14h_RepeatedTag.def
+++ b/_test/definitions/server/fix42/14h_RepeatedTag.def
@@ -4,7 +4,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.2
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.2
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix42/14i_RepeatingGroupCountNotEqual.def b/_test/definitions/server/fix42/14i_RepeatingGroupCountNotEqual.def
index c6d02a318..3c5662361 100644
--- a/_test/definitions/server/fix42/14i_RepeatingGroupCountNotEqual.def
+++ b/_test/definitions/server/fix42/14i_RepeatingGroupCountNotEqual.def
@@ -4,7 +4,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.2
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.2
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix42/15_HeaderAndBodyFieldsOrderedDifferently.def b/_test/definitions/server/fix42/15_HeaderAndBodyFieldsOrderedDifferently.def
index b62d55030..4a5ebe69c 100644
--- a/_test/definitions/server/fix42/15_HeaderAndBodyFieldsOrderedDifferently.def
+++ b/_test/definitions/server/fix42/15_HeaderAndBodyFieldsOrderedDifferently.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.2
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.2
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix42/19a_PossResendMessageThatHAsAlreadyBeenSent.def b/_test/definitions/server/fix42/19a_PossResendMessageThatHAsAlreadyBeenSent.def
index 34e0b701e..0276ad725 100644
--- a/_test/definitions/server/fix42/19a_PossResendMessageThatHAsAlreadyBeenSent.def
+++ b/_test/definitions/server/fix42/19a_PossResendMessageThatHAsAlreadyBeenSent.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.2
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.2
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix42/19b_PossResendMessageThatHasNotBeenSent.def b/_test/definitions/server/fix42/19b_PossResendMessageThatHasNotBeenSent.def
index c5f92b8f4..260b5d2da 100644
--- a/_test/definitions/server/fix42/19b_PossResendMessageThatHasNotBeenSent.def
+++ b/_test/definitions/server/fix42/19b_PossResendMessageThatHasNotBeenSent.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.2
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.2
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix42/1a_ValidLogonMsgSeqNumTooHigh.def b/_test/definitions/server/fix42/1a_ValidLogonMsgSeqNumTooHigh.def
index 754a601a5..327405c8e 100644
--- a/_test/definitions/server/fix42/1a_ValidLogonMsgSeqNumTooHigh.def
+++ b/_test/definitions/server/fix42/1a_ValidLogonMsgSeqNumTooHigh.def
@@ -4,7 +4,7 @@
 iCONNECT
 I8=FIX.4.2
35=A
34=5
49=TW
52=<TIME>
56=ISLD
98=0
108=30

 #E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=<TIME>
56=TW
98=0
108=30
10=0

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 E8=FIX.4.2
9=58
35=2
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
7=1
16=0
10=0

 
 # logout message and response
diff --git a/_test/definitions/server/fix42/1a_ValidLogonWithCorrectMsgSeqNum.def b/_test/definitions/server/fix42/1a_ValidLogonWithCorrectMsgSeqNum.def
index 8a7bc8a35..8edc6a19b 100644
--- a/_test/definitions/server/fix42/1a_ValidLogonWithCorrectMsgSeqNum.def
+++ b/_test/definitions/server/fix42/1a_ValidLogonWithCorrectMsgSeqNum.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # logout message and response
 I8=FIX.4.2
35=5
34=2
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix42/1b_DuplicateIdentity.def b/_test/definitions/server/fix42/1b_DuplicateIdentity.def
index eccfbff9b..b35b7e647 100644
--- a/_test/definitions/server/fix42/1b_DuplicateIdentity.def
+++ b/_test/definitions/server/fix42/1b_DuplicateIdentity.def
@@ -4,7 +4,7 @@
 # First logon, succesful
 i1,CONNECT
 I1,8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E1,8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E1,8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # Second logon, unsuccesful
 i2,CONNECT
diff --git a/_test/definitions/server/fix42/20_SimultaneousResendRequest.def b/_test/definitions/server/fix42/20_SimultaneousResendRequest.def
index fc440407a..22271d10a 100644
--- a/_test/definitions/server/fix42/20_SimultaneousResendRequest.def
+++ b/_test/definitions/server/fix42/20_SimultaneousResendRequest.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 I8=FIX.4.2
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

 E8=FIX.4.2
9=99
35=D
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
11=ID
21=3
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

diff --git a/_test/definitions/server/fix42/21_RepeatingGroupSpecifierWithValueOfZero.def b/_test/definitions/server/fix42/21_RepeatingGroupSpecifierWithValueOfZero.def
index e31bfc521..5d00a8016 100644
--- a/_test/definitions/server/fix42/21_RepeatingGroupSpecifierWithValueOfZero.def
+++ b/_test/definitions/server/fix42/21_RepeatingGroupSpecifierWithValueOfZero.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.2
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.2
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix42/2a_MsgSeqNumCorrect.def b/_test/definitions/server/fix42/2a_MsgSeqNumCorrect.def
index 57e596a34..ee7a569df 100644
--- a/_test/definitions/server/fix42/2a_MsgSeqNumCorrect.def
+++ b/_test/definitions/server/fix42/2a_MsgSeqNumCorrect.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.2
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.2
35=0
34=3
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.2
35=0
34=4
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix42/2b_MsgSeqNumTooHigh.def b/_test/definitions/server/fix42/2b_MsgSeqNumTooHigh.def
index 9851e2405..073f94401 100644
--- a/_test/definitions/server/fix42/2b_MsgSeqNumTooHigh.def
+++ b/_test/definitions/server/fix42/2b_MsgSeqNumTooHigh.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.2
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.2
35=0
34=3
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.2
35=0
34=4
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix42/2c_MsgSeqNumTooLow.def b/_test/definitions/server/fix42/2c_MsgSeqNumTooLow.def
index 9b9670549..e463952fc 100644
--- a/_test/definitions/server/fix42/2c_MsgSeqNumTooLow.def
+++ b/_test/definitions/server/fix42/2c_MsgSeqNumTooLow.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.2
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.2
35=0
34=3
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.2
35=0
34=4
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix42/2d_GarbledMessage.def b/_test/definitions/server/fix42/2d_GarbledMessage.def
index cdb748a4d..0fd0d9793 100644
--- a/_test/definitions/server/fix42/2d_GarbledMessage.def
+++ b/_test/definitions/server/fix42/2d_GarbledMessage.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y

 
 # Garbled message
 I8=FIX.4.2
9=52
35=0
34=2
4garbled9=TW
52=<TIME>
56=ISLD
10=0

diff --git a/_test/definitions/server/fix42/2e_PossDupAlreadyReceived.def b/_test/definitions/server/fix42/2e_PossDupAlreadyReceived.def
index e09a59a51..317d18f4b 100644
--- a/_test/definitions/server/fix42/2e_PossDupAlreadyReceived.def
+++ b/_test/definitions/server/fix42/2e_PossDupAlreadyReceived.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=7

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=7

 I8=FIX.4.2
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.2
35=0
34=2
49=TW
52=<TIME>
122=<TIME>
56=ISLD
43=Y
112=<TIME>

 I8=FIX.4.2
35=0
34=3
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix42/2e_PossDupNotReceived.def b/_test/definitions/server/fix42/2e_PossDupNotReceived.def
index 63f112450..bea6c945b 100644
--- a/_test/definitions/server/fix42/2e_PossDupNotReceived.def
+++ b/_test/definitions/server/fix42/2e_PossDupNotReceived.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.2
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 
 # Already received, this should be ignored
diff --git a/_test/definitions/server/fix42/2f_PossDupOrigSendingTimeTooHigh.def b/_test/definitions/server/fix42/2f_PossDupOrigSendingTimeTooHigh.def
index 3fe9fc81d..c21865acd 100644
--- a/_test/definitions/server/fix42/2f_PossDupOrigSendingTimeTooHigh.def
+++ b/_test/definitions/server/fix42/2f_PossDupOrigSendingTimeTooHigh.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # send two orders in sequence
 I8=FIX.4.2
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix42/2g_PossDupNoOrigSendingTime.def b/_test/definitions/server/fix42/2g_PossDupNoOrigSendingTime.def
index e2f88f433..87423f124 100644
--- a/_test/definitions/server/fix42/2g_PossDupNoOrigSendingTime.def
+++ b/_test/definitions/server/fix42/2g_PossDupNoOrigSendingTime.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # send two orders in sequence
 I8=FIX.4.2
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix42/2i_BeginStringValueUnexpected.def b/_test/definitions/server/fix42/2i_BeginStringValueUnexpected.def
index 58837d0c3..a82df45d4 100644
--- a/_test/definitions/server/fix42/2i_BeginStringValueUnexpected.def
+++ b/_test/definitions/server/fix42/2i_BeginStringValueUnexpected.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # Send with incorrect begin string and respond to logout
 I8=FIX.4.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=id

@@ -12,7 +12,7 @@ eDISCONNECT
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # Send with incorrect begin string and don't respond to logout
 I8=FIX.4.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=id

diff --git a/_test/definitions/server/fix42/2k_CompIDDoesNotMatchProfile.def b/_test/definitions/server/fix42/2k_CompIDDoesNotMatchProfile.def
index 782f76d68..dd68c39b1 100644
--- a/_test/definitions/server/fix42/2k_CompIDDoesNotMatchProfile.def
+++ b/_test/definitions/server/fix42/2k_CompIDDoesNotMatchProfile.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # send order with bad SenderCompID
 I8=FIX.4.2
35=D
34=2
49=WT
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

@@ -18,7 +18,7 @@ eDISCONNECT
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # send order with bad TargetCompID
 I8=FIX.4.2
35=D
34=2
49=TW
52=<TIME>
56=DLSI
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

@@ -34,7 +34,7 @@ eDISCONNECT
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # send order with bad SenderCompID and TargetCompID
 I8=FIX.4.2
35=D
34=2
49=WT
52=<TIME>
56=DLSI
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix42/2m_BodyLengthValueNotCorrect.def b/_test/definitions/server/fix42/2m_BodyLengthValueNotCorrect.def
index e6a8dc617..fc825f7b0 100644
--- a/_test/definitions/server/fix42/2m_BodyLengthValueNotCorrect.def
+++ b/_test/definitions/server/fix42/2m_BodyLengthValueNotCorrect.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # Send a message with a length that is too short
 I8=FIX.4.2
9=30
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix42/2o_SendingTimeValueOutOfRange.def b/_test/definitions/server/fix42/2o_SendingTimeValueOutOfRange.def
index 5c1286516..e2d008666 100644
--- a/_test/definitions/server/fix42/2o_SendingTimeValueOutOfRange.def
+++ b/_test/definitions/server/fix42/2o_SendingTimeValueOutOfRange.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 # send heartbeat more than 2 minutes early
 I8=FIX.4.2
35=0
34=2
49=TW
52=<TIME-121>
56=ISLD

 # reject and logoff
@@ -15,7 +15,7 @@ eDISCONNECT
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 # send heartbeat more than 2 minutes late
 I8=FIX.4.2
35=0
34=2
49=TW
52=<TIME+121>
56=ISLD

 # reject and logoff
diff --git a/_test/definitions/server/fix42/2q_MsgTypeNotValid.def b/_test/definitions/server/fix42/2q_MsgTypeNotValid.def
index d4cfa6c94..2199f55f4 100644
--- a/_test/definitions/server/fix42/2q_MsgTypeNotValid.def
+++ b/_test/definitions/server/fix42/2q_MsgTypeNotValid.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.2
35=*
34=2
49=TW
52=<TIME>
56=ISLD

 # reject
 E8=FIX.4.2
9=86
35=3
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
45=2
58=Invalid MsgType
372=*
373=11
10=0

diff --git a/_test/definitions/server/fix42/2r_UnregisteredMsgType.def b/_test/definitions/server/fix42/2r_UnregisteredMsgType.def
index f8c20c8ec..5b1feb123 100644
--- a/_test/definitions/server/fix42/2r_UnregisteredMsgType.def
+++ b/_test/definitions/server/fix42/2r_UnregisteredMsgType.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 I8=FIX.4.2
35=8
34=2
49=TW
52=<TIME>
56=ISLD
37=id
17=id
20=0
150=0
39=0
55=WLRI
54=1
151=100
14=0
6=0.0

 E8=FIX.4.2
9=94
35=j
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
45=2
58=Unsupported Message Type
372=8
380=3
10=0

diff --git a/_test/definitions/server/fix42/2t_FirstThreeFieldsOutOfOrder.def b/_test/definitions/server/fix42/2t_FirstThreeFieldsOutOfOrder.def
index 5e0c3bbae..1f7e49a0f 100644
--- a/_test/definitions/server/fix42/2t_FirstThreeFieldsOutOfOrder.def
+++ b/_test/definitions/server/fix42/2t_FirstThreeFieldsOutOfOrder.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # 35 is first, should be second
 I35=0
8=FIX.4.2
9=29
34=2
49=TW
52=<TIME>
56=ISLD
10=121

diff --git a/_test/definitions/server/fix42/3b_InvalidChecksum.def b/_test/definitions/server/fix42/3b_InvalidChecksum.def
index ab82ad777..6050628c1 100644
--- a/_test/definitions/server/fix42/3b_InvalidChecksum.def
+++ b/_test/definitions/server/fix42/3b_InvalidChecksum.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=7

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=7

 
 # Incorrect checksum
 I8=FIX.4.2
35=0
34=2
49=TW
52=<TIME>
56=ISLD
10=256

diff --git a/_test/definitions/server/fix42/3c_GarbledMessage.def b/_test/definitions/server/fix42/3c_GarbledMessage.def
index b0b236210..d1198d2db 100644
--- a/_test/definitions/server/fix42/3c_GarbledMessage.def
+++ b/_test/definitions/server/fix42/3c_GarbledMessage.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30

+E8=FIX.4.2
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y

 
 # Garbled message
 I8=FIX.4.2
9=52
35=0
34=2
4garbled9=TW
52=<TIME>
56=ISLD
10=0

diff --git a/_test/definitions/server/fix42/4a_NoDataSentDuringHeartBtInt.def b/_test/definitions/server/fix42/4a_NoDataSentDuringHeartBtInt.def
index dbc89f855..115a76feb 100644
--- a/_test/definitions/server/fix42/4a_NoDataSentDuringHeartBtInt.def
+++ b/_test/definitions/server/fix42/4a_NoDataSentDuringHeartBtInt.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=6

-E8=FIX.4.2
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=6
10=0

+E8=FIX.4.2
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=6
141=Y
10=0

 
 # Wait for quickfix to send a heartbeat to us
 E8=FIX.4.2
9=49
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

diff --git a/_test/definitions/server/fix42/4b_ReceivedTestRequest.def b/_test/definitions/server/fix42/4b_ReceivedTestRequest.def
index 3e0e81ddc..0514642a4 100644
--- a/_test/definitions/server/fix42/4b_ReceivedTestRequest.def
+++ b/_test/definitions/server/fix42/4b_ReceivedTestRequest.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.2
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=HELLO

 E8=FIX.4.2
9=59
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
112=HELLO
10=0

 
diff --git a/_test/definitions/server/fix42/6_SendTestRequest.def b/_test/definitions/server/fix42/6_SendTestRequest.def
index b1cc7f258..a05215f6b 100644
--- a/_test/definitions/server/fix42/6_SendTestRequest.def
+++ b/_test/definitions/server/fix42/6_SendTestRequest.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=6

-E8=FIX.4.2
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=6
10=0

+E8=FIX.4.2
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=6
141=Y
10=0

 
 # wait for two heartbeats
 E8=FIX.4.2
9=49
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

diff --git a/_test/definitions/server/fix42/7_ReceiveRejectMessage.def b/_test/definitions/server/fix42/7_ReceiveRejectMessage.def
index f26af263f..9dad0c34f 100644
--- a/_test/definitions/server/fix42/7_ReceiveRejectMessage.def
+++ b/_test/definitions/server/fix42/7_ReceiveRejectMessage.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # reject
 I8=FIX.4.2
35=3
34=2
49=TW
52=<TIME>
56=ISLD
45=1

diff --git a/_test/definitions/server/fix42/8_AdminAndApplicationMessages.def b/_test/definitions/server/fix42/8_AdminAndApplicationMessages.def
index 24a18f00a..e7aaba352 100644
--- a/_test/definitions/server/fix42/8_AdminAndApplicationMessages.def
+++ b/_test/definitions/server/fix42/8_AdminAndApplicationMessages.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # Admin messages 2-4
 I8=FIX.4.2
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=HELLO

diff --git a/_test/definitions/server/fix42/8_OnlyAdminMessages.def b/_test/definitions/server/fix42/8_OnlyAdminMessages.def
index 1324d09de..a42fdf4c7 100644
--- a/_test/definitions/server/fix42/8_OnlyAdminMessages.def
+++ b/_test/definitions/server/fix42/8_OnlyAdminMessages.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.2
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=HELLO

 E8=FIX.4.2
9=59
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
112=HELLO
10=0

 I8=FIX.4.2
35=1
34=3
49=TW
52=<TIME>
56=ISLD
112=HELLO

diff --git a/_test/definitions/server/fix42/8_OnlyApplicationMessages.def b/_test/definitions/server/fix42/8_OnlyApplicationMessages.def
index bedcf29c4..bc3d2558a 100644
--- a/_test/definitions/server/fix42/8_OnlyApplicationMessages.def
+++ b/_test/definitions/server/fix42/8_OnlyApplicationMessages.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 I8=FIX.4.2
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

 E8=FIX.4.2
9=99
35=D
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
11=ID
21=3
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

diff --git a/_test/definitions/server/fix42/AlreadyLoggedOn.def b/_test/definitions/server/fix42/AlreadyLoggedOn.def
index f0c1647ad..4c25a5c2c 100644
--- a/_test/definitions/server/fix42/AlreadyLoggedOn.def
+++ b/_test/definitions/server/fix42/AlreadyLoggedOn.def
@@ -2,7 +2,7 @@
 
 i1,CONNECT
 I1,8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E1,8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E1,8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 i2,CONNECT
 I2,8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

diff --git a/_test/definitions/server/fix42/RejectResentMessage.def b/_test/definitions/server/fix42/RejectResentMessage.def
index a3cfb301d..89988cb71 100644
--- a/_test/definitions/server/fix42/RejectResentMessage.def
+++ b/_test/definitions/server/fix42/RejectResentMessage.def
@@ -3,7 +3,7 @@
 iCONNECT
 #Logon
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 # send in a test request one number too high
 I8=FIX.4.2
35=1
34=3
49=TW
52=<TIME>
56=ISLD
112=HELLO1

diff --git a/_test/definitions/server/fix42/ReverseRoute.def b/_test/definitions/server/fix42/ReverseRoute.def
index c02281ae3..b47630c95 100644
--- a/_test/definitions/server/fix42/ReverseRoute.def
+++ b/_test/definitions/server/fix42/ReverseRoute.def
@@ -3,7 +3,7 @@
 iCONNECT
 #Logon
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # Send an order with OnBehalfOfCompID (115) set with bad field value 40=w
 I8=FIX.4.2
35=D
34=2
49=TW
52=<TIME>
56=ISLD
115=JCD
11=ID
21=3
38=100
40=w
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix42/ReverseRouteWithEmptyRoutingTags.def b/_test/definitions/server/fix42/ReverseRouteWithEmptyRoutingTags.def
index 484224d23..a4d0f55ab 100644
--- a/_test/definitions/server/fix42/ReverseRouteWithEmptyRoutingTags.def
+++ b/_test/definitions/server/fix42/ReverseRouteWithEmptyRoutingTags.def
@@ -3,7 +3,7 @@
 iCONNECT
 #Logon
 I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.2
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.2
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # Send an order with OnBehalfOfCompID (115) empty 
 I8=FIX.4.2
35=D
34=2
49=TW
52=<TIME>
56=ISLD
115=
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix43/10_MsgSeqNumEqual.def b/_test/definitions/server/fix43/10_MsgSeqNumEqual.def
index ff5e45178..7261cc920 100644
--- a/_test/definitions/server/fix43/10_MsgSeqNumEqual.def
+++ b/_test/definitions/server/fix43/10_MsgSeqNumEqual.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # sequence reset with gap fill flag set to Y
 I8=FIX.4.3
35=4
34=2
49=TW
52=<TIME>
56=ISLD
36=20
123=Y

diff --git a/_test/definitions/server/fix43/10_MsgSeqNumGreater.def b/_test/definitions/server/fix43/10_MsgSeqNumGreater.def
index e9a8155e7..6e23c23e4 100644
--- a/_test/definitions/server/fix43/10_MsgSeqNumGreater.def
+++ b/_test/definitions/server/fix43/10_MsgSeqNumGreater.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # sequence reset with gap fill flag set to Y
 I8=FIX.4.3
35=4
34=10
49=TW
52=<TIME>
56=ISLD
36=20
123=Y

diff --git a/_test/definitions/server/fix43/10_MsgSeqNumLess.def b/_test/definitions/server/fix43/10_MsgSeqNumLess.def
index 76fb60eee..b99deac43 100644
--- a/_test/definitions/server/fix43/10_MsgSeqNumLess.def
+++ b/_test/definitions/server/fix43/10_MsgSeqNumLess.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # sequence reset with gap fill flag set to Y, PosDupFlag set to Y
 I8=FIX.4.3
35=4
34=1
49=TW
52=<TIME>
56=ISLD
43=Y
122=<TIME-1>
36=20
123=Y

diff --git a/_test/definitions/server/fix43/11a_NewSeqNoGreater.def b/_test/definitions/server/fix43/11a_NewSeqNoGreater.def
index 022ba0cb2..634a5d172 100644
--- a/_test/definitions/server/fix43/11a_NewSeqNoGreater.def
+++ b/_test/definitions/server/fix43/11a_NewSeqNoGreater.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # sequence reset without gap fill flag (default to N)
 I8=FIX.4.3
35=4
34=0
49=TW
52=<TIME>
56=ISLD
36=25

diff --git a/_test/definitions/server/fix43/11b_NewSeqNoEqual.def b/_test/definitions/server/fix43/11b_NewSeqNoEqual.def
index 805ce4907..4fa39f0be 100644
--- a/_test/definitions/server/fix43/11b_NewSeqNoEqual.def
+++ b/_test/definitions/server/fix43/11b_NewSeqNoEqual.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # sequence reset without gap fill flag (default to N)
 I8=FIX.4.3
35=4
34=0
49=TW
52=<TIME>
56=ISLD
36=2

diff --git a/_test/definitions/server/fix43/11c_NewSeqNoLess.def b/_test/definitions/server/fix43/11c_NewSeqNoLess.def
index 692551913..323b7f565 100644
--- a/_test/definitions/server/fix43/11c_NewSeqNoLess.def
+++ b/_test/definitions/server/fix43/11c_NewSeqNoLess.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # sequence reset without gap fill flag (default to N)
 I8=FIX.4.3
35=4
34=0
49=TW
52=<TIME>
56=ISLD
36=1

diff --git a/_test/definitions/server/fix43/13b_UnsolicitedLogoutMessage.def b/_test/definitions/server/fix43/13b_UnsolicitedLogoutMessage.def
index f028e76a9..220173eec 100644
--- a/_test/definitions/server/fix43/13b_UnsolicitedLogoutMessage.def
+++ b/_test/definitions/server/fix43/13b_UnsolicitedLogoutMessage.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.3
35=5
34=2
49=TW
52=<TIME>
56=ISLD

 E8=FIX.4.3
9=49
35=5
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

 eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/server/fix43/14a_BadField.def b/_test/definitions/server/fix43/14a_BadField.def
index 45df3f63f..d228443e2 100644
--- a/_test/definitions/server/fix43/14a_BadField.def
+++ b/_test/definitions/server/fix43/14a_BadField.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.3
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.3
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix43/14b_RequiredFieldMissing.def b/_test/definitions/server/fix43/14b_RequiredFieldMissing.def
index f5272b443..f5cb1d013 100644
--- a/_test/definitions/server/fix43/14b_RequiredFieldMissing.def
+++ b/_test/definitions/server/fix43/14b_RequiredFieldMissing.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.3
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.3
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix43/14c_TagNotDefinedForMsgType.def b/_test/definitions/server/fix43/14c_TagNotDefinedForMsgType.def
index 7e69a752e..fc9632fd2 100644
--- a/_test/definitions/server/fix43/14c_TagNotDefinedForMsgType.def
+++ b/_test/definitions/server/fix43/14c_TagNotDefinedForMsgType.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.3
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.3
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix43/14d_TagSpecifiedWithoutValue.def b/_test/definitions/server/fix43/14d_TagSpecifiedWithoutValue.def
index daa2f0d8b..70ba38f90 100644
--- a/_test/definitions/server/fix43/14d_TagSpecifiedWithoutValue.def
+++ b/_test/definitions/server/fix43/14d_TagSpecifiedWithoutValue.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.3
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.3
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix43/14e_IncorrectEnumValue.def b/_test/definitions/server/fix43/14e_IncorrectEnumValue.def
index f6b0bfa1f..94330a2bc 100644
--- a/_test/definitions/server/fix43/14e_IncorrectEnumValue.def
+++ b/_test/definitions/server/fix43/14e_IncorrectEnumValue.def
@@ -4,7 +4,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.3
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.3
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix43/14f_IncorrectDataFormat.def b/_test/definitions/server/fix43/14f_IncorrectDataFormat.def
index 7d953371a..8a21bf5cc 100644
--- a/_test/definitions/server/fix43/14f_IncorrectDataFormat.def
+++ b/_test/definitions/server/fix43/14f_IncorrectDataFormat.def
@@ -4,7 +4,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.3
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.3
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix43/14g_HeaderBodyTrailerFieldsOutOfOrder.def b/_test/definitions/server/fix43/14g_HeaderBodyTrailerFieldsOutOfOrder.def
index a13903c04..f098ef662 100644
--- a/_test/definitions/server/fix43/14g_HeaderBodyTrailerFieldsOutOfOrder.def
+++ b/_test/definitions/server/fix43/14g_HeaderBodyTrailerFieldsOutOfOrder.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.3
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.3
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix43/14h_RepeatedTag.def b/_test/definitions/server/fix43/14h_RepeatedTag.def
index df3759467..bb2d1c3a8 100644
--- a/_test/definitions/server/fix43/14h_RepeatedTag.def
+++ b/_test/definitions/server/fix43/14h_RepeatedTag.def
@@ -4,7 +4,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.3
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.3
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix43/14i_RepeatingGroupCountNotEqual.def b/_test/definitions/server/fix43/14i_RepeatingGroupCountNotEqual.def
index da2505aab..1a701a64d 100644
--- a/_test/definitions/server/fix43/14i_RepeatingGroupCountNotEqual.def
+++ b/_test/definitions/server/fix43/14i_RepeatingGroupCountNotEqual.def
@@ -4,7 +4,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.3
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.3
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix43/15_HeaderAndBodyFieldsOrderedDifferently.def b/_test/definitions/server/fix43/15_HeaderAndBodyFieldsOrderedDifferently.def
index 7ca009da3..687a13991 100644
--- a/_test/definitions/server/fix43/15_HeaderAndBodyFieldsOrderedDifferently.def
+++ b/_test/definitions/server/fix43/15_HeaderAndBodyFieldsOrderedDifferently.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.3
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.3
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix43/19a_PossResendMessageThatHAsAlreadyBeenSent.def b/_test/definitions/server/fix43/19a_PossResendMessageThatHAsAlreadyBeenSent.def
index a8b6b4da5..1e221406d 100644
--- a/_test/definitions/server/fix43/19a_PossResendMessageThatHAsAlreadyBeenSent.def
+++ b/_test/definitions/server/fix43/19a_PossResendMessageThatHAsAlreadyBeenSent.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.3
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.3
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix43/19b_PossResendMessageThatHasNotBeenSent.def b/_test/definitions/server/fix43/19b_PossResendMessageThatHasNotBeenSent.def
index 0080e80a2..6f4bd003b 100644
--- a/_test/definitions/server/fix43/19b_PossResendMessageThatHasNotBeenSent.def
+++ b/_test/definitions/server/fix43/19b_PossResendMessageThatHasNotBeenSent.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.3
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.3
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix43/1a_ValidLogonMsgSeqNumTooHigh.def b/_test/definitions/server/fix43/1a_ValidLogonMsgSeqNumTooHigh.def
index e587f741b..7af4983f5 100644
--- a/_test/definitions/server/fix43/1a_ValidLogonMsgSeqNumTooHigh.def
+++ b/_test/definitions/server/fix43/1a_ValidLogonMsgSeqNumTooHigh.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=5
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 E8=FIX.4.3
9=58
35=2
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
7=1
16=0
10=0

 
 # logout message and response
diff --git a/_test/definitions/server/fix43/1a_ValidLogonWithCorrectMsgSeqNum.def b/_test/definitions/server/fix43/1a_ValidLogonWithCorrectMsgSeqNum.def
index d20432840..b9df84735 100644
--- a/_test/definitions/server/fix43/1a_ValidLogonWithCorrectMsgSeqNum.def
+++ b/_test/definitions/server/fix43/1a_ValidLogonWithCorrectMsgSeqNum.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # logout message and response
 I8=FIX.4.3
35=5
34=2
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix43/1b_DuplicateIdentity.def b/_test/definitions/server/fix43/1b_DuplicateIdentity.def
index 2adadb3d6..01b5ec20a 100644
--- a/_test/definitions/server/fix43/1b_DuplicateIdentity.def
+++ b/_test/definitions/server/fix43/1b_DuplicateIdentity.def
@@ -4,7 +4,7 @@
 # First logon, succesful
 i1,CONNECT
 I1,8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E1,8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E1,8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # Second logon, unsuccesful
 i2,CONNECT
diff --git a/_test/definitions/server/fix43/20_SimultaneousResendRequest.def b/_test/definitions/server/fix43/20_SimultaneousResendRequest.def
index 448de109e..c3a9df410 100644
--- a/_test/definitions/server/fix43/20_SimultaneousResendRequest.def
+++ b/_test/definitions/server/fix43/20_SimultaneousResendRequest.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 I8=FIX.4.3
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

 E8=FIX.4.3
9=99
35=D
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
11=ID
21=3
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

diff --git a/_test/definitions/server/fix43/21_RepeatingGroupSpecifierWithValueOfZero.def b/_test/definitions/server/fix43/21_RepeatingGroupSpecifierWithValueOfZero.def
index eeecc3e0c..0b5ea9146 100644
--- a/_test/definitions/server/fix43/21_RepeatingGroupSpecifierWithValueOfZero.def
+++ b/_test/definitions/server/fix43/21_RepeatingGroupSpecifierWithValueOfZero.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.3
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.3
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix43/2a_MsgSeqNumCorrect.def b/_test/definitions/server/fix43/2a_MsgSeqNumCorrect.def
index 8f04f522c..1a492fa20 100644
--- a/_test/definitions/server/fix43/2a_MsgSeqNumCorrect.def
+++ b/_test/definitions/server/fix43/2a_MsgSeqNumCorrect.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.3
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.3
35=0
34=3
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.3
35=0
34=4
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix43/2b_MsgSeqNumTooHigh.def b/_test/definitions/server/fix43/2b_MsgSeqNumTooHigh.def
index d821b793a..3953af992 100644
--- a/_test/definitions/server/fix43/2b_MsgSeqNumTooHigh.def
+++ b/_test/definitions/server/fix43/2b_MsgSeqNumTooHigh.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.3
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.3
35=0
34=3
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.3
35=0
34=4
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix43/2c_MsgSeqNumTooLow.def b/_test/definitions/server/fix43/2c_MsgSeqNumTooLow.def
index 108a170f7..ddc46314a 100644
--- a/_test/definitions/server/fix43/2c_MsgSeqNumTooLow.def
+++ b/_test/definitions/server/fix43/2c_MsgSeqNumTooLow.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.3
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.3
35=0
34=3
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.3
35=0
34=4
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix43/2d_GarbledMessage.def b/_test/definitions/server/fix43/2d_GarbledMessage.def
index 3a13944bd..3387e4465 100644
--- a/_test/definitions/server/fix43/2d_GarbledMessage.def
+++ b/_test/definitions/server/fix43/2d_GarbledMessage.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30

+E8=FIX.4.3
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y

 
 # Garbled message
 I8=FIX.4.3
9=52
35=0
34=2
4garbled9=TW
52=<TIME>
56=ISLD
10=0

diff --git a/_test/definitions/server/fix43/2e_PossDupAlreadyReceived.def b/_test/definitions/server/fix43/2e_PossDupAlreadyReceived.def
index e49396eee..5f47735a6 100644
--- a/_test/definitions/server/fix43/2e_PossDupAlreadyReceived.def
+++ b/_test/definitions/server/fix43/2e_PossDupAlreadyReceived.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=7

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=7

 I8=FIX.4.3
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.3
35=0
34=2
49=TW
52=<TIME>
122=<TIME>
56=ISLD
43=Y
112=<TIME>

 I8=FIX.4.3
35=0
34=3
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix43/2e_PossDupNotReceived.def b/_test/definitions/server/fix43/2e_PossDupNotReceived.def
index b84ff357c..cdabb6808 100644
--- a/_test/definitions/server/fix43/2e_PossDupNotReceived.def
+++ b/_test/definitions/server/fix43/2e_PossDupNotReceived.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.3
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 
 # Already received, this should be ignored
diff --git a/_test/definitions/server/fix43/2f_PossDupOrigSendingTimeTooHigh.def b/_test/definitions/server/fix43/2f_PossDupOrigSendingTimeTooHigh.def
index 282af7ec2..8011e6175 100644
--- a/_test/definitions/server/fix43/2f_PossDupOrigSendingTimeTooHigh.def
+++ b/_test/definitions/server/fix43/2f_PossDupOrigSendingTimeTooHigh.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # send two orders in sequence
 I8=FIX.4.3
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix43/2g_PossDupNoOrigSendingTime.def b/_test/definitions/server/fix43/2g_PossDupNoOrigSendingTime.def
index d077f6385..9b33df088 100644
--- a/_test/definitions/server/fix43/2g_PossDupNoOrigSendingTime.def
+++ b/_test/definitions/server/fix43/2g_PossDupNoOrigSendingTime.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # send two orders in sequence
 I8=FIX.4.3
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix43/2i_BeginStringValueUnexpected.def b/_test/definitions/server/fix43/2i_BeginStringValueUnexpected.def
index e60080d33..5cbe9a3dc 100644
--- a/_test/definitions/server/fix43/2i_BeginStringValueUnexpected.def
+++ b/_test/definitions/server/fix43/2i_BeginStringValueUnexpected.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # Send with incorrect begin string and respond to logout
 I8=FIX.4.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=id

@@ -12,7 +12,7 @@ eDISCONNECT
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # Send with incorrect begin string and don't respond to logout
 I8=FIX.4.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=id

diff --git a/_test/definitions/server/fix43/2k_CompIDDoesNotMatchProfile.def b/_test/definitions/server/fix43/2k_CompIDDoesNotMatchProfile.def
index 1557f5e5f..a311b739c 100644
--- a/_test/definitions/server/fix43/2k_CompIDDoesNotMatchProfile.def
+++ b/_test/definitions/server/fix43/2k_CompIDDoesNotMatchProfile.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # send order with bad SenderCompID
 I8=FIX.4.3
35=D
34=2
49=WT
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

@@ -18,7 +18,7 @@ eDISCONNECT
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # send order with bad TargetCompID
 I8=FIX.4.3
35=D
34=2
49=TW
52=<TIME>
56=DLSI
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

@@ -34,7 +34,7 @@ eDISCONNECT
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # send order with bad SenderCompID and TargetCompID
 I8=FIX.4.3
35=D
34=2
49=WT
52=<TIME>
56=DLSI
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix43/2m_BodyLengthValueNotCorrect.def b/_test/definitions/server/fix43/2m_BodyLengthValueNotCorrect.def
index 6f18ea913..bb00b7dcc 100644
--- a/_test/definitions/server/fix43/2m_BodyLengthValueNotCorrect.def
+++ b/_test/definitions/server/fix43/2m_BodyLengthValueNotCorrect.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # Send a message with a length that is too short
 I8=FIX.4.3
9=30
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix43/2o_SendingTimeValueOutOfRange.def b/_test/definitions/server/fix43/2o_SendingTimeValueOutOfRange.def
index 5ed52a205..312da03b4 100644
--- a/_test/definitions/server/fix43/2o_SendingTimeValueOutOfRange.def
+++ b/_test/definitions/server/fix43/2o_SendingTimeValueOutOfRange.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 # send heartbeat more than 2 minutes early
 I8=FIX.4.3
35=0
34=2
49=TW
52=<TIME-121>
56=ISLD

 # reject and logoff
@@ -15,7 +15,7 @@ eDISCONNECT
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 # send heartbeat more than 2 minutes late
 I8=FIX.4.3
35=0
34=2
49=TW
52=<TIME+121>
56=ISLD

 # reject and logoff
diff --git a/_test/definitions/server/fix43/2q_MsgTypeNotValid.def b/_test/definitions/server/fix43/2q_MsgTypeNotValid.def
index c26d88c3c..361d6b982 100644
--- a/_test/definitions/server/fix43/2q_MsgTypeNotValid.def
+++ b/_test/definitions/server/fix43/2q_MsgTypeNotValid.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.3
35=*
34=2
49=TW
52=<TIME>
56=ISLD

 # reject
 E8=FIX.4.3
9=86
35=3
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
45=2
58=Invalid MsgType
372=*
373=11
10=0

diff --git a/_test/definitions/server/fix43/2r_UnregisteredMsgType.def b/_test/definitions/server/fix43/2r_UnregisteredMsgType.def
index c15c285fe..1027dad07 100644
--- a/_test/definitions/server/fix43/2r_UnregisteredMsgType.def
+++ b/_test/definitions/server/fix43/2r_UnregisteredMsgType.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 I8=FIX.4.3
35=8
34=2
49=TW
52=<TIME>
56=ISLD
37=id
17=id
150=0
39=0
55=WLRI
54=1
151=100
14=0
6=0.0

 E8=FIX.4.3
9=94
35=j
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
45=2
58=Unsupported Message Type
372=8
380=3
10=0

diff --git a/_test/definitions/server/fix43/2t_FirstThreeFieldsOutOfOrder.def b/_test/definitions/server/fix43/2t_FirstThreeFieldsOutOfOrder.def
index 15db138a3..714019761 100644
--- a/_test/definitions/server/fix43/2t_FirstThreeFieldsOutOfOrder.def
+++ b/_test/definitions/server/fix43/2t_FirstThreeFieldsOutOfOrder.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # 35 is first, should be second
 I35=0
8=FIX.4.3
9=29
34=2
49=TW
52=<TIME>
56=ISLD
10=121

diff --git a/_test/definitions/server/fix43/3b_InvalidChecksum.def b/_test/definitions/server/fix43/3b_InvalidChecksum.def
index a54153809..3b5132cd6 100644
--- a/_test/definitions/server/fix43/3b_InvalidChecksum.def
+++ b/_test/definitions/server/fix43/3b_InvalidChecksum.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=7

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=7

 
 # Incorrect checksum
 I8=FIX.4.3
35=0
34=2
49=TW
52=<TIME>
56=ISLD
10=256

diff --git a/_test/definitions/server/fix43/3c_GarbledMessage.def b/_test/definitions/server/fix43/3c_GarbledMessage.def
index b4be29fa2..7ddfde464 100644
--- a/_test/definitions/server/fix43/3c_GarbledMessage.def
+++ b/_test/definitions/server/fix43/3c_GarbledMessage.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30

+E8=FIX.4.3
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y

 
 # Garbled message
 I8=FIX.4.3
9=52
35=0
34=2
4garbled9=TW
52=<TIME>
56=ISLD
10=0

diff --git a/_test/definitions/server/fix43/4a_NoDataSentDuringHeartBtInt.def b/_test/definitions/server/fix43/4a_NoDataSentDuringHeartBtInt.def
index db11f2d45..3ce424ecb 100644
--- a/_test/definitions/server/fix43/4a_NoDataSentDuringHeartBtInt.def
+++ b/_test/definitions/server/fix43/4a_NoDataSentDuringHeartBtInt.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=6

-E8=FIX.4.3
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=6
10=0

+E8=FIX.4.3
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=6
141=Y
10=0

 
 # Wait for quickfix to send a heartbeat to us
 E8=FIX.4.3
9=49
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

diff --git a/_test/definitions/server/fix43/4b_ReceivedTestRequest.def b/_test/definitions/server/fix43/4b_ReceivedTestRequest.def
index 4a107cb85..a82e75343 100644
--- a/_test/definitions/server/fix43/4b_ReceivedTestRequest.def
+++ b/_test/definitions/server/fix43/4b_ReceivedTestRequest.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.3
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=HELLO

 E8=FIX.4.3
9=59
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
112=HELLO
10=0

 
diff --git a/_test/definitions/server/fix43/6_SendTestRequest.def b/_test/definitions/server/fix43/6_SendTestRequest.def
index 22f30d9e6..7e81dff54 100644
--- a/_test/definitions/server/fix43/6_SendTestRequest.def
+++ b/_test/definitions/server/fix43/6_SendTestRequest.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=6

-E8=FIX.4.3
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=6
10=0

+E8=FIX.4.3
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=6
141=Y
10=0

 
 # wait for two heartbeats
 E8=FIX.4.3
9=49
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

diff --git a/_test/definitions/server/fix43/7_ReceiveRejectMessage.def b/_test/definitions/server/fix43/7_ReceiveRejectMessage.def
index 2a8e347fc..3bf1f81c9 100644
--- a/_test/definitions/server/fix43/7_ReceiveRejectMessage.def
+++ b/_test/definitions/server/fix43/7_ReceiveRejectMessage.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # reject
 I8=FIX.4.3
35=3
34=2
49=TW
52=<TIME>
56=ISLD
45=1

diff --git a/_test/definitions/server/fix43/8_AdminAndApplicationMessages.def b/_test/definitions/server/fix43/8_AdminAndApplicationMessages.def
index 81c340fb0..572830f9e 100644
--- a/_test/definitions/server/fix43/8_AdminAndApplicationMessages.def
+++ b/_test/definitions/server/fix43/8_AdminAndApplicationMessages.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # Admin messages 2-4
 I8=FIX.4.3
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=HELLO

diff --git a/_test/definitions/server/fix43/8_OnlyAdminMessages.def b/_test/definitions/server/fix43/8_OnlyAdminMessages.def
index c472f90e1..04f4a8377 100644
--- a/_test/definitions/server/fix43/8_OnlyAdminMessages.def
+++ b/_test/definitions/server/fix43/8_OnlyAdminMessages.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.3
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=HELLO

 E8=FIX.4.3
9=59
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
112=HELLO
10=0

 I8=FIX.4.3
35=1
34=3
49=TW
52=<TIME>
56=ISLD
112=HELLO

diff --git a/_test/definitions/server/fix43/8_OnlyApplicationMessages.def b/_test/definitions/server/fix43/8_OnlyApplicationMessages.def
index b54a0cd8b..9aea8a0a2 100644
--- a/_test/definitions/server/fix43/8_OnlyApplicationMessages.def
+++ b/_test/definitions/server/fix43/8_OnlyApplicationMessages.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 I8=FIX.4.3
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

 E8=FIX.4.3
9=99
35=D
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
11=ID
21=3
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

diff --git a/_test/definitions/server/fix43/AlreadyLoggedOn.def b/_test/definitions/server/fix43/AlreadyLoggedOn.def
index 870993ce1..292af9994 100644
--- a/_test/definitions/server/fix43/AlreadyLoggedOn.def
+++ b/_test/definitions/server/fix43/AlreadyLoggedOn.def
@@ -2,7 +2,7 @@
 
 i1,CONNECT
 I1,8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E1,8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E1,8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 i2,CONNECT
 I2,8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

diff --git a/_test/definitions/server/fix43/RejectResentMessage.def b/_test/definitions/server/fix43/RejectResentMessage.def
index 00f514426..43e93213a 100644
--- a/_test/definitions/server/fix43/RejectResentMessage.def
+++ b/_test/definitions/server/fix43/RejectResentMessage.def
@@ -3,7 +3,7 @@
 iCONNECT
 #Logon
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 # send in a test request one number too high
 I8=FIX.4.3
35=1
34=3
49=TW
52=<TIME>
56=ISLD
112=HELLO1

diff --git a/_test/definitions/server/fix43/ReverseRoute.def b/_test/definitions/server/fix43/ReverseRoute.def
index bddeafe9f..2aa71affc 100644
--- a/_test/definitions/server/fix43/ReverseRoute.def
+++ b/_test/definitions/server/fix43/ReverseRoute.def
@@ -3,7 +3,7 @@
 iCONNECT
 #Logon
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # Send an order with OnBehalfOfCompID (115) set with bad field value 40=w
 I8=FIX.4.3
35=D
34=2
49=TW
52=<TIME>
56=ISLD
115=JCD
11=ID
21=3
38=100
40=w
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix43/ReverseRouteWithEmptyRoutingTags.def b/_test/definitions/server/fix43/ReverseRouteWithEmptyRoutingTags.def
index 10e9b9fb3..841f8dd34 100644
--- a/_test/definitions/server/fix43/ReverseRouteWithEmptyRoutingTags.def
+++ b/_test/definitions/server/fix43/ReverseRouteWithEmptyRoutingTags.def
@@ -3,7 +3,7 @@
 iCONNECT
 #Logon
 I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.3
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.3
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # Send an order with OnBehalfOfCompID (115) empty 
 I8=FIX.4.3
35=D
34=2
49=TW
52=<TIME>
56=ISLD
115=
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix44/10_MsgSeqNumEqual.def b/_test/definitions/server/fix44/10_MsgSeqNumEqual.def
index 848299ed1..2e9ee68d0 100644
--- a/_test/definitions/server/fix44/10_MsgSeqNumEqual.def
+++ b/_test/definitions/server/fix44/10_MsgSeqNumEqual.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # sequence reset with gap fill flag set to Y
 I8=FIX.4.4
35=4
34=2
49=TW
52=<TIME>
56=ISLD
36=20
123=Y

diff --git a/_test/definitions/server/fix44/10_MsgSeqNumGreater.def b/_test/definitions/server/fix44/10_MsgSeqNumGreater.def
index 4a631680b..af5c67c9b 100644
--- a/_test/definitions/server/fix44/10_MsgSeqNumGreater.def
+++ b/_test/definitions/server/fix44/10_MsgSeqNumGreater.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # sequence reset with gap fill flag set to Y
 I8=FIX.4.4
35=4
34=10
49=TW
52=<TIME>
56=ISLD
36=20
123=Y

diff --git a/_test/definitions/server/fix44/10_MsgSeqNumLess.def b/_test/definitions/server/fix44/10_MsgSeqNumLess.def
index 5e38d4d3a..6b371b76b 100644
--- a/_test/definitions/server/fix44/10_MsgSeqNumLess.def
+++ b/_test/definitions/server/fix44/10_MsgSeqNumLess.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # sequence reset with gap fill flag set to Y, PosDupFlag set to Y
 I8=FIX.4.4
35=4
34=1
49=TW
52=<TIME>
56=ISLD
43=Y
122=<TIME-1>
36=20
123=Y

diff --git a/_test/definitions/server/fix44/11a_NewSeqNoGreater.def b/_test/definitions/server/fix44/11a_NewSeqNoGreater.def
index 6a8226e13..011c385bf 100644
--- a/_test/definitions/server/fix44/11a_NewSeqNoGreater.def
+++ b/_test/definitions/server/fix44/11a_NewSeqNoGreater.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # sequence reset without gap fill flag (default to N)
 I8=FIX.4.4
35=4
34=0
49=TW
52=<TIME>
56=ISLD
36=25

diff --git a/_test/definitions/server/fix44/11b_NewSeqNoEqual.def b/_test/definitions/server/fix44/11b_NewSeqNoEqual.def
index 1e7f0d7bd..43d8c4e90 100644
--- a/_test/definitions/server/fix44/11b_NewSeqNoEqual.def
+++ b/_test/definitions/server/fix44/11b_NewSeqNoEqual.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # sequence reset without gap fill flag (default to N)
 I8=FIX.4.4
35=4
34=0
49=TW
52=<TIME>
56=ISLD
36=2

diff --git a/_test/definitions/server/fix44/11c_NewSeqNoLess.def b/_test/definitions/server/fix44/11c_NewSeqNoLess.def
index 0886a2f8b..1689a83bf 100644
--- a/_test/definitions/server/fix44/11c_NewSeqNoLess.def
+++ b/_test/definitions/server/fix44/11c_NewSeqNoLess.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # sequence reset without gap fill flag (default to N)
 I8=FIX.4.4
35=4
34=0
49=TW
52=<TIME>
56=ISLD
36=1

diff --git a/_test/definitions/server/fix44/13b_UnsolicitedLogoutMessage.def b/_test/definitions/server/fix44/13b_UnsolicitedLogoutMessage.def
index de988bea6..9a2040256 100644
--- a/_test/definitions/server/fix44/13b_UnsolicitedLogoutMessage.def
+++ b/_test/definitions/server/fix44/13b_UnsolicitedLogoutMessage.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.4
35=5
34=2
49=TW
52=<TIME>
56=ISLD

 E8=FIX.4.4
9=49
35=5
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

 eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/server/fix44/14a_BadField.def b/_test/definitions/server/fix44/14a_BadField.def
index e80ff1730..533e8c0f2 100644
--- a/_test/definitions/server/fix44/14a_BadField.def
+++ b/_test/definitions/server/fix44/14a_BadField.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.4
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.4
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix44/14b_RequiredFieldMissing.def b/_test/definitions/server/fix44/14b_RequiredFieldMissing.def
index 98ae399ab..0d5e2d817 100644
--- a/_test/definitions/server/fix44/14b_RequiredFieldMissing.def
+++ b/_test/definitions/server/fix44/14b_RequiredFieldMissing.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.4
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.4
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix44/14c_TagNotDefinedForMsgType.def b/_test/definitions/server/fix44/14c_TagNotDefinedForMsgType.def
index 6a48e35e6..941e2ab13 100644
--- a/_test/definitions/server/fix44/14c_TagNotDefinedForMsgType.def
+++ b/_test/definitions/server/fix44/14c_TagNotDefinedForMsgType.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.4
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.4
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix44/14d_TagSpecifiedWithoutValue.def b/_test/definitions/server/fix44/14d_TagSpecifiedWithoutValue.def
index 446901b94..489e01cc5 100644
--- a/_test/definitions/server/fix44/14d_TagSpecifiedWithoutValue.def
+++ b/_test/definitions/server/fix44/14d_TagSpecifiedWithoutValue.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.4
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.4
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix44/14e_IncorrectEnumValue.def b/_test/definitions/server/fix44/14e_IncorrectEnumValue.def
index a4c2ae209..56be0911d 100644
--- a/_test/definitions/server/fix44/14e_IncorrectEnumValue.def
+++ b/_test/definitions/server/fix44/14e_IncorrectEnumValue.def
@@ -4,7 +4,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.4
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.4
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix44/14f_IncorrectDataFormat.def b/_test/definitions/server/fix44/14f_IncorrectDataFormat.def
index 9c5893a3b..3bf186861 100644
--- a/_test/definitions/server/fix44/14f_IncorrectDataFormat.def
+++ b/_test/definitions/server/fix44/14f_IncorrectDataFormat.def
@@ -4,7 +4,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.4
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.4
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix44/14g_HeaderBodyTrailerFieldsOutOfOrder.def b/_test/definitions/server/fix44/14g_HeaderBodyTrailerFieldsOutOfOrder.def
index 3038b504c..eb8a26cae 100644
--- a/_test/definitions/server/fix44/14g_HeaderBodyTrailerFieldsOutOfOrder.def
+++ b/_test/definitions/server/fix44/14g_HeaderBodyTrailerFieldsOutOfOrder.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.4
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.4
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix44/14h_RepeatedTag.def b/_test/definitions/server/fix44/14h_RepeatedTag.def
index c40736f83..b328d1dc2 100644
--- a/_test/definitions/server/fix44/14h_RepeatedTag.def
+++ b/_test/definitions/server/fix44/14h_RepeatedTag.def
@@ -4,7 +4,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.4
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.4
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix44/14i_RepeatingGroupCountNotEqual.def b/_test/definitions/server/fix44/14i_RepeatingGroupCountNotEqual.def
index 26a32f493..eea1b321f 100644
--- a/_test/definitions/server/fix44/14i_RepeatingGroupCountNotEqual.def
+++ b/_test/definitions/server/fix44/14i_RepeatingGroupCountNotEqual.def
@@ -4,7 +4,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.4
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.4
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix44/15_HeaderAndBodyFieldsOrderedDifferently.def b/_test/definitions/server/fix44/15_HeaderAndBodyFieldsOrderedDifferently.def
index efdf74f6d..21e614fad 100644
--- a/_test/definitions/server/fix44/15_HeaderAndBodyFieldsOrderedDifferently.def
+++ b/_test/definitions/server/fix44/15_HeaderAndBodyFieldsOrderedDifferently.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.4
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.4
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix44/19a_PossResendMessageThatHAsAlreadyBeenSent.def b/_test/definitions/server/fix44/19a_PossResendMessageThatHAsAlreadyBeenSent.def
index c5d4f4b3d..1dc1bc438 100644
--- a/_test/definitions/server/fix44/19a_PossResendMessageThatHAsAlreadyBeenSent.def
+++ b/_test/definitions/server/fix44/19a_PossResendMessageThatHAsAlreadyBeenSent.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.4
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.4
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix44/19b_PossResendMessageThatHasNotBeenSent.def b/_test/definitions/server/fix44/19b_PossResendMessageThatHasNotBeenSent.def
index bd7cce443..336e1f56e 100644
--- a/_test/definitions/server/fix44/19b_PossResendMessageThatHasNotBeenSent.def
+++ b/_test/definitions/server/fix44/19b_PossResendMessageThatHasNotBeenSent.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.4
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.4
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix44/1a_ValidLogonMsgSeqNumTooHigh.def b/_test/definitions/server/fix44/1a_ValidLogonMsgSeqNumTooHigh.def
index 6cc598280..34dc3f21e 100644
--- a/_test/definitions/server/fix44/1a_ValidLogonMsgSeqNumTooHigh.def
+++ b/_test/definitions/server/fix44/1a_ValidLogonMsgSeqNumTooHigh.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=5
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 E8=FIX.4.4
9=58
35=2
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
7=1
16=0
10=0

 
 # logout message and response
diff --git a/_test/definitions/server/fix44/1a_ValidLogonWithCorrectMsgSeqNum.def b/_test/definitions/server/fix44/1a_ValidLogonWithCorrectMsgSeqNum.def
index beafcb5c1..19c5183bc 100644
--- a/_test/definitions/server/fix44/1a_ValidLogonWithCorrectMsgSeqNum.def
+++ b/_test/definitions/server/fix44/1a_ValidLogonWithCorrectMsgSeqNum.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # logout message and response
 I8=FIX.4.4
35=5
34=2
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix44/1b_DuplicateIdentity.def b/_test/definitions/server/fix44/1b_DuplicateIdentity.def
index 102097f1f..378250491 100644
--- a/_test/definitions/server/fix44/1b_DuplicateIdentity.def
+++ b/_test/definitions/server/fix44/1b_DuplicateIdentity.def
@@ -4,7 +4,7 @@
 # First logon, succesful
 i1,CONNECT
 I1,8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E1,8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E1,8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # Second logon, unsuccesful
 i2,CONNECT
diff --git a/_test/definitions/server/fix44/20_SimultaneousResendRequest.def b/_test/definitions/server/fix44/20_SimultaneousResendRequest.def
index d6d0a1b75..59dcdacba 100644
--- a/_test/definitions/server/fix44/20_SimultaneousResendRequest.def
+++ b/_test/definitions/server/fix44/20_SimultaneousResendRequest.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 I8=FIX.4.4
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

 E8=FIX.4.4
9=99
35=D
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
11=ID
21=3
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

diff --git a/_test/definitions/server/fix44/21_RepeatingGroupSpecifierWithValueOfZero.def b/_test/definitions/server/fix44/21_RepeatingGroupSpecifierWithValueOfZero.def
index 6dcfebc36..0f73aab20 100644
--- a/_test/definitions/server/fix44/21_RepeatingGroupSpecifierWithValueOfZero.def
+++ b/_test/definitions/server/fix44/21_RepeatingGroupSpecifierWithValueOfZero.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2

-E8=FIX.4.4
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
10=0

+E8=FIX.4.4
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix44/2a_MsgSeqNumCorrect.def b/_test/definitions/server/fix44/2a_MsgSeqNumCorrect.def
index c098bbf3d..1aa605e56 100644
--- a/_test/definitions/server/fix44/2a_MsgSeqNumCorrect.def
+++ b/_test/definitions/server/fix44/2a_MsgSeqNumCorrect.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.4
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.4
35=0
34=3
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.4
35=0
34=4
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix44/2b_MsgSeqNumTooHigh.def b/_test/definitions/server/fix44/2b_MsgSeqNumTooHigh.def
index f27fce3ed..be2582905 100644
--- a/_test/definitions/server/fix44/2b_MsgSeqNumTooHigh.def
+++ b/_test/definitions/server/fix44/2b_MsgSeqNumTooHigh.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.4
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.4
35=0
34=3
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.4
35=0
34=4
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix44/2c_MsgSeqNumTooLow.def b/_test/definitions/server/fix44/2c_MsgSeqNumTooLow.def
index 73b87ed5e..eeed9167b 100644
--- a/_test/definitions/server/fix44/2c_MsgSeqNumTooLow.def
+++ b/_test/definitions/server/fix44/2c_MsgSeqNumTooLow.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.4
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.4
35=0
34=3
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.4
35=0
34=4
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix44/2d_GarbledMessage.def b/_test/definitions/server/fix44/2d_GarbledMessage.def
index 73d701d6d..da6371005 100644
--- a/_test/definitions/server/fix44/2d_GarbledMessage.def
+++ b/_test/definitions/server/fix44/2d_GarbledMessage.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30

+E8=FIX.4.4
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y

 
 # Garbled message
 I8=FIX.4.4
9=52
35=0
34=2
4garbled9=TW
52=<TIME>
56=ISLD
10=0

diff --git a/_test/definitions/server/fix44/2e_PossDupAlreadyReceived.def b/_test/definitions/server/fix44/2e_PossDupAlreadyReceived.def
index 58b129446..ed2620d5e 100644
--- a/_test/definitions/server/fix44/2e_PossDupAlreadyReceived.def
+++ b/_test/definitions/server/fix44/2e_PossDupAlreadyReceived.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=7

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=7

 I8=FIX.4.4
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.4
35=0
34=2
49=TW
52=<TIME>
122=<TIME>
56=ISLD
43=Y
112=<TIME>

 I8=FIX.4.4
35=0
34=3
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix44/2e_PossDupNotReceived.def b/_test/definitions/server/fix44/2e_PossDupNotReceived.def
index 5b4a666ee..b5f5c6c7a 100644
--- a/_test/definitions/server/fix44/2e_PossDupNotReceived.def
+++ b/_test/definitions/server/fix44/2e_PossDupNotReceived.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.4
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 
 # Already received, this should be ignored
diff --git a/_test/definitions/server/fix44/2f_PossDupOrigSendingTimeTooHigh.def b/_test/definitions/server/fix44/2f_PossDupOrigSendingTimeTooHigh.def
index 5a1ec7e95..82c96316c 100644
--- a/_test/definitions/server/fix44/2f_PossDupOrigSendingTimeTooHigh.def
+++ b/_test/definitions/server/fix44/2f_PossDupOrigSendingTimeTooHigh.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # send two orders in sequence
 I8=FIX.4.4
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix44/2g_PossDupNoOrigSendingTime.def b/_test/definitions/server/fix44/2g_PossDupNoOrigSendingTime.def
index 25cd03127..18651861a 100644
--- a/_test/definitions/server/fix44/2g_PossDupNoOrigSendingTime.def
+++ b/_test/definitions/server/fix44/2g_PossDupNoOrigSendingTime.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # send two orders in sequence
 I8=FIX.4.4
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix44/2i_BeginStringValueUnexpected.def b/_test/definitions/server/fix44/2i_BeginStringValueUnexpected.def
index db2bf1f56..ee29f970e 100644
--- a/_test/definitions/server/fix44/2i_BeginStringValueUnexpected.def
+++ b/_test/definitions/server/fix44/2i_BeginStringValueUnexpected.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # Send with incorrect begin string and respond to logout
 I8=FIX.4.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=id

@@ -12,7 +12,7 @@ eDISCONNECT
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # Send with incorrect begin string and don't respond to logout
 I8=FIX.4.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=id

diff --git a/_test/definitions/server/fix44/2k_CompIDDoesNotMatchProfile.def b/_test/definitions/server/fix44/2k_CompIDDoesNotMatchProfile.def
index b3f041681..79a829b6e 100644
--- a/_test/definitions/server/fix44/2k_CompIDDoesNotMatchProfile.def
+++ b/_test/definitions/server/fix44/2k_CompIDDoesNotMatchProfile.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # send order with bad SenderCompID
 I8=FIX.4.4
35=D
34=2
49=WT
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

@@ -18,7 +18,7 @@ eDISCONNECT
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # send order with bad TargetCompID
 I8=FIX.4.4
35=D
34=2
49=TW
52=<TIME>
56=DLSI
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

@@ -34,7 +34,7 @@ eDISCONNECT
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # send order with bad SenderCompID and TargetCompID
 I8=FIX.4.4
35=D
34=2
49=WT
52=<TIME>
56=DLSI
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix44/2m_BodyLengthValueNotCorrect.def b/_test/definitions/server/fix44/2m_BodyLengthValueNotCorrect.def
index eb45540c0..7ea4ba51b 100644
--- a/_test/definitions/server/fix44/2m_BodyLengthValueNotCorrect.def
+++ b/_test/definitions/server/fix44/2m_BodyLengthValueNotCorrect.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # Send a message with a length that is too short
 I8=FIX.4.4
9=30
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix44/2o_SendingTimeValueOutOfRange.def b/_test/definitions/server/fix44/2o_SendingTimeValueOutOfRange.def
index bfd3351b6..ab44a004a 100644
--- a/_test/definitions/server/fix44/2o_SendingTimeValueOutOfRange.def
+++ b/_test/definitions/server/fix44/2o_SendingTimeValueOutOfRange.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 # send heartbeat more than 2 minutes early
 I8=FIX.4.4
35=0
34=2
49=TW
52=<TIME-121>
56=ISLD

 # reject and logoff
@@ -15,7 +15,7 @@ eDISCONNECT
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 # send heartbeat more than 2 minutes late
 I8=FIX.4.4
35=0
34=2
49=TW
52=<TIME+121>
56=ISLD

 # reject and logoff
diff --git a/_test/definitions/server/fix44/2q_MsgTypeNotValid.def b/_test/definitions/server/fix44/2q_MsgTypeNotValid.def
index fa0c25a6b..210abebcc 100644
--- a/_test/definitions/server/fix44/2q_MsgTypeNotValid.def
+++ b/_test/definitions/server/fix44/2q_MsgTypeNotValid.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.4
35=*
34=2
49=TW
52=<TIME>
56=ISLD

 # reject
 E8=FIX.4.4
9=86
35=3
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
45=2
58=Invalid MsgType
372=*
373=11
10=0

diff --git a/_test/definitions/server/fix44/2r_UnregisteredMsgType.def b/_test/definitions/server/fix44/2r_UnregisteredMsgType.def
index 06b74130d..9c057a1e7 100644
--- a/_test/definitions/server/fix44/2r_UnregisteredMsgType.def
+++ b/_test/definitions/server/fix44/2r_UnregisteredMsgType.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 I8=FIX.4.4
35=8
34=2
49=TW
52=<TIME>
56=ISLD
37=id
17=id
150=0
39=0
55=WLRI
54=1
151=100
14=0
6=0.0

 E8=FIX.4.4
9=94
35=j
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
45=2
58=Unsupported Message Type
372=8
380=3
10=0

diff --git a/_test/definitions/server/fix44/2t_FirstThreeFieldsOutOfOrder.def b/_test/definitions/server/fix44/2t_FirstThreeFieldsOutOfOrder.def
index cb13dc496..b830d4b7e 100644
--- a/_test/definitions/server/fix44/2t_FirstThreeFieldsOutOfOrder.def
+++ b/_test/definitions/server/fix44/2t_FirstThreeFieldsOutOfOrder.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # 35 is first, should be second
 I35=0
8=FIX.4.4
9=29
34=2
49=TW
52=<TIME>
56=ISLD
10=121

diff --git a/_test/definitions/server/fix44/3b_InvalidChecksum.def b/_test/definitions/server/fix44/3b_InvalidChecksum.def
index c709393f2..42360c24e 100644
--- a/_test/definitions/server/fix44/3b_InvalidChecksum.def
+++ b/_test/definitions/server/fix44/3b_InvalidChecksum.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=7

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=7

 
 # Incorrect checksum
 I8=FIX.4.4
35=0
34=2
49=TW
52=<TIME>
56=ISLD
10=256

diff --git a/_test/definitions/server/fix44/3c_GarbledMessage.def b/_test/definitions/server/fix44/3c_GarbledMessage.def
index 55c602066..c87a793e4 100644
--- a/_test/definitions/server/fix44/3c_GarbledMessage.def
+++ b/_test/definitions/server/fix44/3c_GarbledMessage.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30

+E8=FIX.4.4
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y

 
 # Garbled message
 I8=FIX.4.4
9=52
35=0
34=2
4garbled9=TW
52=<TIME>
56=ISLD
10=0

diff --git a/_test/definitions/server/fix44/4a_NoDataSentDuringHeartBtInt.def b/_test/definitions/server/fix44/4a_NoDataSentDuringHeartBtInt.def
index 08b0012ed..7a154b30f 100644
--- a/_test/definitions/server/fix44/4a_NoDataSentDuringHeartBtInt.def
+++ b/_test/definitions/server/fix44/4a_NoDataSentDuringHeartBtInt.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=6

-E8=FIX.4.4
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=6
10=0

+E8=FIX.4.4
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=6
141=Y
10=0

 
 # Wait for quickfix to send a heartbeat to us
 E8=FIX.4.4
9=49
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

diff --git a/_test/definitions/server/fix44/4b_ReceivedTestRequest.def b/_test/definitions/server/fix44/4b_ReceivedTestRequest.def
index 6cc98eeae..d80d64e0b 100644
--- a/_test/definitions/server/fix44/4b_ReceivedTestRequest.def
+++ b/_test/definitions/server/fix44/4b_ReceivedTestRequest.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.4
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=HELLO

 E8=FIX.4.4
9=59
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
112=HELLO
10=0

 
diff --git a/_test/definitions/server/fix44/6_SendTestRequest.def b/_test/definitions/server/fix44/6_SendTestRequest.def
index e9479f01f..94269d150 100644
--- a/_test/definitions/server/fix44/6_SendTestRequest.def
+++ b/_test/definitions/server/fix44/6_SendTestRequest.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=6

-E8=FIX.4.4
9=60
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=6
10=0

+E8=FIX.4.4
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=6
141=Y
10=0

 
 # wait for two heartbeats
 E8=FIX.4.4
9=49
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

diff --git a/_test/definitions/server/fix44/7_ReceiveRejectMessage.def b/_test/definitions/server/fix44/7_ReceiveRejectMessage.def
index 7a2e88029..3e82defa6 100644
--- a/_test/definitions/server/fix44/7_ReceiveRejectMessage.def
+++ b/_test/definitions/server/fix44/7_ReceiveRejectMessage.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # reject
 I8=FIX.4.4
35=3
34=2
49=TW
52=<TIME>
56=ISLD
45=1

diff --git a/_test/definitions/server/fix44/8_AdminAndApplicationMessages.def b/_test/definitions/server/fix44/8_AdminAndApplicationMessages.def
index 225b04257..4aea2705b 100644
--- a/_test/definitions/server/fix44/8_AdminAndApplicationMessages.def
+++ b/_test/definitions/server/fix44/8_AdminAndApplicationMessages.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # Admin messages 2-4
 I8=FIX.4.4
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=HELLO

diff --git a/_test/definitions/server/fix44/8_OnlyAdminMessages.def b/_test/definitions/server/fix44/8_OnlyAdminMessages.def
index e0aaf5664..d5f48a2e7 100644
--- a/_test/definitions/server/fix44/8_OnlyAdminMessages.def
+++ b/_test/definitions/server/fix44/8_OnlyAdminMessages.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.4
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=HELLO

 E8=FIX.4.4
9=59
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
112=HELLO
10=0

 I8=FIX.4.4
35=1
34=3
49=TW
52=<TIME>
56=ISLD
112=HELLO

diff --git a/_test/definitions/server/fix44/8_OnlyApplicationMessages.def b/_test/definitions/server/fix44/8_OnlyApplicationMessages.def
index 79d314da1..46eb5d3d7 100644
--- a/_test/definitions/server/fix44/8_OnlyApplicationMessages.def
+++ b/_test/definitions/server/fix44/8_OnlyApplicationMessages.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 I8=FIX.4.4
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

 E8=FIX.4.4
9=99
35=D
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
11=ID
21=3
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

diff --git a/_test/definitions/server/fix44/AlreadyLoggedOn.def b/_test/definitions/server/fix44/AlreadyLoggedOn.def
index fd22892e0..8ce927836 100644
--- a/_test/definitions/server/fix44/AlreadyLoggedOn.def
+++ b/_test/definitions/server/fix44/AlreadyLoggedOn.def
@@ -2,7 +2,7 @@
 
 i1,CONNECT
 I1,8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E1,8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E1,8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 i2,CONNECT
 I2,8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

diff --git a/_test/definitions/server/fix44/RejectResentMessage.def b/_test/definitions/server/fix44/RejectResentMessage.def
index 146cc9546..36c11c140 100644
--- a/_test/definitions/server/fix44/RejectResentMessage.def
+++ b/_test/definitions/server/fix44/RejectResentMessage.def
@@ -3,7 +3,7 @@
 iCONNECT
 #Logon
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
141=Y
10=0

 
 # send in a test request one number too high
 I8=FIX.4.4
35=1
34=3
49=TW
52=<TIME>
56=ISLD
112=HELLO1

diff --git a/_test/definitions/server/fix44/ReverseRoute.def b/_test/definitions/server/fix44/ReverseRoute.def
index 38ad92a0a..79c04dddc 100644
--- a/_test/definitions/server/fix44/ReverseRoute.def
+++ b/_test/definitions/server/fix44/ReverseRoute.def
@@ -3,7 +3,7 @@
 iCONNECT
 #Logon
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # Send an order with OnBehalfOfCompID (115) set with bad field value 40=w
 I8=FIX.4.4
35=D
34=2
49=TW
52=<TIME>
56=ISLD
115=JCD
11=ID
21=3
38=100
40=w
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix44/ReverseRouteWithEmptyRoutingTags.def b/_test/definitions/server/fix44/ReverseRouteWithEmptyRoutingTags.def
index 148693783..33ff57b99 100644
--- a/_test/definitions/server/fix44/ReverseRouteWithEmptyRoutingTags.def
+++ b/_test/definitions/server/fix44/ReverseRouteWithEmptyRoutingTags.def
@@ -3,7 +3,7 @@
 iCONNECT
 #Logon
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 
 # Send an order with OnBehalfOfCompID (115) empty 
 I8=FIX.4.4
35=D
34=2
49=TW
52=<TIME>
56=ISLD
115=
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix44/SessionReset.def b/_test/definitions/server/fix44/SessionReset.def
index f6ddf7831..cff82f26e 100644
--- a/_test/definitions/server/fix44/SessionReset.def
+++ b/_test/definitions/server/fix44/SessionReset.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

-E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

 I8=FIX.4.4
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.4
35=0
34=3
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.4
35=0
34=4
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix50/10_MsgSeqNumEqual.def b/_test/definitions/server/fix50/10_MsgSeqNumEqual.def
index f98baef3b..97d861a2b 100644
--- a/_test/definitions/server/fix50/10_MsgSeqNumEqual.def
+++ b/_test/definitions/server/fix50/10_MsgSeqNumEqual.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 # sequence reset with gap fill flag set to Y
 I8=FIXT.1.1
35=4
34=2
49=TW
52=<TIME>
56=ISLD
36=20
123=Y

diff --git a/_test/definitions/server/fix50/10_MsgSeqNumGreater.def b/_test/definitions/server/fix50/10_MsgSeqNumGreater.def
index 35c55f97c..ccd263471 100644
--- a/_test/definitions/server/fix50/10_MsgSeqNumGreater.def
+++ b/_test/definitions/server/fix50/10_MsgSeqNumGreater.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 # sequence reset with gap fill flag set to Y
 I8=FIXT.1.1
35=4
34=10
49=TW
52=<TIME>
56=ISLD
36=20
123=Y

diff --git a/_test/definitions/server/fix50/10_MsgSeqNumLess.def b/_test/definitions/server/fix50/10_MsgSeqNumLess.def
index 40a0a41b8..6bf791c86 100644
--- a/_test/definitions/server/fix50/10_MsgSeqNumLess.def
+++ b/_test/definitions/server/fix50/10_MsgSeqNumLess.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 # sequence reset with gap fill flag set to Y, PosDupFlag set to Y
 I8=FIXT.1.1
35=4
34=1
49=TW
52=<TIME>
56=ISLD
43=Y
122=<TIME-1>
36=20
123=Y

diff --git a/_test/definitions/server/fix50/11a_NewSeqNoGreater.def b/_test/definitions/server/fix50/11a_NewSeqNoGreater.def
index 028f56399..50f7f4dae 100644
--- a/_test/definitions/server/fix50/11a_NewSeqNoGreater.def
+++ b/_test/definitions/server/fix50/11a_NewSeqNoGreater.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 # sequence reset without gap fill flag (default to N)
 I8=FIXT.1.1
35=4
34=0
49=TW
52=<TIME>
56=ISLD
36=25

diff --git a/_test/definitions/server/fix50/11b_NewSeqNoEqual.def b/_test/definitions/server/fix50/11b_NewSeqNoEqual.def
index 50fa5001e..d6d2e2640 100644
--- a/_test/definitions/server/fix50/11b_NewSeqNoEqual.def
+++ b/_test/definitions/server/fix50/11b_NewSeqNoEqual.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 # sequence reset without gap fill flag (default to N)
 I8=FIXT.1.1
35=4
34=0
49=TW
52=<TIME>
56=ISLD
36=2

diff --git a/_test/definitions/server/fix50/11c_NewSeqNoLess.def b/_test/definitions/server/fix50/11c_NewSeqNoLess.def
index 5ef77295a..c70291c49 100644
--- a/_test/definitions/server/fix50/11c_NewSeqNoLess.def
+++ b/_test/definitions/server/fix50/11c_NewSeqNoLess.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 # sequence reset without gap fill flag (default to N)
 I8=FIXT.1.1
35=4
34=0
49=TW
52=<TIME>
56=ISLD
36=1

diff --git a/_test/definitions/server/fix50/13b_UnsolicitedLogoutMessage.def b/_test/definitions/server/fix50/13b_UnsolicitedLogoutMessage.def
index 4841c3d36..a518a9685 100644
--- a/_test/definitions/server/fix50/13b_UnsolicitedLogoutMessage.def
+++ b/_test/definitions/server/fix50/13b_UnsolicitedLogoutMessage.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 I8=FIXT.1.1
35=5
34=2
49=TW
52=<TIME>
56=ISLD

 E8=FIXT.1.1
9=49
35=5
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

diff --git a/_test/definitions/server/fix50/14a_BadField.def b/_test/definitions/server/fix50/14a_BadField.def
index 6b28d1917..c070bed10 100644
--- a/_test/definitions/server/fix50/14a_BadField.def
+++ b/_test/definitions/server/fix50/14a_BadField.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=7

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=7
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=7
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50/14b_RequiredFieldMissing.def b/_test/definitions/server/fix50/14b_RequiredFieldMissing.def
index 71dfac9b2..77c095f39 100644
--- a/_test/definitions/server/fix50/14b_RequiredFieldMissing.def
+++ b/_test/definitions/server/fix50/14b_RequiredFieldMissing.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=7

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=7
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=7
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50/14c_TagNotDefinedForMsgType.def b/_test/definitions/server/fix50/14c_TagNotDefinedForMsgType.def
index cc127d204..d132ca454 100644
--- a/_test/definitions/server/fix50/14c_TagNotDefinedForMsgType.def
+++ b/_test/definitions/server/fix50/14c_TagNotDefinedForMsgType.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=7

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=7
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=7
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50/14d_TagSpecifiedWithoutValue.def b/_test/definitions/server/fix50/14d_TagSpecifiedWithoutValue.def
index f55b1e2f4..2b7b358cc 100644
--- a/_test/definitions/server/fix50/14d_TagSpecifiedWithoutValue.def
+++ b/_test/definitions/server/fix50/14d_TagSpecifiedWithoutValue.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=7

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=7
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=7
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50/14e_IncorrectEnumValue.def b/_test/definitions/server/fix50/14e_IncorrectEnumValue.def
index 7f7516744..85d7aa522 100644
--- a/_test/definitions/server/fix50/14e_IncorrectEnumValue.def
+++ b/_test/definitions/server/fix50/14e_IncorrectEnumValue.def
@@ -4,7 +4,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=7

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=7
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=7
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50/14f_IncorrectDataFormat.def b/_test/definitions/server/fix50/14f_IncorrectDataFormat.def
index 3d3c91195..ff2aa5ccd 100644
--- a/_test/definitions/server/fix50/14f_IncorrectDataFormat.def
+++ b/_test/definitions/server/fix50/14f_IncorrectDataFormat.def
@@ -4,7 +4,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=7

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=7
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=7
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50/14g_HeaderBodyTrailerFieldsOutOfOrder.def b/_test/definitions/server/fix50/14g_HeaderBodyTrailerFieldsOutOfOrder.def
index cc7654ed4..57d484574 100644
--- a/_test/definitions/server/fix50/14g_HeaderBodyTrailerFieldsOutOfOrder.def
+++ b/_test/definitions/server/fix50/14g_HeaderBodyTrailerFieldsOutOfOrder.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=7

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=7
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=7
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50/14h_RepeatedTag.def b/_test/definitions/server/fix50/14h_RepeatedTag.def
index 764a1881c..630ea04c1 100644
--- a/_test/definitions/server/fix50/14h_RepeatedTag.def
+++ b/_test/definitions/server/fix50/14h_RepeatedTag.def
@@ -4,7 +4,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=7

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=7
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=7
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50/14i_RepeatingGroupCountNotEqual.def b/_test/definitions/server/fix50/14i_RepeatingGroupCountNotEqual.def
index 4010d99d6..006f9e927 100644
--- a/_test/definitions/server/fix50/14i_RepeatingGroupCountNotEqual.def
+++ b/_test/definitions/server/fix50/14i_RepeatingGroupCountNotEqual.def
@@ -4,7 +4,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=7

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=7
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=7
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50/15_HeaderAndBodyFieldsOrderedDifferently.def b/_test/definitions/server/fix50/15_HeaderAndBodyFieldsOrderedDifferently.def
index 424db5480..289e431dd 100644
--- a/_test/definitions/server/fix50/15_HeaderAndBodyFieldsOrderedDifferently.def
+++ b/_test/definitions/server/fix50/15_HeaderAndBodyFieldsOrderedDifferently.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=7

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=7
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=7
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50/19a_PossResendMessageThatHAsAlreadyBeenSent.def b/_test/definitions/server/fix50/19a_PossResendMessageThatHAsAlreadyBeenSent.def
index 973decce8..0ce012c53 100644
--- a/_test/definitions/server/fix50/19a_PossResendMessageThatHAsAlreadyBeenSent.def
+++ b/_test/definitions/server/fix50/19a_PossResendMessageThatHAsAlreadyBeenSent.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=7

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=7
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=7
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50/19b_PossResendMessageThatHasNotBeenSent.def b/_test/definitions/server/fix50/19b_PossResendMessageThatHasNotBeenSent.def
index 487116434..6ec2984b0 100644
--- a/_test/definitions/server/fix50/19b_PossResendMessageThatHasNotBeenSent.def
+++ b/_test/definitions/server/fix50/19b_PossResendMessageThatHasNotBeenSent.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=7

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=7
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=7
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50/1a_ValidLogonMsgSeqNumTooHigh.def b/_test/definitions/server/fix50/1a_ValidLogonMsgSeqNumTooHigh.def
index 8a9653ee7..b23c566c4 100644
--- a/_test/definitions/server/fix50/1a_ValidLogonMsgSeqNumTooHigh.def
+++ b/_test/definitions/server/fix50/1a_ValidLogonMsgSeqNumTooHigh.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=5
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 E8=FIXT.1.1
9=58
35=2
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
7=1
16=0
10=0

 
diff --git a/_test/definitions/server/fix50/1a_ValidLogonWithCorrectMsgSeqNum.def b/_test/definitions/server/fix50/1a_ValidLogonWithCorrectMsgSeqNum.def
index 66d348415..db4cdfd88 100644
--- a/_test/definitions/server/fix50/1a_ValidLogonWithCorrectMsgSeqNum.def
+++ b/_test/definitions/server/fix50/1a_ValidLogonWithCorrectMsgSeqNum.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 # logout message and response
 I8=FIXT.1.1
35=5
34=2
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix50/1b_DuplicateIdentity.def b/_test/definitions/server/fix50/1b_DuplicateIdentity.def
index 2322c6d1a..84f2b6885 100644
--- a/_test/definitions/server/fix50/1b_DuplicateIdentity.def
+++ b/_test/definitions/server/fix50/1b_DuplicateIdentity.def
@@ -4,7 +4,7 @@
 # First logon, succesful
 i1,CONNECT
 I1,8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E1,8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E1,8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 # Second logon, unsuccesful
 i2,CONNECT
diff --git a/_test/definitions/server/fix50/20_SimultaneousResendRequest.def b/_test/definitions/server/fix50/20_SimultaneousResendRequest.def
index f8349e097..31309fe50 100644
--- a/_test/definitions/server/fix50/20_SimultaneousResendRequest.def
+++ b/_test/definitions/server/fix50/20_SimultaneousResendRequest.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

 E8=FIXT.1.1
9=99
35=D
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
11=ID
21=3
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

diff --git a/_test/definitions/server/fix50/21_RepeatingGroupSpecifierWithValueOfZero.def b/_test/definitions/server/fix50/21_RepeatingGroupSpecifierWithValueOfZero.def
index fe65a8edf..58f364bb8 100644
--- a/_test/definitions/server/fix50/21_RepeatingGroupSpecifierWithValueOfZero.def
+++ b/_test/definitions/server/fix50/21_RepeatingGroupSpecifierWithValueOfZero.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=7

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=7
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=7
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50/2a_MsgSeqNumCorrect.def b/_test/definitions/server/fix50/2a_MsgSeqNumCorrect.def
index c59ad3798..5defd493f 100644
--- a/_test/definitions/server/fix50/2a_MsgSeqNumCorrect.def
+++ b/_test/definitions/server/fix50/2a_MsgSeqNumCorrect.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIXT.1.1
35=0
34=3
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix50/2b_MsgSeqNumTooHigh.def b/_test/definitions/server/fix50/2b_MsgSeqNumTooHigh.def
index 1ddbe09d1..462ccf2d6 100644
--- a/_test/definitions/server/fix50/2b_MsgSeqNumTooHigh.def
+++ b/_test/definitions/server/fix50/2b_MsgSeqNumTooHigh.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIXT.1.1
35=0
34=3
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix50/2c_MsgSeqNumTooLow.def b/_test/definitions/server/fix50/2c_MsgSeqNumTooLow.def
index b28fbd834..ad6e25b09 100644
--- a/_test/definitions/server/fix50/2c_MsgSeqNumTooLow.def
+++ b/_test/definitions/server/fix50/2c_MsgSeqNumTooLow.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIXT.1.1
35=0
34=3
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix50/2d_GarbledMessage.def b/_test/definitions/server/fix50/2d_GarbledMessage.def
index 213eb27ab..0e86d7bed 100644
--- a/_test/definitions/server/fix50/2d_GarbledMessage.def
+++ b/_test/definitions/server/fix50/2d_GarbledMessage.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7

+E8=FIXT.1.1
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7

 
 # Garbled message
 I8=FIXT.1.1
9=52
35=0
34=2
4garbled9=TW
52=<TIME>
56=ISLD
10=0

diff --git a/_test/definitions/server/fix50/2e_PossDupAlreadyReceived.def b/_test/definitions/server/fix50/2e_PossDupAlreadyReceived.def
index 6134e7593..bcd1cffd7 100644
--- a/_test/definitions/server/fix50/2e_PossDupAlreadyReceived.def
+++ b/_test/definitions/server/fix50/2e_PossDupAlreadyReceived.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=7

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=7

 
 I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME>
122=<TIME>
56=ISLD
43=Y
112=<TIME>

diff --git a/_test/definitions/server/fix50/2e_PossDupNotReceived.def b/_test/definitions/server/fix50/2e_PossDupNotReceived.def
index da6e71efa..cb1c10660 100644
--- a/_test/definitions/server/fix50/2e_PossDupNotReceived.def
+++ b/_test/definitions/server/fix50/2e_PossDupNotReceived.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 
diff --git a/_test/definitions/server/fix50/2f_PossDupOrigSendingTimeTooHigh.def b/_test/definitions/server/fix50/2f_PossDupOrigSendingTimeTooHigh.def
index 6ee6b43fc..f8f4bb7d4 100644
--- a/_test/definitions/server/fix50/2f_PossDupOrigSendingTimeTooHigh.def
+++ b/_test/definitions/server/fix50/2f_PossDupOrigSendingTimeTooHigh.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 # send two orders in sequence
 I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix50/2g_PossDupNoOrigSendingTime.def b/_test/definitions/server/fix50/2g_PossDupNoOrigSendingTime.def
index d94baada3..092a8e422 100644
--- a/_test/definitions/server/fix50/2g_PossDupNoOrigSendingTime.def
+++ b/_test/definitions/server/fix50/2g_PossDupNoOrigSendingTime.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 # send two orders in sequence
 I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix50/2i_BeginStringValueUnexpected.def b/_test/definitions/server/fix50/2i_BeginStringValueUnexpected.def
index 87fd52a3d..ee42cb884 100644
--- a/_test/definitions/server/fix50/2i_BeginStringValueUnexpected.def
+++ b/_test/definitions/server/fix50/2i_BeginStringValueUnexpected.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 # Send with incorrect begin string and respond to logout
 I8=FIX.4.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=id

@@ -12,7 +12,7 @@ eDISCONNECT
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 # Send with incorrect begin string and don't respond to logout
 I8=FIX.4.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=id

diff --git a/_test/definitions/server/fix50/2k_CompIDDoesNotMatchProfile.def b/_test/definitions/server/fix50/2k_CompIDDoesNotMatchProfile.def
index d6c70dc10..4b3bf5736 100644
--- a/_test/definitions/server/fix50/2k_CompIDDoesNotMatchProfile.def
+++ b/_test/definitions/server/fix50/2k_CompIDDoesNotMatchProfile.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 # send order with bad SenderCompID
 I8=FIXT.1.1
35=D
34=2
49=WT
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

@@ -18,7 +18,7 @@ eDISCONNECT
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 # send order with bad TargetCompID
 I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=DLSI
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

@@ -34,7 +34,7 @@ eDISCONNECT
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 # send order with bad SenderCompID and TargetCompID
 I8=FIXT.1.1
35=D
34=2
49=WT
52=<TIME>
56=DLSI
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix50/2m_BodyLengthValueNotCorrect.def b/_test/definitions/server/fix50/2m_BodyLengthValueNotCorrect.def
index 46dbd0433..9291473b7 100644
--- a/_test/definitions/server/fix50/2m_BodyLengthValueNotCorrect.def
+++ b/_test/definitions/server/fix50/2m_BodyLengthValueNotCorrect.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 # Send a message with a length that is too short
 I8=FIXT.1.1
9=30
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix50/2o_SendingTimeValueOutOfRange.def b/_test/definitions/server/fix50/2o_SendingTimeValueOutOfRange.def
index 9d996a7f8..c2d481859 100644
--- a/_test/definitions/server/fix50/2o_SendingTimeValueOutOfRange.def
+++ b/_test/definitions/server/fix50/2o_SendingTimeValueOutOfRange.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 # send heartbeat more than 2 minutes early
 I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME-121>
56=ISLD

@@ -17,7 +17,7 @@ eDISCONNECT
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 # send heartbeat more than 2 minutes late
 I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME+121>
56=ISLD

diff --git a/_test/definitions/server/fix50/2q_MsgTypeNotValid.def b/_test/definitions/server/fix50/2q_MsgTypeNotValid.def
index 918bf97e5..5748c88a9 100644
--- a/_test/definitions/server/fix50/2q_MsgTypeNotValid.def
+++ b/_test/definitions/server/fix50/2q_MsgTypeNotValid.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 I8=FIXT.1.1
35=*
34=2
49=TW
52=<TIME>
56=ISLD

 # reject
diff --git a/_test/definitions/server/fix50/2r_UnregisteredMsgType.def b/_test/definitions/server/fix50/2r_UnregisteredMsgType.def
index 3b6efece4..3d5439d04 100644
--- a/_test/definitions/server/fix50/2r_UnregisteredMsgType.def
+++ b/_test/definitions/server/fix50/2r_UnregisteredMsgType.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 I8=FIXT.1.1
35=8
34=2
49=TW
52=<TIME>
56=ISLD
37=id
17=id
150=0
39=0
55=WLRI
54=1
151=100
14=0
6=0.0

 E8=FIXT.1.1
9=94
35=j
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
45=2
58=Unsupported Message Type
372=8
380=3
10=0

diff --git a/_test/definitions/server/fix50/2t_FirstThreeFieldsOutOfOrder.def b/_test/definitions/server/fix50/2t_FirstThreeFieldsOutOfOrder.def
index f64875bae..c1cd4e981 100644
--- a/_test/definitions/server/fix50/2t_FirstThreeFieldsOutOfOrder.def
+++ b/_test/definitions/server/fix50/2t_FirstThreeFieldsOutOfOrder.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 # 35 is first, should be second
 I35=0
8=FIXT.1.1
9=29
34=2
49=TW
52=<TIME>
56=ISLD
10=121

diff --git a/_test/definitions/server/fix50/3b_InvalidChecksum.def b/_test/definitions/server/fix50/3b_InvalidChecksum.def
index 3ea3c7712..8a2f698a3 100644
--- a/_test/definitions/server/fix50/3b_InvalidChecksum.def
+++ b/_test/definitions/server/fix50/3b_InvalidChecksum.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=7

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=7

 
 # Incorrect checksum
 I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME>
56=ISLD
10=256

diff --git a/_test/definitions/server/fix50/3c_GarbledMessage.def b/_test/definitions/server/fix50/3c_GarbledMessage.def
index 786c73288..38ee85b0d 100644
--- a/_test/definitions/server/fix50/3c_GarbledMessage.def
+++ b/_test/definitions/server/fix50/3c_GarbledMessage.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7

+E8=FIXT.1.1
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7

 
 # Garbled message
 I8=FIXT.1.1
9=52
35=0
34=2
4garbled9=TW
52=<TIME>
56=ISLD
10=0

diff --git a/_test/definitions/server/fix50/4a_NoDataSentDuringHeartBtInt.def b/_test/definitions/server/fix50/4a_NoDataSentDuringHeartBtInt.def
index a4c6114c7..3f042beab 100644
--- a/_test/definitions/server/fix50/4a_NoDataSentDuringHeartBtInt.def
+++ b/_test/definitions/server/fix50/4a_NoDataSentDuringHeartBtInt.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=6
1137=7

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=6
1137=7
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=6
141=Y
1137=7
10=0

 
 # Wait for quickfix to send a heartbeat to us
 E8=FIXT.1.1
9=49
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

diff --git a/_test/definitions/server/fix50/4b_ReceivedTestRequest.def b/_test/definitions/server/fix50/4b_ReceivedTestRequest.def
index 878eebd8c..38359d90a 100644
--- a/_test/definitions/server/fix50/4b_ReceivedTestRequest.def
+++ b/_test/definitions/server/fix50/4b_ReceivedTestRequest.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 I8=FIXT.1.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=HELLO

 E8=FIXT.1.1
9=59
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
112=HELLO
10=0

diff --git a/_test/definitions/server/fix50/6_SendTestRequest.def b/_test/definitions/server/fix50/6_SendTestRequest.def
index eba449f63..0caad2920 100644
--- a/_test/definitions/server/fix50/6_SendTestRequest.def
+++ b/_test/definitions/server/fix50/6_SendTestRequest.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=6
1137=7

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=6
1137=7
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=6
141=Y
1137=7
10=0

 
 # wait for two heartbeats
 E8=FIXT.1.1
9=49
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

diff --git a/_test/definitions/server/fix50/7_ReceiveRejectMessage.def b/_test/definitions/server/fix50/7_ReceiveRejectMessage.def
index 85750b7c2..c2e60ff7b 100644
--- a/_test/definitions/server/fix50/7_ReceiveRejectMessage.def
+++ b/_test/definitions/server/fix50/7_ReceiveRejectMessage.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 # reject
 I8=FIXT.1.1
35=3
34=2
49=TW
52=<TIME>
56=ISLD
45=1

diff --git a/_test/definitions/server/fix50/8_AdminAndApplicationMessages.def b/_test/definitions/server/fix50/8_AdminAndApplicationMessages.def
index 70d99425a..ca7e99943 100644
--- a/_test/definitions/server/fix50/8_AdminAndApplicationMessages.def
+++ b/_test/definitions/server/fix50/8_AdminAndApplicationMessages.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 # Admin messages 2-4
 I8=FIXT.1.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=HELLO

diff --git a/_test/definitions/server/fix50/8_OnlyAdminMessages.def b/_test/definitions/server/fix50/8_OnlyAdminMessages.def
index 4db86bddd..a37ee4d17 100644
--- a/_test/definitions/server/fix50/8_OnlyAdminMessages.def
+++ b/_test/definitions/server/fix50/8_OnlyAdminMessages.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 I8=FIXT.1.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=HELLO

 E8=FIXT.1.1
9=59
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
112=HELLO
10=0

diff --git a/_test/definitions/server/fix50/8_OnlyApplicationMessages.def b/_test/definitions/server/fix50/8_OnlyApplicationMessages.def
index 7691d9ecb..0223d13fa 100644
--- a/_test/definitions/server/fix50/8_OnlyApplicationMessages.def
+++ b/_test/definitions/server/fix50/8_OnlyApplicationMessages.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

 E8=FIXT.1.1
9=99
35=D
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
11=ID
21=3
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

diff --git a/_test/definitions/server/fix50/AlreadyLoggedOn.def b/_test/definitions/server/fix50/AlreadyLoggedOn.def
index 92c0869af..29282f1d4 100644
--- a/_test/definitions/server/fix50/AlreadyLoggedOn.def
+++ b/_test/definitions/server/fix50/AlreadyLoggedOn.def
@@ -2,7 +2,7 @@
 
 i1,CONNECT
 I1,8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E1,8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E1,8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 i2,CONNECT
 I2,8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

diff --git a/_test/definitions/server/fix50/RejectResentMessage.def b/_test/definitions/server/fix50/RejectResentMessage.def
index b361e965c..cdbd32f65 100644
--- a/_test/definitions/server/fix50/RejectResentMessage.def
+++ b/_test/definitions/server/fix50/RejectResentMessage.def
@@ -3,7 +3,7 @@
 iCONNECT
 #Logon
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 # send in a test request one number too high
 I8=FIXT.1.1
35=1
34=3
49=TW
52=<TIME>
56=ISLD
112=HELLO1

diff --git a/_test/definitions/server/fix50/ReverseRoute.def b/_test/definitions/server/fix50/ReverseRoute.def
index 8f0a96d5b..a6ba42dfc 100644
--- a/_test/definitions/server/fix50/ReverseRoute.def
+++ b/_test/definitions/server/fix50/ReverseRoute.def
@@ -3,7 +3,7 @@
 iCONNECT
 #Logon
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 # Send an order with OnBehalfOfCompID (115) set with bad field value 40=w
 I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
115=JCD
11=ID
21=3
38=100
40=w
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix50/ReverseRouteWithEmptyRoutingTags.def b/_test/definitions/server/fix50/ReverseRouteWithEmptyRoutingTags.def
index 2ff3db88d..5cf996e66 100644
--- a/_test/definitions/server/fix50/ReverseRouteWithEmptyRoutingTags.def
+++ b/_test/definitions/server/fix50/ReverseRouteWithEmptyRoutingTags.def
@@ -3,7 +3,7 @@
 iCONNECT
 #Logon
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 # Send an order with OnBehalfOfCompID (115) empty 
 I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
115=
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix50/SessionReset.def b/_test/definitions/server/fix50/SessionReset.def
index 383ee0e2b..8a0af3551 100644
--- a/_test/definitions/server/fix50/SessionReset.def
+++ b/_test/definitions/server/fix50/SessionReset.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

 
 I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIXT.1.1
35=0
34=3
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix50sp1/10_MsgSeqNumEqual.def b/_test/definitions/server/fix50sp1/10_MsgSeqNumEqual.def
index 47b78ccdd..8c2bd93ac 100644
--- a/_test/definitions/server/fix50sp1/10_MsgSeqNumEqual.def
+++ b/_test/definitions/server/fix50sp1/10_MsgSeqNumEqual.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 # sequence reset with gap fill flag set to Y
 I8=FIXT.1.1
35=4
34=2
49=TW
52=<TIME>
56=ISLD
36=20
123=Y

diff --git a/_test/definitions/server/fix50sp1/10_MsgSeqNumGreater.def b/_test/definitions/server/fix50sp1/10_MsgSeqNumGreater.def
index 720df5428..ae959162d 100644
--- a/_test/definitions/server/fix50sp1/10_MsgSeqNumGreater.def
+++ b/_test/definitions/server/fix50sp1/10_MsgSeqNumGreater.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 # sequence reset with gap fill flag set to Y
 I8=FIXT.1.1
35=4
34=10
49=TW
52=<TIME>
56=ISLD
36=20
123=Y

diff --git a/_test/definitions/server/fix50sp1/10_MsgSeqNumLess.def b/_test/definitions/server/fix50sp1/10_MsgSeqNumLess.def
index 681756f52..d9afd544f 100644
--- a/_test/definitions/server/fix50sp1/10_MsgSeqNumLess.def
+++ b/_test/definitions/server/fix50sp1/10_MsgSeqNumLess.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 # sequence reset with gap fill flag set to Y, PosDupFlag set to Y
 I8=FIXT.1.1
35=4
34=1
49=TW
52=<TIME>
56=ISLD
43=Y
122=<TIME-1>
36=20
123=Y

diff --git a/_test/definitions/server/fix50sp1/11a_NewSeqNoGreater.def b/_test/definitions/server/fix50sp1/11a_NewSeqNoGreater.def
index 293d8f2f3..0709ee101 100644
--- a/_test/definitions/server/fix50sp1/11a_NewSeqNoGreater.def
+++ b/_test/definitions/server/fix50sp1/11a_NewSeqNoGreater.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 # sequence reset without gap fill flag (default to N)
 I8=FIXT.1.1
35=4
34=0
49=TW
52=<TIME>
56=ISLD
36=25

diff --git a/_test/definitions/server/fix50sp1/11b_NewSeqNoEqual.def b/_test/definitions/server/fix50sp1/11b_NewSeqNoEqual.def
index 170f21c2b..94f549c8a 100644
--- a/_test/definitions/server/fix50sp1/11b_NewSeqNoEqual.def
+++ b/_test/definitions/server/fix50sp1/11b_NewSeqNoEqual.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 # sequence reset without gap fill flag (default to N)
 I8=FIXT.1.1
35=4
34=0
49=TW
52=<TIME>
56=ISLD
36=2

diff --git a/_test/definitions/server/fix50sp1/11c_NewSeqNoLess.def b/_test/definitions/server/fix50sp1/11c_NewSeqNoLess.def
index b2529ec80..027f2cc06 100644
--- a/_test/definitions/server/fix50sp1/11c_NewSeqNoLess.def
+++ b/_test/definitions/server/fix50sp1/11c_NewSeqNoLess.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 # sequence reset without gap fill flag (default to N)
 I8=FIXT.1.1
35=4
34=0
49=TW
52=<TIME>
56=ISLD
36=1

diff --git a/_test/definitions/server/fix50sp1/13b_UnsolicitedLogoutMessage.def b/_test/definitions/server/fix50sp1/13b_UnsolicitedLogoutMessage.def
index c81b0a356..148b28dbb 100644
--- a/_test/definitions/server/fix50sp1/13b_UnsolicitedLogoutMessage.def
+++ b/_test/definitions/server/fix50sp1/13b_UnsolicitedLogoutMessage.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 I8=FIXT.1.1
35=5
34=2
49=TW
52=<TIME>
56=ISLD

 E8=FIXT.1.1
9=49
35=5
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

diff --git a/_test/definitions/server/fix50sp1/14a_BadField.def b/_test/definitions/server/fix50sp1/14a_BadField.def
index 17a205642..971ae5893 100644
--- a/_test/definitions/server/fix50sp1/14a_BadField.def
+++ b/_test/definitions/server/fix50sp1/14a_BadField.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=8

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=8
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=8
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50sp1/14b_RequiredFieldMissing.def b/_test/definitions/server/fix50sp1/14b_RequiredFieldMissing.def
index 73205db16..a29422695 100644
--- a/_test/definitions/server/fix50sp1/14b_RequiredFieldMissing.def
+++ b/_test/definitions/server/fix50sp1/14b_RequiredFieldMissing.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=8

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=8
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=8
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50sp1/14c_TagNotDefinedForMsgType.def b/_test/definitions/server/fix50sp1/14c_TagNotDefinedForMsgType.def
index 20648a728..8b45bd51c 100644
--- a/_test/definitions/server/fix50sp1/14c_TagNotDefinedForMsgType.def
+++ b/_test/definitions/server/fix50sp1/14c_TagNotDefinedForMsgType.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=8

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=8
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=8
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50sp1/14d_TagSpecifiedWithoutValue.def b/_test/definitions/server/fix50sp1/14d_TagSpecifiedWithoutValue.def
index 910bb0752..0a8a32f74 100644
--- a/_test/definitions/server/fix50sp1/14d_TagSpecifiedWithoutValue.def
+++ b/_test/definitions/server/fix50sp1/14d_TagSpecifiedWithoutValue.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=8

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=8
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=8
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50sp1/14e_IncorrectEnumValue.def b/_test/definitions/server/fix50sp1/14e_IncorrectEnumValue.def
index e7fcc5d54..df19a0ade 100644
--- a/_test/definitions/server/fix50sp1/14e_IncorrectEnumValue.def
+++ b/_test/definitions/server/fix50sp1/14e_IncorrectEnumValue.def
@@ -4,7 +4,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=8

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=8
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=8
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50sp1/14f_IncorrectDataFormat.def b/_test/definitions/server/fix50sp1/14f_IncorrectDataFormat.def
index b93e73a47..17ea2f12f 100644
--- a/_test/definitions/server/fix50sp1/14f_IncorrectDataFormat.def
+++ b/_test/definitions/server/fix50sp1/14f_IncorrectDataFormat.def
@@ -4,7 +4,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=8

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=8
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=8
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50sp1/14g_HeaderBodyTrailerFieldsOutOfOrder.def b/_test/definitions/server/fix50sp1/14g_HeaderBodyTrailerFieldsOutOfOrder.def
index eaa8c9cb3..ddd802980 100644
--- a/_test/definitions/server/fix50sp1/14g_HeaderBodyTrailerFieldsOutOfOrder.def
+++ b/_test/definitions/server/fix50sp1/14g_HeaderBodyTrailerFieldsOutOfOrder.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=8

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=8
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=8
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50sp1/14h_RepeatedTag.def b/_test/definitions/server/fix50sp1/14h_RepeatedTag.def
index cfee4c564..96e23bec9 100644
--- a/_test/definitions/server/fix50sp1/14h_RepeatedTag.def
+++ b/_test/definitions/server/fix50sp1/14h_RepeatedTag.def
@@ -4,7 +4,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=8

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=8
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=8
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50sp1/14i_RepeatingGroupCountNotEqual.def b/_test/definitions/server/fix50sp1/14i_RepeatingGroupCountNotEqual.def
index 5fce36436..269749fc7 100644
--- a/_test/definitions/server/fix50sp1/14i_RepeatingGroupCountNotEqual.def
+++ b/_test/definitions/server/fix50sp1/14i_RepeatingGroupCountNotEqual.def
@@ -4,7 +4,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=8

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=8
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=8
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50sp1/15_HeaderAndBodyFieldsOrderedDifferently.def b/_test/definitions/server/fix50sp1/15_HeaderAndBodyFieldsOrderedDifferently.def
index a9df67033..3b19ab6af 100644
--- a/_test/definitions/server/fix50sp1/15_HeaderAndBodyFieldsOrderedDifferently.def
+++ b/_test/definitions/server/fix50sp1/15_HeaderAndBodyFieldsOrderedDifferently.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=8

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=8
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=8
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50sp1/19a_PossResendMessageThatHAsAlreadyBeenSent.def b/_test/definitions/server/fix50sp1/19a_PossResendMessageThatHAsAlreadyBeenSent.def
index 92ea1b174..d49c70774 100644
--- a/_test/definitions/server/fix50sp1/19a_PossResendMessageThatHAsAlreadyBeenSent.def
+++ b/_test/definitions/server/fix50sp1/19a_PossResendMessageThatHAsAlreadyBeenSent.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=8

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=8
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=8
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50sp1/19b_PossResendMessageThatHasNotBeenSent.def b/_test/definitions/server/fix50sp1/19b_PossResendMessageThatHasNotBeenSent.def
index 6b22c4ef0..e676d17bc 100644
--- a/_test/definitions/server/fix50sp1/19b_PossResendMessageThatHasNotBeenSent.def
+++ b/_test/definitions/server/fix50sp1/19b_PossResendMessageThatHasNotBeenSent.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=8

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=8
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=8
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50sp1/1a_ValidLogonMsgSeqNumTooHigh.def b/_test/definitions/server/fix50sp1/1a_ValidLogonMsgSeqNumTooHigh.def
index 52c23ee59..da92f228c 100644
--- a/_test/definitions/server/fix50sp1/1a_ValidLogonMsgSeqNumTooHigh.def
+++ b/_test/definitions/server/fix50sp1/1a_ValidLogonMsgSeqNumTooHigh.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=5
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 E8=FIXT.1.1
9=58
35=2
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
7=1
16=0
10=0

 
diff --git a/_test/definitions/server/fix50sp1/1a_ValidLogonWithCorrectMsgSeqNum.def b/_test/definitions/server/fix50sp1/1a_ValidLogonWithCorrectMsgSeqNum.def
index 66e15407e..99e133efc 100644
--- a/_test/definitions/server/fix50sp1/1a_ValidLogonWithCorrectMsgSeqNum.def
+++ b/_test/definitions/server/fix50sp1/1a_ValidLogonWithCorrectMsgSeqNum.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 # logout message and response
 I8=FIXT.1.1
35=5
34=2
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix50sp1/1b_DuplicateIdentity.def b/_test/definitions/server/fix50sp1/1b_DuplicateIdentity.def
index eb978271d..e102a986e 100644
--- a/_test/definitions/server/fix50sp1/1b_DuplicateIdentity.def
+++ b/_test/definitions/server/fix50sp1/1b_DuplicateIdentity.def
@@ -4,7 +4,7 @@
 # First logon, succesful
 i1,CONNECT
 I1,8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E1,8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E1,8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 # Second logon, unsuccesful
 i2,CONNECT
diff --git a/_test/definitions/server/fix50sp1/20_SimultaneousResendRequest.def b/_test/definitions/server/fix50sp1/20_SimultaneousResendRequest.def
index f102ea96e..32d86e372 100644
--- a/_test/definitions/server/fix50sp1/20_SimultaneousResendRequest.def
+++ b/_test/definitions/server/fix50sp1/20_SimultaneousResendRequest.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

 E8=FIXT.1.1
9=99
35=D
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
11=ID
21=3
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

diff --git a/_test/definitions/server/fix50sp1/21_RepeatingGroupSpecifierWithValueOfZero.def b/_test/definitions/server/fix50sp1/21_RepeatingGroupSpecifierWithValueOfZero.def
index 3ec706bda..6bd672898 100644
--- a/_test/definitions/server/fix50sp1/21_RepeatingGroupSpecifierWithValueOfZero.def
+++ b/_test/definitions/server/fix50sp1/21_RepeatingGroupSpecifierWithValueOfZero.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=8

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=8
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=8
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50sp1/2a_MsgSeqNumCorrect.def b/_test/definitions/server/fix50sp1/2a_MsgSeqNumCorrect.def
index 78b2ca7d8..4f1fbd321 100644
--- a/_test/definitions/server/fix50sp1/2a_MsgSeqNumCorrect.def
+++ b/_test/definitions/server/fix50sp1/2a_MsgSeqNumCorrect.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIXT.1.1
35=0
34=3
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix50sp1/2b_MsgSeqNumTooHigh.def b/_test/definitions/server/fix50sp1/2b_MsgSeqNumTooHigh.def
index 8b3a69b33..94f636edc 100644
--- a/_test/definitions/server/fix50sp1/2b_MsgSeqNumTooHigh.def
+++ b/_test/definitions/server/fix50sp1/2b_MsgSeqNumTooHigh.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIXT.1.1
35=0
34=3
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix50sp1/2c_MsgSeqNumTooLow.def b/_test/definitions/server/fix50sp1/2c_MsgSeqNumTooLow.def
index 6dbf3d0f4..3b177e1dd 100644
--- a/_test/definitions/server/fix50sp1/2c_MsgSeqNumTooLow.def
+++ b/_test/definitions/server/fix50sp1/2c_MsgSeqNumTooLow.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIXT.1.1
35=0
34=3
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix50sp1/2d_GarbledMessage.def b/_test/definitions/server/fix50sp1/2d_GarbledMessage.def
index 1c03a74a7..eceb01260 100644
--- a/_test/definitions/server/fix50sp1/2d_GarbledMessage.def
+++ b/_test/definitions/server/fix50sp1/2d_GarbledMessage.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8

+E8=FIXT.1.1
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8

 
 # Garbled message
 I8=FIXT.1.1
9=52
35=0
34=2
4garbled9=TW
52=<TIME>
56=ISLD
10=0

diff --git a/_test/definitions/server/fix50sp1/2e_PossDupAlreadyReceived.def b/_test/definitions/server/fix50sp1/2e_PossDupAlreadyReceived.def
index 03681b707..43a4f171d 100644
--- a/_test/definitions/server/fix50sp1/2e_PossDupAlreadyReceived.def
+++ b/_test/definitions/server/fix50sp1/2e_PossDupAlreadyReceived.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=7

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=7

 
 I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME>
122=<TIME>
56=ISLD
43=Y
112=<TIME>

diff --git a/_test/definitions/server/fix50sp1/2e_PossDupNotReceived.def b/_test/definitions/server/fix50sp1/2e_PossDupNotReceived.def
index e62bc4684..57f8ae252 100644
--- a/_test/definitions/server/fix50sp1/2e_PossDupNotReceived.def
+++ b/_test/definitions/server/fix50sp1/2e_PossDupNotReceived.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 
diff --git a/_test/definitions/server/fix50sp1/2f_PossDupOrigSendingTimeTooHigh.def b/_test/definitions/server/fix50sp1/2f_PossDupOrigSendingTimeTooHigh.def
index 2ee183741..a9ca55c9e 100644
--- a/_test/definitions/server/fix50sp1/2f_PossDupOrigSendingTimeTooHigh.def
+++ b/_test/definitions/server/fix50sp1/2f_PossDupOrigSendingTimeTooHigh.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 # send two orders in sequence
 I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix50sp1/2g_PossDupNoOrigSendingTime.def b/_test/definitions/server/fix50sp1/2g_PossDupNoOrigSendingTime.def
index cb405b127..f3fdd2722 100644
--- a/_test/definitions/server/fix50sp1/2g_PossDupNoOrigSendingTime.def
+++ b/_test/definitions/server/fix50sp1/2g_PossDupNoOrigSendingTime.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 # send two orders in sequence
 I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix50sp1/2i_BeginStringValueUnexpected.def b/_test/definitions/server/fix50sp1/2i_BeginStringValueUnexpected.def
index 562fd244c..61c767024 100644
--- a/_test/definitions/server/fix50sp1/2i_BeginStringValueUnexpected.def
+++ b/_test/definitions/server/fix50sp1/2i_BeginStringValueUnexpected.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 # Send with incorrect begin string and respond to logout
 I8=FIX.4.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=id

@@ -12,7 +12,7 @@ eDISCONNECT
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 # Send with incorrect begin string and don't respond to logout
 I8=FIX.4.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=id

diff --git a/_test/definitions/server/fix50sp1/2k_CompIDDoesNotMatchProfile.def b/_test/definitions/server/fix50sp1/2k_CompIDDoesNotMatchProfile.def
index a07d8f9bd..2484fca87 100644
--- a/_test/definitions/server/fix50sp1/2k_CompIDDoesNotMatchProfile.def
+++ b/_test/definitions/server/fix50sp1/2k_CompIDDoesNotMatchProfile.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 # send order with bad SenderCompID
 I8=FIXT.1.1
35=D
34=2
49=WT
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

@@ -18,7 +18,7 @@ eDISCONNECT
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 # send order with bad TargetCompID
 I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=DLSI
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

@@ -34,7 +34,7 @@ eDISCONNECT
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 # send order with bad SenderCompID and TargetCompID
 I8=FIXT.1.1
35=D
34=2
49=WT
52=<TIME>
56=DLSI
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix50sp1/2m_BodyLengthValueNotCorrect.def b/_test/definitions/server/fix50sp1/2m_BodyLengthValueNotCorrect.def
index 89ed8589b..6cb3abe20 100644
--- a/_test/definitions/server/fix50sp1/2m_BodyLengthValueNotCorrect.def
+++ b/_test/definitions/server/fix50sp1/2m_BodyLengthValueNotCorrect.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 # Send a message with a length that is too short
 I8=FIXT.1.1
9=30
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix50sp1/2o_SendingTimeValueOutOfRange.def b/_test/definitions/server/fix50sp1/2o_SendingTimeValueOutOfRange.def
index 2aca70ea7..5938e4c2a 100644
--- a/_test/definitions/server/fix50sp1/2o_SendingTimeValueOutOfRange.def
+++ b/_test/definitions/server/fix50sp1/2o_SendingTimeValueOutOfRange.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 # send heartbeat more than 2 minutes early
 I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME-121>
56=ISLD

@@ -17,7 +17,7 @@ eDISCONNECT
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 # send heartbeat more than 2 minutes late
 I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME+121>
56=ISLD

diff --git a/_test/definitions/server/fix50sp1/2q_MsgTypeNotValid.def b/_test/definitions/server/fix50sp1/2q_MsgTypeNotValid.def
index 7fb36c0f7..1a358a695 100644
--- a/_test/definitions/server/fix50sp1/2q_MsgTypeNotValid.def
+++ b/_test/definitions/server/fix50sp1/2q_MsgTypeNotValid.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 I8=FIXT.1.1
35=*
34=2
49=TW
52=<TIME>
56=ISLD

 # reject
diff --git a/_test/definitions/server/fix50sp1/2r_UnregisteredMsgType.def b/_test/definitions/server/fix50sp1/2r_UnregisteredMsgType.def
index fffe53bfa..bc28bc2cf 100644
--- a/_test/definitions/server/fix50sp1/2r_UnregisteredMsgType.def
+++ b/_test/definitions/server/fix50sp1/2r_UnregisteredMsgType.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 I8=FIXT.1.1
35=8
34=2
49=TW
52=<TIME>
56=ISLD
37=id
17=id
150=0
39=0
55=WLRI
54=1
151=100
14=0
6=0.0

 E8=FIXT.1.1
9=94
35=j
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
45=2
58=Unsupported Message Type
372=8
380=3
10=0

diff --git a/_test/definitions/server/fix50sp1/2t_FirstThreeFieldsOutOfOrder.def b/_test/definitions/server/fix50sp1/2t_FirstThreeFieldsOutOfOrder.def
index f05d1e16d..4a740ac15 100644
--- a/_test/definitions/server/fix50sp1/2t_FirstThreeFieldsOutOfOrder.def
+++ b/_test/definitions/server/fix50sp1/2t_FirstThreeFieldsOutOfOrder.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 # 35 is first, should be second
 I35=0
8=FIXT.1.1
9=29
34=2
49=TW
52=<TIME>
56=ISLD
10=121

diff --git a/_test/definitions/server/fix50sp1/3b_InvalidChecksum.def b/_test/definitions/server/fix50sp1/3b_InvalidChecksum.def
index 8af6de810..09cb87af2 100644
--- a/_test/definitions/server/fix50sp1/3b_InvalidChecksum.def
+++ b/_test/definitions/server/fix50sp1/3b_InvalidChecksum.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=7

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=7

 
 # Incorrect checksum
 I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME>
56=ISLD
10=256

diff --git a/_test/definitions/server/fix50sp1/3c_GarbledMessage.def b/_test/definitions/server/fix50sp1/3c_GarbledMessage.def
index 04e8a0074..e0c8deb47 100644
--- a/_test/definitions/server/fix50sp1/3c_GarbledMessage.def
+++ b/_test/definitions/server/fix50sp1/3c_GarbledMessage.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8

+E8=FIXT.1.1
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8

 
 # Garbled message
 I8=FIXT.1.1
9=52
35=0
34=2
4garbled9=TW
52=<TIME>
56=ISLD
10=0

diff --git a/_test/definitions/server/fix50sp1/4a_NoDataSentDuringHeartBtInt.def b/_test/definitions/server/fix50sp1/4a_NoDataSentDuringHeartBtInt.def
index 583175a7d..b14b7595e 100644
--- a/_test/definitions/server/fix50sp1/4a_NoDataSentDuringHeartBtInt.def
+++ b/_test/definitions/server/fix50sp1/4a_NoDataSentDuringHeartBtInt.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=6
1137=8

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=6
1137=8
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=6
141=Y
1137=8
10=0

 
 # Wait for quickfix to send a heartbeat to us
 E8=FIXT.1.1
9=49
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

diff --git a/_test/definitions/server/fix50sp1/4b_ReceivedTestRequest.def b/_test/definitions/server/fix50sp1/4b_ReceivedTestRequest.def
index a2736f53a..f2529603f 100644
--- a/_test/definitions/server/fix50sp1/4b_ReceivedTestRequest.def
+++ b/_test/definitions/server/fix50sp1/4b_ReceivedTestRequest.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 I8=FIXT.1.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=HELLO

 E8=FIXT.1.1
9=59
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
112=HELLO
10=0

diff --git a/_test/definitions/server/fix50sp1/6_SendTestRequest.def b/_test/definitions/server/fix50sp1/6_SendTestRequest.def
index b423dc11d..d262c9919 100644
--- a/_test/definitions/server/fix50sp1/6_SendTestRequest.def
+++ b/_test/definitions/server/fix50sp1/6_SendTestRequest.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=6
1137=8

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=6
1137=8
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=6
141=Y
1137=8
10=0

 
 # wait for two heartbeats
 E8=FIXT.1.1
9=49
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

diff --git a/_test/definitions/server/fix50sp1/7_ReceiveRejectMessage.def b/_test/definitions/server/fix50sp1/7_ReceiveRejectMessage.def
index cbb246d96..af2de180e 100644
--- a/_test/definitions/server/fix50sp1/7_ReceiveRejectMessage.def
+++ b/_test/definitions/server/fix50sp1/7_ReceiveRejectMessage.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 # reject
 I8=FIXT.1.1
35=3
34=2
49=TW
52=<TIME>
56=ISLD
45=1

diff --git a/_test/definitions/server/fix50sp1/8_AdminAndApplicationMessages.def b/_test/definitions/server/fix50sp1/8_AdminAndApplicationMessages.def
index 33c3def41..278597a69 100644
--- a/_test/definitions/server/fix50sp1/8_AdminAndApplicationMessages.def
+++ b/_test/definitions/server/fix50sp1/8_AdminAndApplicationMessages.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 # Admin messages 2-4
 I8=FIXT.1.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=HELLO

diff --git a/_test/definitions/server/fix50sp1/8_OnlyAdminMessages.def b/_test/definitions/server/fix50sp1/8_OnlyAdminMessages.def
index 6c27fd936..a59d56454 100644
--- a/_test/definitions/server/fix50sp1/8_OnlyAdminMessages.def
+++ b/_test/definitions/server/fix50sp1/8_OnlyAdminMessages.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 I8=FIXT.1.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=HELLO

 E8=FIXT.1.1
9=59
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
112=HELLO
10=0

diff --git a/_test/definitions/server/fix50sp1/8_OnlyApplicationMessages.def b/_test/definitions/server/fix50sp1/8_OnlyApplicationMessages.def
index c6bd7d084..e7897088b 100644
--- a/_test/definitions/server/fix50sp1/8_OnlyApplicationMessages.def
+++ b/_test/definitions/server/fix50sp1/8_OnlyApplicationMessages.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

 E8=FIXT.1.1
9=99
35=D
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
11=ID
21=3
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

diff --git a/_test/definitions/server/fix50sp1/AlreadyLoggedOn.def b/_test/definitions/server/fix50sp1/AlreadyLoggedOn.def
index 64b4adb6b..876981916 100644
--- a/_test/definitions/server/fix50sp1/AlreadyLoggedOn.def
+++ b/_test/definitions/server/fix50sp1/AlreadyLoggedOn.def
@@ -2,7 +2,7 @@
 
 i1,CONNECT
 I1,8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E1,8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E1,8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 i2,CONNECT
 I2,8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

diff --git a/_test/definitions/server/fix50sp1/RejectResentMessage.def b/_test/definitions/server/fix50sp1/RejectResentMessage.def
index 210fc0c0d..fe2f3bb18 100644
--- a/_test/definitions/server/fix50sp1/RejectResentMessage.def
+++ b/_test/definitions/server/fix50sp1/RejectResentMessage.def
@@ -3,7 +3,7 @@
 iCONNECT
 #Logon
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 # send in a test request one number too high
 I8=FIXT.1.1
35=1
34=3
49=TW
52=<TIME>
56=ISLD
112=HELLO1

diff --git a/_test/definitions/server/fix50sp1/ReverseRoute.def b/_test/definitions/server/fix50sp1/ReverseRoute.def
index 3b8816dda..ac11f354e 100644
--- a/_test/definitions/server/fix50sp1/ReverseRoute.def
+++ b/_test/definitions/server/fix50sp1/ReverseRoute.def
@@ -3,7 +3,7 @@
 iCONNECT
 #Logon
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 # Send an order with OnBehalfOfCompID (115) set with bad field value 40=w
 I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
115=JCD
11=ID
21=3
38=100
40=w
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix50sp1/ReverseRouteWithEmptyRoutingTags.def b/_test/definitions/server/fix50sp1/ReverseRouteWithEmptyRoutingTags.def
index 8645dd80a..756a261d6 100644
--- a/_test/definitions/server/fix50sp1/ReverseRouteWithEmptyRoutingTags.def
+++ b/_test/definitions/server/fix50sp1/ReverseRouteWithEmptyRoutingTags.def
@@ -3,7 +3,7 @@
 iCONNECT
 #Logon
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 # Send an order with OnBehalfOfCompID (115) empty 
 I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
115=
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix50sp1/SessionReset.def b/_test/definitions/server/fix50sp1/SessionReset.def
index bc14acc50..5829eb983 100644
--- a/_test/definitions/server/fix50sp1/SessionReset.def
+++ b/_test/definitions/server/fix50sp1/SessionReset.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

 
 I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIXT.1.1
35=0
34=3
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix50sp2/10_MsgSeqNumEqual.def b/_test/definitions/server/fix50sp2/10_MsgSeqNumEqual.def
index 9d9de93c6..2e084a9a1 100644
--- a/_test/definitions/server/fix50sp2/10_MsgSeqNumEqual.def
+++ b/_test/definitions/server/fix50sp2/10_MsgSeqNumEqual.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 # sequence reset with gap fill flag set to Y
 I8=FIXT.1.1
35=4
34=2
49=TW
52=<TIME>
56=ISLD
36=20
123=Y

diff --git a/_test/definitions/server/fix50sp2/10_MsgSeqNumGreater.def b/_test/definitions/server/fix50sp2/10_MsgSeqNumGreater.def
index 7f6dad09e..09e7bb71a 100644
--- a/_test/definitions/server/fix50sp2/10_MsgSeqNumGreater.def
+++ b/_test/definitions/server/fix50sp2/10_MsgSeqNumGreater.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 # sequence reset with gap fill flag set to Y
 I8=FIXT.1.1
35=4
34=10
49=TW
52=<TIME>
56=ISLD
36=20
123=Y

diff --git a/_test/definitions/server/fix50sp2/10_MsgSeqNumLess.def b/_test/definitions/server/fix50sp2/10_MsgSeqNumLess.def
index 5639cda82..03966894e 100644
--- a/_test/definitions/server/fix50sp2/10_MsgSeqNumLess.def
+++ b/_test/definitions/server/fix50sp2/10_MsgSeqNumLess.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 # sequence reset with gap fill flag set to Y, PosDupFlag set to Y
 I8=FIXT.1.1
35=4
34=1
49=TW
52=<TIME>
56=ISLD
43=Y
122=<TIME-1>
36=20
123=Y

diff --git a/_test/definitions/server/fix50sp2/11a_NewSeqNoGreater.def b/_test/definitions/server/fix50sp2/11a_NewSeqNoGreater.def
index c4adaf637..244993fde 100644
--- a/_test/definitions/server/fix50sp2/11a_NewSeqNoGreater.def
+++ b/_test/definitions/server/fix50sp2/11a_NewSeqNoGreater.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 # sequence reset without gap fill flag (default to N)
 I8=FIXT.1.1
35=4
34=0
49=TW
52=<TIME>
56=ISLD
36=25

diff --git a/_test/definitions/server/fix50sp2/11b_NewSeqNoEqual.def b/_test/definitions/server/fix50sp2/11b_NewSeqNoEqual.def
index edbd37a90..0f58c29d2 100644
--- a/_test/definitions/server/fix50sp2/11b_NewSeqNoEqual.def
+++ b/_test/definitions/server/fix50sp2/11b_NewSeqNoEqual.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 # sequence reset without gap fill flag (default to N)
 I8=FIXT.1.1
35=4
34=0
49=TW
52=<TIME>
56=ISLD
36=2

diff --git a/_test/definitions/server/fix50sp2/11c_NewSeqNoLess.def b/_test/definitions/server/fix50sp2/11c_NewSeqNoLess.def
index b151b5fc8..c62e57c3c 100644
--- a/_test/definitions/server/fix50sp2/11c_NewSeqNoLess.def
+++ b/_test/definitions/server/fix50sp2/11c_NewSeqNoLess.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 # sequence reset without gap fill flag (default to N)
 I8=FIXT.1.1
35=4
34=0
49=TW
52=<TIME>
56=ISLD
36=1

diff --git a/_test/definitions/server/fix50sp2/13b_UnsolicitedLogoutMessage.def b/_test/definitions/server/fix50sp2/13b_UnsolicitedLogoutMessage.def
index 83abe2dd6..58ecf50ae 100644
--- a/_test/definitions/server/fix50sp2/13b_UnsolicitedLogoutMessage.def
+++ b/_test/definitions/server/fix50sp2/13b_UnsolicitedLogoutMessage.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 I8=FIXT.1.1
35=5
34=2
49=TW
52=<TIME>
56=ISLD

 E8=FIXT.1.1
9=49
35=5
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

diff --git a/_test/definitions/server/fix50sp2/14a_BadField.def b/_test/definitions/server/fix50sp2/14a_BadField.def
index 9b6f98e6a..9c2eb8627 100644
--- a/_test/definitions/server/fix50sp2/14a_BadField.def
+++ b/_test/definitions/server/fix50sp2/14a_BadField.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=9

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=9
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=9
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50sp2/14b_RequiredFieldMissing.def b/_test/definitions/server/fix50sp2/14b_RequiredFieldMissing.def
index 3cc8b20e3..9303f93f2 100644
--- a/_test/definitions/server/fix50sp2/14b_RequiredFieldMissing.def
+++ b/_test/definitions/server/fix50sp2/14b_RequiredFieldMissing.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=9

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=9
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=9
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50sp2/14c_TagNotDefinedForMsgType.def b/_test/definitions/server/fix50sp2/14c_TagNotDefinedForMsgType.def
index e37e65fa9..d3f31c8ba 100644
--- a/_test/definitions/server/fix50sp2/14c_TagNotDefinedForMsgType.def
+++ b/_test/definitions/server/fix50sp2/14c_TagNotDefinedForMsgType.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=9

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=9
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=9
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50sp2/14d_TagSpecifiedWithoutValue.def b/_test/definitions/server/fix50sp2/14d_TagSpecifiedWithoutValue.def
index 8e996f69e..955d34f13 100644
--- a/_test/definitions/server/fix50sp2/14d_TagSpecifiedWithoutValue.def
+++ b/_test/definitions/server/fix50sp2/14d_TagSpecifiedWithoutValue.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=9

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=9
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=9
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50sp2/14e_IncorrectEnumValue.def b/_test/definitions/server/fix50sp2/14e_IncorrectEnumValue.def
index 477180ada..158f3c83d 100644
--- a/_test/definitions/server/fix50sp2/14e_IncorrectEnumValue.def
+++ b/_test/definitions/server/fix50sp2/14e_IncorrectEnumValue.def
@@ -4,7 +4,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=9

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=9
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=9
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50sp2/14f_IncorrectDataFormat.def b/_test/definitions/server/fix50sp2/14f_IncorrectDataFormat.def
index 4fe562a07..0f8b4ca83 100644
--- a/_test/definitions/server/fix50sp2/14f_IncorrectDataFormat.def
+++ b/_test/definitions/server/fix50sp2/14f_IncorrectDataFormat.def
@@ -4,7 +4,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=9

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=9
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=9
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50sp2/14g_HeaderBodyTrailerFieldsOutOfOrder.def b/_test/definitions/server/fix50sp2/14g_HeaderBodyTrailerFieldsOutOfOrder.def
index 7cd5646eb..ec862b4b7 100644
--- a/_test/definitions/server/fix50sp2/14g_HeaderBodyTrailerFieldsOutOfOrder.def
+++ b/_test/definitions/server/fix50sp2/14g_HeaderBodyTrailerFieldsOutOfOrder.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=9

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=9
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=9
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50sp2/14h_RepeatedTag.def b/_test/definitions/server/fix50sp2/14h_RepeatedTag.def
index b50c9f67b..947dd330c 100644
--- a/_test/definitions/server/fix50sp2/14h_RepeatedTag.def
+++ b/_test/definitions/server/fix50sp2/14h_RepeatedTag.def
@@ -4,7 +4,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=9

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=9
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=9
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50sp2/14i_RepeatingGroupCountNotEqual.def b/_test/definitions/server/fix50sp2/14i_RepeatingGroupCountNotEqual.def
index ff90c7e62..46ac44cfd 100644
--- a/_test/definitions/server/fix50sp2/14i_RepeatingGroupCountNotEqual.def
+++ b/_test/definitions/server/fix50sp2/14i_RepeatingGroupCountNotEqual.def
@@ -4,7 +4,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=9

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=9
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=9
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50sp2/15_HeaderAndBodyFieldsOrderedDifferently.def b/_test/definitions/server/fix50sp2/15_HeaderAndBodyFieldsOrderedDifferently.def
index e388e559e..abdc13f19 100644
--- a/_test/definitions/server/fix50sp2/15_HeaderAndBodyFieldsOrderedDifferently.def
+++ b/_test/definitions/server/fix50sp2/15_HeaderAndBodyFieldsOrderedDifferently.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=9

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=9
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=9
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50sp2/19a_PossResendMessageThatHAsAlreadyBeenSent.def b/_test/definitions/server/fix50sp2/19a_PossResendMessageThatHAsAlreadyBeenSent.def
index d232007b5..334969770 100644
--- a/_test/definitions/server/fix50sp2/19a_PossResendMessageThatHAsAlreadyBeenSent.def
+++ b/_test/definitions/server/fix50sp2/19a_PossResendMessageThatHAsAlreadyBeenSent.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=9

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=9
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=9
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50sp2/19b_PossResendMessageThatHasNotBeenSent.def b/_test/definitions/server/fix50sp2/19b_PossResendMessageThatHasNotBeenSent.def
index 3efb2ede8..b3ebceb57 100644
--- a/_test/definitions/server/fix50sp2/19b_PossResendMessageThatHasNotBeenSent.def
+++ b/_test/definitions/server/fix50sp2/19b_PossResendMessageThatHasNotBeenSent.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=9

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=9
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=9
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50sp2/1a_ValidLogonMsgSeqNumTooHigh.def b/_test/definitions/server/fix50sp2/1a_ValidLogonMsgSeqNumTooHigh.def
index 1f13e7b5c..510419c4e 100644
--- a/_test/definitions/server/fix50sp2/1a_ValidLogonMsgSeqNumTooHigh.def
+++ b/_test/definitions/server/fix50sp2/1a_ValidLogonMsgSeqNumTooHigh.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=5
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 E8=FIXT.1.1
9=58
35=2
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
7=1
16=0
10=0

 
diff --git a/_test/definitions/server/fix50sp2/1a_ValidLogonWithCorrectMsgSeqNum.def b/_test/definitions/server/fix50sp2/1a_ValidLogonWithCorrectMsgSeqNum.def
index 3790c29cd..db0d82baf 100644
--- a/_test/definitions/server/fix50sp2/1a_ValidLogonWithCorrectMsgSeqNum.def
+++ b/_test/definitions/server/fix50sp2/1a_ValidLogonWithCorrectMsgSeqNum.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 # logout message and response
 I8=FIXT.1.1
35=5
34=2
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix50sp2/1b_DuplicateIdentity.def b/_test/definitions/server/fix50sp2/1b_DuplicateIdentity.def
index 9981276b2..9058b311a 100644
--- a/_test/definitions/server/fix50sp2/1b_DuplicateIdentity.def
+++ b/_test/definitions/server/fix50sp2/1b_DuplicateIdentity.def
@@ -4,7 +4,7 @@
 # First logon, succesful
 i1,CONNECT
 I1,8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E1,8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E1,8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 # Second logon, unsuccesful
 i2,CONNECT
diff --git a/_test/definitions/server/fix50sp2/20_SimultaneousResendRequest.def b/_test/definitions/server/fix50sp2/20_SimultaneousResendRequest.def
index 28bf103cb..9b5f7cacb 100644
--- a/_test/definitions/server/fix50sp2/20_SimultaneousResendRequest.def
+++ b/_test/definitions/server/fix50sp2/20_SimultaneousResendRequest.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

 E8=FIXT.1.1
9=99
35=D
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
11=ID
21=3
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

diff --git a/_test/definitions/server/fix50sp2/21_RepeatingGroupSpecifierWithValueOfZero.def b/_test/definitions/server/fix50sp2/21_RepeatingGroupSpecifierWithValueOfZero.def
index d637ed4ad..13fdad9ca 100644
--- a/_test/definitions/server/fix50sp2/21_RepeatingGroupSpecifierWithValueOfZero.def
+++ b/_test/definitions/server/fix50sp2/21_RepeatingGroupSpecifierWithValueOfZero.def
@@ -5,7 +5,7 @@
 iCONNECT
 # logon message and response
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=9

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
1137=9
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=2
141=Y
1137=9
10=0

 
 #------------------------
 # begin message exchange
diff --git a/_test/definitions/server/fix50sp2/2a_MsgSeqNumCorrect.def b/_test/definitions/server/fix50sp2/2a_MsgSeqNumCorrect.def
index 748cc7752..c385c871f 100644
--- a/_test/definitions/server/fix50sp2/2a_MsgSeqNumCorrect.def
+++ b/_test/definitions/server/fix50sp2/2a_MsgSeqNumCorrect.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIXT.1.1
35=0
34=3
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix50sp2/2b_MsgSeqNumTooHigh.def b/_test/definitions/server/fix50sp2/2b_MsgSeqNumTooHigh.def
index 799146c7c..98a3042d5 100644
--- a/_test/definitions/server/fix50sp2/2b_MsgSeqNumTooHigh.def
+++ b/_test/definitions/server/fix50sp2/2b_MsgSeqNumTooHigh.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIXT.1.1
35=0
34=3
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix50sp2/2c_MsgSeqNumTooLow.def b/_test/definitions/server/fix50sp2/2c_MsgSeqNumTooLow.def
index 66677eeb7..b3bb1d3a9 100644
--- a/_test/definitions/server/fix50sp2/2c_MsgSeqNumTooLow.def
+++ b/_test/definitions/server/fix50sp2/2c_MsgSeqNumTooLow.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIXT.1.1
35=0
34=3
49=TW
52=<TIME>
56=ISLD

diff --git a/_test/definitions/server/fix50sp2/2d_GarbledMessage.def b/_test/definitions/server/fix50sp2/2d_GarbledMessage.def
index b6533d235..a43798175 100644
--- a/_test/definitions/server/fix50sp2/2d_GarbledMessage.def
+++ b/_test/definitions/server/fix50sp2/2d_GarbledMessage.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9

+E8=FIXT.1.1
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9

 
 # Garbled message
 I8=FIXT.1.1
9=52
35=0
34=2
4garbled9=TW
52=<TIME>
56=ISLD
10=0

diff --git a/_test/definitions/server/fix50sp2/2e_PossDupAlreadyReceived.def b/_test/definitions/server/fix50sp2/2e_PossDupAlreadyReceived.def
index 33ad91600..dee36ac7b 100644
--- a/_test/definitions/server/fix50sp2/2e_PossDupAlreadyReceived.def
+++ b/_test/definitions/server/fix50sp2/2e_PossDupAlreadyReceived.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=7

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=7

 
 I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME>
122=<TIME>
56=ISLD
43=Y
112=<TIME>

diff --git a/_test/definitions/server/fix50sp2/2e_PossDupNotReceived.def b/_test/definitions/server/fix50sp2/2e_PossDupNotReceived.def
index b0850b691..bf277555e 100644
--- a/_test/definitions/server/fix50sp2/2e_PossDupNotReceived.def
+++ b/_test/definitions/server/fix50sp2/2e_PossDupNotReceived.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 
diff --git a/_test/definitions/server/fix50sp2/2f_PossDupOrigSendingTimeTooHigh.def b/_test/definitions/server/fix50sp2/2f_PossDupOrigSendingTimeTooHigh.def
index b5a387091..255d7d463 100644
--- a/_test/definitions/server/fix50sp2/2f_PossDupOrigSendingTimeTooHigh.def
+++ b/_test/definitions/server/fix50sp2/2f_PossDupOrigSendingTimeTooHigh.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 # send two orders in sequence
 I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix50sp2/2g_PossDupNoOrigSendingTime.def b/_test/definitions/server/fix50sp2/2g_PossDupNoOrigSendingTime.def
index 45ab08941..de5817314 100644
--- a/_test/definitions/server/fix50sp2/2g_PossDupNoOrigSendingTime.def
+++ b/_test/definitions/server/fix50sp2/2g_PossDupNoOrigSendingTime.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 # send two orders in sequence
 I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix50sp2/2i_BeginStringValueUnexpected.def b/_test/definitions/server/fix50sp2/2i_BeginStringValueUnexpected.def
index a1bb2a8de..05873988a 100644
--- a/_test/definitions/server/fix50sp2/2i_BeginStringValueUnexpected.def
+++ b/_test/definitions/server/fix50sp2/2i_BeginStringValueUnexpected.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 # Send with incorrect begin string and respond to logout
 I8=FIX.4.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=id

@@ -12,7 +12,7 @@ eDISCONNECT
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 # Send with incorrect begin string and don't respond to logout
 I8=FIX.4.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=id

diff --git a/_test/definitions/server/fix50sp2/2k_CompIDDoesNotMatchProfile.def b/_test/definitions/server/fix50sp2/2k_CompIDDoesNotMatchProfile.def
index 1be652c6f..781ef3683 100644
--- a/_test/definitions/server/fix50sp2/2k_CompIDDoesNotMatchProfile.def
+++ b/_test/definitions/server/fix50sp2/2k_CompIDDoesNotMatchProfile.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 # send order with bad SenderCompID
 I8=FIXT.1.1
35=D
34=2
49=WT
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

@@ -18,7 +18,7 @@ eDISCONNECT
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 # send order with bad TargetCompID
 I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=DLSI
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

@@ -34,7 +34,7 @@ eDISCONNECT
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 # send order with bad SenderCompID and TargetCompID
 I8=FIXT.1.1
35=D
34=2
49=WT
52=<TIME>
56=DLSI
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix50sp2/2m_BodyLengthValueNotCorrect.def b/_test/definitions/server/fix50sp2/2m_BodyLengthValueNotCorrect.def
index 4c2ba95b1..c73ac0a6c 100644
--- a/_test/definitions/server/fix50sp2/2m_BodyLengthValueNotCorrect.def
+++ b/_test/definitions/server/fix50sp2/2m_BodyLengthValueNotCorrect.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 # Send a message with a length that is too short
 I8=FIXT.1.1
9=30
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix50sp2/2o_SendingTimeValueOutOfRange.def b/_test/definitions/server/fix50sp2/2o_SendingTimeValueOutOfRange.def
index aa6443ade..a9ca3f9bc 100644
--- a/_test/definitions/server/fix50sp2/2o_SendingTimeValueOutOfRange.def
+++ b/_test/definitions/server/fix50sp2/2o_SendingTimeValueOutOfRange.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 # send heartbeat more than 2 minutes early
 I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME-121>
56=ISLD

@@ -17,7 +17,7 @@ eDISCONNECT
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 # send heartbeat more than 2 minutes late
 I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME+121>
56=ISLD

diff --git a/_test/definitions/server/fix50sp2/2q_MsgTypeNotValid.def b/_test/definitions/server/fix50sp2/2q_MsgTypeNotValid.def
index 3e0eb77e3..3d089ffdd 100644
--- a/_test/definitions/server/fix50sp2/2q_MsgTypeNotValid.def
+++ b/_test/definitions/server/fix50sp2/2q_MsgTypeNotValid.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 I8=FIXT.1.1
35=*
34=2
49=TW
52=<TIME>
56=ISLD

 # reject
diff --git a/_test/definitions/server/fix50sp2/2r_UnregisteredMsgType.def b/_test/definitions/server/fix50sp2/2r_UnregisteredMsgType.def
index 7f9157dfc..364789611 100644
--- a/_test/definitions/server/fix50sp2/2r_UnregisteredMsgType.def
+++ b/_test/definitions/server/fix50sp2/2r_UnregisteredMsgType.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 I8=FIXT.1.1
35=8
34=2
49=TW
52=<TIME>
56=ISLD
37=id
17=id
150=0
39=0
55=WLRI
54=1
151=100
14=0
6=0.0

 E8=FIXT.1.1
9=94
35=j
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
45=2
58=Unsupported Message Type
372=8
380=3
10=0

diff --git a/_test/definitions/server/fix50sp2/2t_FirstThreeFieldsOutOfOrder.def b/_test/definitions/server/fix50sp2/2t_FirstThreeFieldsOutOfOrder.def
index ca46a810a..86cf376c4 100644
--- a/_test/definitions/server/fix50sp2/2t_FirstThreeFieldsOutOfOrder.def
+++ b/_test/definitions/server/fix50sp2/2t_FirstThreeFieldsOutOfOrder.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 # 35 is first, should be second
 I35=0
8=FIXT.1.1
9=29
34=2
49=TW
52=<TIME>
56=ISLD
10=121

diff --git a/_test/definitions/server/fix50sp2/3b_InvalidChecksum.def b/_test/definitions/server/fix50sp2/3b_InvalidChecksum.def
index 6d8b7c0a3..f931ba8f0 100644
--- a/_test/definitions/server/fix50sp2/3b_InvalidChecksum.def
+++ b/_test/definitions/server/fix50sp2/3b_InvalidChecksum.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=7

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=7

 
 # Incorrect checksum
 I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME>
56=ISLD
10=256

diff --git a/_test/definitions/server/fix50sp2/3c_GarbledMessage.def b/_test/definitions/server/fix50sp2/3c_GarbledMessage.def
index d5b5073f5..5dcb9755c 100644
--- a/_test/definitions/server/fix50sp2/3c_GarbledMessage.def
+++ b/_test/definitions/server/fix50sp2/3c_GarbledMessage.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9

+E8=FIXT.1.1
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9

 
 # Garbled message
 I8=FIXT.1.1
9=52
35=0
34=2
4garbled9=TW
52=<TIME>
56=ISLD
10=0

diff --git a/_test/definitions/server/fix50sp2/4a_NoDataSentDuringHeartBtInt.def b/_test/definitions/server/fix50sp2/4a_NoDataSentDuringHeartBtInt.def
index e0d27a569..145cb0e11 100644
--- a/_test/definitions/server/fix50sp2/4a_NoDataSentDuringHeartBtInt.def
+++ b/_test/definitions/server/fix50sp2/4a_NoDataSentDuringHeartBtInt.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=6
1137=9

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=6
1137=9
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=6
141=Y
1137=9
10=0

 
 # Wait for quickfix to send a heartbeat to us
 E8=FIXT.1.1
9=49
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

diff --git a/_test/definitions/server/fix50sp2/4b_ReceivedTestRequest.def b/_test/definitions/server/fix50sp2/4b_ReceivedTestRequest.def
index 67fe74399..a6b8bf25d 100644
--- a/_test/definitions/server/fix50sp2/4b_ReceivedTestRequest.def
+++ b/_test/definitions/server/fix50sp2/4b_ReceivedTestRequest.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 I8=FIXT.1.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=HELLO

 E8=FIXT.1.1
9=59
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
112=HELLO
10=0

diff --git a/_test/definitions/server/fix50sp2/6_SendTestRequest.def b/_test/definitions/server/fix50sp2/6_SendTestRequest.def
index a65ecc6ea..12d78a370 100644
--- a/_test/definitions/server/fix50sp2/6_SendTestRequest.def
+++ b/_test/definitions/server/fix50sp2/6_SendTestRequest.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=6
1137=9

-E8=FIXT.1.1
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=6
1137=9
10=0

+E8=FIXT.1.1
9=73
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=6
141=Y
1137=9
10=0

 
 # wait for two heartbeats
 E8=FIXT.1.1
9=49
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

diff --git a/_test/definitions/server/fix50sp2/7_ReceiveRejectMessage.def b/_test/definitions/server/fix50sp2/7_ReceiveRejectMessage.def
index 4d61a068e..f091f9493 100644
--- a/_test/definitions/server/fix50sp2/7_ReceiveRejectMessage.def
+++ b/_test/definitions/server/fix50sp2/7_ReceiveRejectMessage.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 # reject
 I8=FIXT.1.1
35=3
34=2
49=TW
52=<TIME>
56=ISLD
45=1

diff --git a/_test/definitions/server/fix50sp2/8_AdminAndApplicationMessages.def b/_test/definitions/server/fix50sp2/8_AdminAndApplicationMessages.def
index c876ca841..6e709c66d 100644
--- a/_test/definitions/server/fix50sp2/8_AdminAndApplicationMessages.def
+++ b/_test/definitions/server/fix50sp2/8_AdminAndApplicationMessages.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 # Admin messages 2-4
 I8=FIXT.1.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=HELLO

diff --git a/_test/definitions/server/fix50sp2/8_OnlyAdminMessages.def b/_test/definitions/server/fix50sp2/8_OnlyAdminMessages.def
index 26806a5c8..0b593fc47 100644
--- a/_test/definitions/server/fix50sp2/8_OnlyAdminMessages.def
+++ b/_test/definitions/server/fix50sp2/8_OnlyAdminMessages.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 I8=FIXT.1.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=HELLO

 E8=FIXT.1.1
9=59
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
112=HELLO
10=0

diff --git a/_test/definitions/server/fix50sp2/8_OnlyApplicationMessages.def b/_test/definitions/server/fix50sp2/8_OnlyApplicationMessages.def
index cef5baa46..6c0be28e9 100644
--- a/_test/definitions/server/fix50sp2/8_OnlyApplicationMessages.def
+++ b/_test/definitions/server/fix50sp2/8_OnlyApplicationMessages.def
@@ -2,7 +2,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
40=1
54=1
55=INTC
60=<TIME>

 E8=FIXT.1.1
9=99
35=D
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
11=ID
21=3
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

diff --git a/_test/definitions/server/fix50sp2/AlreadyLoggedOn.def b/_test/definitions/server/fix50sp2/AlreadyLoggedOn.def
index 31a36625f..8a544f7f0 100644
--- a/_test/definitions/server/fix50sp2/AlreadyLoggedOn.def
+++ b/_test/definitions/server/fix50sp2/AlreadyLoggedOn.def
@@ -2,7 +2,7 @@
 
 i1,CONNECT
 I1,8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E1,8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E1,8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 i2,CONNECT
 I2,8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

diff --git a/_test/definitions/server/fix50sp2/RejectResentMessage.def b/_test/definitions/server/fix50sp2/RejectResentMessage.def
index 7a20989b7..42ced7c01 100644
--- a/_test/definitions/server/fix50sp2/RejectResentMessage.def
+++ b/_test/definitions/server/fix50sp2/RejectResentMessage.def
@@ -3,7 +3,7 @@
 iCONNECT
 #Logon
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 # send in a test request one number too high
 I8=FIXT.1.1
35=1
34=3
49=TW
52=<TIME>
56=ISLD
112=HELLO1

diff --git a/_test/definitions/server/fix50sp2/ReverseRoute.def b/_test/definitions/server/fix50sp2/ReverseRoute.def
index 7c75d6075..9bbcb61de 100644
--- a/_test/definitions/server/fix50sp2/ReverseRoute.def
+++ b/_test/definitions/server/fix50sp2/ReverseRoute.def
@@ -3,7 +3,7 @@
 iCONNECT
 #Logon
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 # Send an order with OnBehalfOfCompID (115) set with bad field value 40=w
 I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
115=JCD
11=ID
21=3
38=100
40=w
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix50sp2/ReverseRouteWithEmptyRoutingTags.def b/_test/definitions/server/fix50sp2/ReverseRouteWithEmptyRoutingTags.def
index d2d13e903..aeba2ed26 100644
--- a/_test/definitions/server/fix50sp2/ReverseRouteWithEmptyRoutingTags.def
+++ b/_test/definitions/server/fix50sp2/ReverseRouteWithEmptyRoutingTags.def
@@ -3,7 +3,7 @@
 iCONNECT
 #Logon
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 # Send an order with OnBehalfOfCompID (115) empty 
 I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
115=
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

diff --git a/_test/definitions/server/fix50sp2/SessionReset.def b/_test/definitions/server/fix50sp2/SessionReset.def
index 066ea59f1..52579f891 100644
--- a/_test/definitions/server/fix50sp2/SessionReset.def
+++ b/_test/definitions/server/fix50sp2/SessionReset.def
@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

-E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

+E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

 
 I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIXT.1.1
35=0
34=3
49=TW
52=<TIME>
56=ISLD

diff --git a/logon_state_test.go b/logon_state_test.go
index da7fb644f..0b32ec267 100644
--- a/logon_state_test.go
+++ b/logon_state_test.go
@@ -430,3 +430,27 @@ func (s *LogonStateTestSuite) TestStayLoggedInOnReset() {
 	s.NextTargetMsgSeqNum(2)
 	s.NextSenderMsgSeqNum(2)
 }
+
+func (s *LogonStateTestSuite) TestResetOnLogonWithoutIncomingResetFlag() {
+	s.session.ResetOnLogon = true
+
+	s.IncrNextSenderMsgSeqNum()
+	s.IncrNextTargetMsgSeqNum()
+
+	logon := s.Logon()
+
+	s.MockApp.On("FromAdmin").Return(nil)
+	s.MockApp.On("OnLogon")
+	s.MockApp.On("ToAdmin")
+
+	s.fixMsgIn(s.session, logon)
+
+	s.MockApp.AssertExpectations(s.T())
+	s.State(inSession{})
+
+	s.LastToAdminMessageSent()
+	s.FieldEquals(tagResetSeqNumFlag, true, s.MockApp.lastToAdmin.Body)
+
+	s.NextSenderMsgSeqNum(2)
+	s.NextTargetMsgSeqNum(2)
+}
diff --git a/session.go b/session.go
index 7bcd3a112..eccc4cea6 100644
--- a/session.go
+++ b/session.go
@@ -558,7 +558,11 @@ func (s *session) handleLogon(msg *Message) error {
 		}
 
 		s.log.OnEvent("Responding to logon request")
-		if err := s.sendLogonInReplyTo(resetSeqNumFlag.Bool(), msg); err != nil {
+
+		setResetSeqNum := resetSeqNumFlag.Bool() ||
+			(resetStore && s.sessionID.BeginString >= BeginStringFIX41)
+
+		if err := s.sendLogonInReplyTo(setResetSeqNum, msg); err != nil {
 			return err
 		}
 	}