diff --git a/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-Limit-USD-0.10-0.20-201011.Sample.Not.UTF16.txt.hands b/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-Limit-USD-0.10-0.20-201011.Sample.Not.UTF16.txt.hands
index 41822f4a..dfe994ea 100644
--- a/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-Limit-USD-0.10-0.20-201011.Sample.Not.UTF16.txt.hands
+++ b/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-Limit-USD-0.10-0.20-201011.Sample.Not.UTF16.txt.hands
@@ -3,11 +3,11 @@
     'boardcard3': 0,
     'boardcard4': 0,
     'boardcard5': 0,
-    'gametypeId': 102,
+    'gametypeId': 1,
     'importTime': None,
     'maxSeats': 6,
     'playersAtShowdown': 3,
-    'playersAtStreet1': 3,
+    'playersAtStreet1': 4,
     'playersAtStreet2': 3,
     'playersAtStreet3': 3,
     'playersAtStreet4': 0,
@@ -15,10 +15,10 @@
     'seats': 5,
     'showdownPot': 0,
     'siteHandNo': u'25319060000',
-    'startTime': datetime.datetime(2010, 11, 6, 16, 4, tzinfo=pytz.utc),
-    'street0Raises': 3,
+    'startTime': datetime.datetime(2010, 11, 6, 16, 4, tzinfo=<UTC>),
+    'street0Raises': 1,
     'street1Pot': 0,
-    'street1Raises': 0,
+    'street1Raises': 2,
     'street2Pot': 0,
     'street2Raises': 0,
     'street3Pot': 0,
diff --git a/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-Limit-USD-0.10-0.20-201011.Sample.Not.UTF16.txt.hp b/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-Limit-USD-0.10-0.20-201011.Sample.Not.UTF16.txt.hp
index 92b87550..8adceffd 100644
--- a/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-Limit-USD-0.10-0.20-201011.Sample.Not.UTF16.txt.hp
+++ b/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-Limit-USD-0.10-0.20-201011.Sample.Not.UTF16.txt.hp
@@ -128,14 +128,14 @@
                     'other3BStreet0': False,
                     'other4BStreet0': False,
                     'otherRaisedStreet0': False,
-                    'otherRaisedStreet1': False,
+                    'otherRaisedStreet1': True,
                     'otherRaisedStreet2': False,
                     'otherRaisedStreet3': False,
                     'otherRaisedStreet4': False,
                     'position': 1,
                     'raiseFirstInChance': True,
                     'raisedFirstIn': True,
-                    'rake': -10,
+                    'rake': 10,
                     'sawShowdown': True,
                     'seatNo': 1,
                     'sitout': False,
@@ -148,17 +148,17 @@
                     'street0VPI': True,
                     'street0_3BChance': False,
                     'street0_3BDone': False,
-                    'street0_4BChance': True,
-                    'street0_4BDone': True,
+                    'street0_4BChance': False,
+                    'street0_4BDone': False,
                     'street0_C4BChance': False,
                     'street0_C4BDone': False,
-                    'street0_FoldTo3BChance': True,
+                    'street0_FoldTo3BChance': False,
                     'street0_FoldTo3BDone': False,
                     'street0_FoldTo4BChance': False,
                     'street0_FoldTo4BDone': False,
                     'street0_SqueezeChance': False,
                     'street0_SqueezeDone': False,
-                    'street1Aggr': False,
+                    'street1Aggr': True,
                     'street1Bets': 0,
                     'street1CBChance': False,
                     'street1CBDone': False,
@@ -195,7 +195,7 @@
                     'street4Raises': 0,
                     'street4Seen': False,
                     'success_Steal': False,
-                    'totalProfit': 150,
+                    'totalProfit': 130,
                     'tourneyTypeId': None,
                     'tourneysPlayersIds': None,
                     'winnings': 190,
@@ -231,7 +231,7 @@
                     'other3BStreet0': False,
                     'other4BStreet0': False,
                     'otherRaisedStreet0': False,
-                    'otherRaisedStreet1': False,
+                    'otherRaisedStreet1': True,
                     'otherRaisedStreet2': False,
                     'otherRaisedStreet3': False,
                     'otherRaisedStreet4': False,
@@ -246,7 +246,7 @@
                     'startCash': 404,
                     'street0Aggr': False,
                     'street0Bets': 0,
-                    'street0Calls': 2,
+                    'street0Calls': 1,
                     'street0Raises': 0,
                     'street0VPI': True,
                     'street0_3BChance': True,
@@ -265,7 +265,7 @@
                     'street1Bets': 0,
                     'street1CBChance': False,
                     'street1CBDone': False,
-                    'street1Calls': 0,
+                    'street1Calls': 1,
                     'street1CheckCallRaiseChance': False,
                     'street1CheckCallRaiseDone': False,
                     'street1Raises': 0,
@@ -334,7 +334,7 @@
                     'other3BStreet0': False,
                     'other4BStreet0': False,
                     'otherRaisedStreet0': False,
-                    'otherRaisedStreet1': False,
+                    'otherRaisedStreet1': True,
                     'otherRaisedStreet2': False,
                     'otherRaisedStreet3': False,
                     'otherRaisedStreet4': False,
@@ -347,28 +347,28 @@
                     'sitout': False,
                     'startCards': 0,
                     'startCash': 188,
-                    'street0Aggr': True,
-                    'street0Bets': 1,
-                    'street0Calls': 2,
+                    'street0Aggr': False,
+                    'street0Bets': 0,
+                    'street0Calls': 1,
                     'street0Raises': 0,
                     'street0VPI': True,
                     'street0_3BChance': True,
-                    'street0_3BDone': True,
+                    'street0_3BDone': False,
                     'street0_4BChance': False,
                     'street0_4BDone': False,
                     'street0_C4BChance': False,
                     'street0_C4BDone': False,
                     'street0_FoldTo3BChance': False,
                     'street0_FoldTo3BDone': False,
-                    'street0_FoldTo4BChance': True,
+                    'street0_FoldTo4BChance': False,
                     'street0_FoldTo4BDone': False,
                     'street0_SqueezeChance': 1,
-                    'street0_SqueezeDone': 1,
-                    'street1Aggr': False,
-                    'street1Bets': 0,
+                    'street0_SqueezeDone': False,
+                    'street1Aggr': True,
+                    'street1Bets': 1,
                     'street1CBChance': False,
                     'street1CBDone': False,
-                    'street1Calls': 0,
+                    'street1Calls': 1,
                     'street1CheckCallRaiseChance': False,
                     'street1CheckCallRaiseDone': False,
                     'street1Raises': 0,
@@ -420,7 +420,7 @@
                     'foldBbToStealChance': False,
                     'foldSbToStealChance': False,
                     'foldToOtherRaisedStreet0': False,
-                    'foldToOtherRaisedStreet1': False,
+                    'foldToOtherRaisedStreet1': True,
                     'foldToOtherRaisedStreet2': False,
                     'foldToOtherRaisedStreet3': False,
                     'foldToOtherRaisedStreet4': False,
@@ -437,7 +437,7 @@
                     'other3BStreet0': False,
                     'other4BStreet0': False,
                     'otherRaisedStreet0': False,
-                    'otherRaisedStreet1': False,
+                    'otherRaisedStreet1': True,
                     'otherRaisedStreet2': False,
                     'otherRaisedStreet3': False,
                     'otherRaisedStreet4': False,
@@ -459,7 +459,7 @@
                     'street0_3BDone': False,
                     'street0_4BChance': False,
                     'street0_4BDone': False,
-                    'street0_C4BChance': True,
+                    'street0_C4BChance': False,
                     'street0_C4BDone': False,
                     'street0_FoldTo3BChance': False,
                     'street0_FoldTo3BDone': False,
@@ -475,7 +475,7 @@
                     'street1CheckCallRaiseChance': False,
                     'street1CheckCallRaiseDone': False,
                     'street1Raises': 0,
-                    'street1Seen': False,
+                    'street1Seen': True,
                     'street2Aggr': False,
                     'street2Bets': 0,
                     'street2CBChance': False,