diff --git a/tests/data/aec-senate-formalpreferences-24310-TAS.csv b/tests/data/aec-senate-formalpreferences-24310-TAS.csv
index d003596..3b0702c 100644
--- a/tests/data/aec-senate-formalpreferences-24310-TAS.csv
+++ b/tests/data/aec-senate-formalpreferences-24310-TAS.csv
@@ -1,48 +1,48 @@
 Stage:,1,,2,,3,,4,,8,,11,,15,,18,,21,,24,,28,,31,,33,,37,,40,,43,,46,,50,,53,,57,,61,,65,,69,,73,,75,,79,,83,,87,,91,,95,,99,,103,,107,,111,,115,,119,,123,,127,,128,,133,,138,,139,
 Comment:,First preferences,,Surplus of COLBECK Richard,,Surplus of BROWN Carol,,Surplus of CHANDLER Claire,,Exclusion of KUCINA Steve,,Exclusion of WILLIAMS Glynn,,Exclusion of RABEY Matthew,,Exclusion of REYNOLDS Chris,,Exclusion of MACLAY Christopher Brian,,Exclusion of GUNNIS Craig,,Exclusion of HILDITCH Wendy,,Exclusion of FALZON Frank,,Exclusion of FLANNERY Francis,,Exclusion of TURNER Isobel Bertoz,,Exclusion of STREET Karen,,Exclusion of FRAME Nigel,,Exclusion of OWEN Matt,,Exclusion of SWANSON Kim,,Exclusion of DUNCAN Mark,,Exclusion of WILLIAMS David,,Exclusion of WILLIAMS Ray,,Exclusion of MARSH Simone,,Exclusion of LAMBERT Adam,,Exclusion of ROBERTS Wayne,,Exclusion of BECK Greg,,Exclusion of FLANAGAN Robert,,Exclusion of HUTCHINSON Helen,,Exclusion of JONES Michael,,Exclusion of SHORT John,,Exclusion of DUDLEY Todd William,,Exclusion of MEAD Clinton,,Exclusion of GARLAND Craig,,Exclusion of MAV Steve,,Exclusion of STRINGER Justin,,Exclusion of INFORMAL Alfred,,Exclusion of BEVIS Karen Louise,,Exclusion of MARTIN Steve,,Exclusion of BYFIELD Rebecca Anthea,,Surplus of McKIM Nick,,Exclusion of MORGAN Kevin,,Exclusion of DENISON Tanya,,Exclusion of SINGH Lisa,
-STRINGER Justin,3695,,3709,,3710,,3710,,3710,,3710,,3710,,3710,,3711,,3711,,3712,,3713,,3713,,3714,,3716,,3805,,3805,,3807,,3807,,3807,,3818,,3819,,3821,,3822,,3852,,3852,,3856,,3972,,3982,,4090,,4176,,4196,,4259,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-FRAME Nigel,127,,129,,129,,129,,129,,129,,130,,130,,131,,131,,133,,133,,134,,135,,135,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-MARTIN Steve,3981,,4169,,4173,,4176,,4177,,4177,,4177,,4177,,4178,,4178,,4209,,4209,,4210,,4211,,4212,,4222,,4223,,4225,,4225,,4227,,4234,,4235,,4236,,4240,,4255,,4259,,4264,,4283,,4295,,4399,,4551,,4590,,4683,,6011,,6069,,6289,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-HILDITCH Wendy,60,,67,,68,,68,,68,,68,,68,,68,,69,,70,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-DUDLEY Todd William,1720,,1725,,1725,,1725,,1725,,1725,,1725,,1725,,1767,,1767,,1769,,1769,,1771,,1775,,1775,,1780,,1781,,1781,,1784,,1784,,1806,,1808,,1809,,1810,,1818,,1824,,1833,,1844,,1851,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-MACLAY Christopher Brian,63,,64,,64,,64,,64,,64,,64,,64,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-McKIM Nick,43212,,43282,,43345,,43347,,43347,,43348,,43349,,43350,,43353,,43353,,43354,,43355,,43362,,43368,,43369,,43370,,43379,,43379,,43387,,43389,,43406,,43451,,43453,,43458,,43467,,43487,,44314,,44318,,44376,,44907,,45000,,45942,,46070,,46275,,46911,,48797,,50009,,50530,PEL,50285,EL,50285,EL,50285,EL,50285,EL
-HUTCHINSON Helen,665,,669,,673,,673,,674,,674,,674,,674,,676,,676,,684,,685,,687,,690,,690,,692,,694,,694,,697,,697,,701,,981,,983,,988,,989,,994,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-MARSH Simone,359,,359,,360,,360,,360,,360,,360,,361,,363,,363,,363,,363,,363,,365,,367,,369,,369,,369,,369,,370,,370,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+STRINGER Justin,3695,H,3709,H,3710,H,3710,H,3710,H,3710,H,3710,H,3710,H,3711,H,3711,H,3712,H,3713,H,3713,H,3714,H,3716,H,3805,H,3805,H,3807,H,3807,H,3807,H,3818,H,3819,H,3821,H,3822,H,3852,H,3852,H,3856,H,3972,H,3982,H,4090,H,4176,H,4196,H,4259,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+FRAME Nigel,127,H,129,H,129,H,129,H,129,H,129,H,130,H,130,H,131,H,131,H,133,H,133,H,134,H,135,H,135,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+MARTIN Steve,3981,H,4169,H,4173,H,4176,H,4177,H,4177,H,4177,H,4177,H,4178,H,4178,H,4209,H,4209,H,4210,H,4211,H,4212,H,4222,H,4223,H,4225,H,4225,H,4227,H,4234,H,4235,H,4236,H,4240,H,4255,H,4259,H,4264,H,4283,H,4295,H,4399,H,4551,H,4590,H,4683,H,6011,H,6069,H,6289,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+HILDITCH Wendy,60,H,67,H,68,H,68,H,68,H,68,H,68,H,68,H,69,H,70,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+DUDLEY Todd William,1720,H,1725,H,1725,H,1725,H,1725,H,1725,H,1725,H,1725,H,1767,H,1767,H,1769,H,1769,H,1771,H,1775,H,1775,H,1780,H,1781,H,1781,H,1784,H,1784,H,1806,H,1808,H,1809,H,1810,H,1818,H,1824,H,1833,H,1844,H,1851,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+MACLAY Christopher Brian,63,H,64,H,64,H,64,H,64,H,64,H,64,H,64,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+McKIM Nick,43212,H,43282,H,43345,H,43347,H,43347,H,43348,H,43349,H,43350,H,43353,H,43353,H,43354,H,43355,H,43362,H,43368,H,43369,H,43370,H,43379,H,43379,H,43387,H,43389,H,43406,H,43451,H,43453,H,43458,H,43467,H,43487,H,44314,H,44318,H,44376,H,44907,H,45000,H,45942,H,46070,H,46275,H,46911,H,48797,H,50009,H,50530,PEL,50285,EL,50285,EL,50285,EL,50285,EL
+HUTCHINSON Helen,665,H,669,H,673,H,673,H,674,H,674,H,674,H,674,H,676,H,676,H,684,H,685,H,687,H,690,H,690,H,692,H,694,H,694,H,697,H,697,H,701,H,981,H,983,H,988,H,989,H,994,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+MARSH Simone,359,H,359,H,360,H,360,H,360,H,360,H,360,H,361,H,363,H,363,H,363,H,363,H,363,H,365,H,367,H,369,H,369,H,369,H,369,H,370,H,370,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
 COLBECK Richard,106577,PEL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL
-CHANDLER Claire,1687,,55996,PEL,55996,PEL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL
-DENISON Tanya,2466,,3580,,3584,,9272,,9273,,9276,,9277,,9279,,9280,,9281,,9291,,9293,,9300,,9303,,9306,,9319,,9321,,9323,,9325,,9326,,9348,,9355,,9360,,9364,,9441,,9446,,9461,,9525,,9534,,9689,,10412,,10607,,11036,,12295,,12571,,13188,,16121,,17365,,17387,,19739,,0,EX,0,EX
-BEVIS Karen Louise,4414,,4430,,4436,,4436,,4437,,4437,,4437,,4438,,4439,,4439,,4439,,4439,,4441,,4508,,4508,,4510,,4514,,4516,,4518,,4519,,4547,,4553,,4555,,4556,,4560,,4564,,4585,,4602,,4612,,4886,,5036,,5142,,5244,,5414,,6006,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-TURNER Isobel Bertoz,107,,109,,109,,109,,109,,109,,110,,110,,113,,113,,114,,115,,115,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-WILLIAMS Ray,313,,318,,322,,322,,331,,332,,333,,333,,335,,335,,335,,335,,335,,338,,338,,338,,339,,339,,339,,340,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-KUCINA Steve,16,,18,,18,,18,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-MEAD Clinton,2360,,2393,,2396,,2396,,2397,,2398,,2428,,2429,,2429,,2429,,2430,,2431,,2431,,2434,,2435,,2435,,2435,,2436,,2437,,2438,,2464,,2464,,2465,,2470,,2476,,2479,,2481,,2513,,2525,,2563,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-RABEY Matthew,40,,45,,48,,48,,48,,48,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+CHANDLER Claire,1687,H,55996,PEL,55996,PEL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL
+DENISON Tanya,2466,H,3580,H,3584,H,9272,H,9273,H,9276,H,9277,H,9279,H,9280,H,9281,H,9291,H,9293,H,9300,H,9303,H,9306,H,9319,H,9321,H,9323,H,9325,H,9326,H,9348,H,9355,H,9360,H,9364,H,9441,H,9446,H,9461,H,9525,H,9534,H,9689,H,10412,H,10607,H,11036,H,12295,H,12571,H,13188,H,16121,H,17365,H,17387,H,19739,H,0,EX,0,EX
+BEVIS Karen Louise,4414,H,4430,H,4436,H,4436,H,4437,H,4437,H,4437,H,4438,H,4439,H,4439,H,4439,H,4439,H,4441,H,4508,H,4508,H,4510,H,4514,H,4516,H,4518,H,4519,H,4547,H,4553,H,4555,H,4556,H,4560,H,4564,H,4585,H,4602,H,4612,H,4886,H,5036,H,5142,H,5244,H,5414,H,6006,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+TURNER Isobel Bertoz,107,H,109,H,109,H,109,H,109,H,109,H,110,H,110,H,113,H,113,H,114,H,115,H,115,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+WILLIAMS Ray,313,H,318,H,322,H,322,H,331,H,332,H,333,H,333,H,335,H,335,H,335,H,335,H,335,H,338,H,338,H,338,H,339,H,339,H,339,H,340,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+KUCINA Steve,16,H,18,H,18,H,18,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+MEAD Clinton,2360,H,2393,H,2396,H,2396,H,2397,H,2398,H,2428,H,2429,H,2429,H,2429,H,2430,H,2431,H,2431,H,2434,H,2435,H,2435,H,2435,H,2436,H,2437,H,2438,H,2464,H,2464,H,2465,H,2470,H,2476,H,2479,H,2481,H,2513,H,2525,H,2563,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+RABEY Matthew,40,H,45,H,48,H,48,H,48,H,48,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
 BROWN Carol,83829,PEL,83829,PEL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL,50285,EL
-BILYK Catryna,1588,,1604,,34420,,34421,,34421,,34422,,34422,,34422,,34422,,34422,,34422,,34423,,34425,,34427,,34429,,34430,,34430,,34430,,34430,,34430,,34472,,34475,,34477,,34521,,34526,,34661,,34681,,34716,,35394,,35535,,35895,,36171,,36387,,36521,,37114,,37996,,38396,,39653,,39778,,41452,,45532,,64029,PEL
-SHORT John,1217,,1224,,1394,,1394,,1397,,1397,,1397,,1398,,1398,,1398,,1398,,1398,,1399,,1401,,1401,,1402,,1404,,1404,,1404,,1404,,1407,,1408,,1408,,1478,,1483,,1661,,1667,,1667,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-SINGH Lisa,19984,,20137,,20432,,20435,,20435,,20435,,20435,,20437,,20438,,20438,,20439,,20439,,20440,,20442,,20444,,20445,,20445,,20446,,20451,,20454,,20461,,20473,,20478,,20576,,20585,,21026,,21067,,21070,,21815,,21856,,21861,,22329,,22559,,22580,,22624,,22717,,22817,,22930,,22986,,23078,,24132,,970,EXCLUDING
-ROBERTS Wayne,366,,368,,398,,398,,398,,398,,400,,400,,400,,400,,400,,400,,400,,400,,400,,400,,400,,400,,400,,402,,403,,403,,404,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-FLANAGAN Robert,686,,690,,730,,730,,730,,730,,730,,730,,730,,730,,730,,730,,730,,730,,731,,731,,733,,733,,733,,733,,733,,733,,734,,864,,865,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-STEPHEN Matthew,11803,,11829,,11841,,11841,,11841,,11843,,11844,,11844,,11844,,11845,,11845,,11846,,11846,,11848,,11853,,11853,,11856,,11860,,11862,,11867,,11913,,11913,,12198,,12198,,12227,,12232,,12235,,12787,,12798,,12856,,13102,,13161,,13463,,13937,,14254,,14790,,15249,,16862,,16867,,20413,,25591,,25741,
-LAMBERT Adam,356,,359,,363,,363,,363,,363,,364,,364,,364,,365,,366,,368,,368,,368,,368,,369,,370,,371,,371,,375,,377,,378,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-JONES Michael,1451,,1454,,1456,,1456,,1456,,1456,,1456,,1456,,1456,,1456,,1457,,1512,,1512,,1512,,1516,,1516,,1516,,1517,,1517,,1518,,1536,,1538,,1546,,1548,,1550,,1553,,1553,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-FALZON Frank,77,,78,,78,,78,,78,,78,,78,,79,,80,,81,,81,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-LAMBIE Jacqui,31292,,31488,,31532,,31535,,31535,,31563,,31565,,31604,,31604,,31606,,31609,,31617,,31625,,31628,,31650,,31653,,31657,,31659,,31666,,31674,,31706,,31709,,31754,,31773,,31835,,31866,,31881,,32122,,32186,,32312,,32582,,33554,,34856,,35070,,35723,,36442,,36973,,39356,,39378,,43653,,49400,,53389,PEL
-WILLIAMS Glynn,39,,41,,41,,41,,41,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-REYNOLDS Chris,52,,52,,52,,52,,52,,54,,54,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-INFORMAL Alfred,4012,,4013,,4017,,4017,,4017,,4017,,4017,,4019,,4019,,4019,,4019,,4020,,4022,,4026,,4029,,4029,,4122,,4125,,4125,,4129,,4139,,4140,,4142,,4143,,4151,,4152,,4159,,4201,,4208,,4316,,4394,,4544,,4739,,4789,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-OWEN Matt,129,,129,,129,,129,,129,,129,,129,,130,,130,,131,,131,,131,,133,,135,,138,,138,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-MORGAN Kevin,9078,,9105,,9110,,9110,,9110,,9110,,9110,,9110,,9110,,9121,,9121,,9121,,9122,,9123,,9125,,9125,,9126,,9131,,9135,,9277,,9283,,9283,,9284,,9284,,9300,,9303,,9306,,9480,,9492,,9530,,9676,,9759,,10064,,10233,,10614,,10860,,11112,,12790,,12794,,0,EX,0,EX,0,EX
-WILLIAMS David,138,,140,,140,,140,,140,,140,,140,,140,,140,,183,,183,,183,,184,,184,,187,,187,,188,,190,,190,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-GUNNIS Craig,65,,66,,66,,66,,66,,66,,66,,67,,68,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-GARLAND Craig,3475,,3495,,3503,,3503,,3503,,3503,,3504,,3504,,3504,,3504,,3504,,3505,,3509,,3509,,3509,,3509,,3512,,3516,,3654,,3656,,3662,,3664,,3665,,3665,,3682,,3687,,3694,,3705,,3712,,3743,,3750,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-DUNCAN Mark,174,,175,,175,,175,,175,,175,,175,,176,,176,,176,,176,,177,,178,,178,,179,,181,,183,,184,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-BYFIELD Rebecca Anthea,5971,,5981,,5985,,5985,,5985,,5985,,5985,,5985,,5985,,5987,,5987,,5987,,5992,,5993,,5998,,5998,,5998,,6129,,6131,,6138,,6156,,6156,,6160,,6162,,6194,,6198,,6199,,6382,,6391,,6439,,6577,,6825,,7430,,7560,,8671,,9286,,9456,,0,EX,0,EX,0,EX,0,EX,0,EX
-SWANSON Kim,162,,163,,163,,163,,163,,163,,163,,163,,163,,164,,164,,165,,166,,167,,170,,170,,174,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-BECK Greg,408,,412,,412,,412,,412,,412,,413,,413,,413,,413,,413,,413,,415,,415,,434,,434,,434,,436,,437,,437,,437,,438,,439,,439,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-MAV Steve,3579,,3594,,3594,,3594,,3594,,3594,,3594,,3594,,3595,,3597,,3599,,3601,,3623,,3624,,3661,,3661,,3663,,3670,,3675,,3677,,3678,,3678,,3681,,3687,,3789,,3793,,3795,,3818,,3825,,3841,,3845,,3987,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-FLANNERY Francis,83,,83,,83,,83,,83,,83,,83,,83,,83,,83,,83,,83,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-STREET Karen,112,,113,,113,,113,,113,,113,,113,,113,,113,,113,,113,,114,,122,,122,,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+BILYK Catryna,1588,H,1604,H,34420,H,34421,H,34421,H,34422,H,34422,H,34422,H,34422,H,34422,H,34422,H,34423,H,34425,H,34427,H,34429,H,34430,H,34430,H,34430,H,34430,H,34430,H,34472,H,34475,H,34477,H,34521,H,34526,H,34661,H,34681,H,34716,H,35394,H,35535,H,35895,H,36171,H,36387,H,36521,H,37114,H,37996,H,38396,H,39653,H,39778,H,41452,H,45532,H,64029,PEL
+SHORT John,1217,H,1224,H,1394,H,1394,H,1397,H,1397,H,1397,H,1398,H,1398,H,1398,H,1398,H,1398,H,1399,H,1401,H,1401,H,1402,H,1404,H,1404,H,1404,H,1404,H,1407,H,1408,H,1408,H,1478,H,1483,H,1661,H,1667,H,1667,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+SINGH Lisa,19984,H,20137,H,20432,H,20435,H,20435,H,20435,H,20435,H,20437,H,20438,H,20438,H,20439,H,20439,H,20440,H,20442,H,20444,H,20445,H,20445,H,20446,H,20451,H,20454,H,20461,H,20473,H,20478,H,20576,H,20585,H,21026,H,21067,H,21070,H,21815,H,21856,H,21861,H,22329,H,22559,H,22580,H,22624,H,22717,H,22817,H,22930,H,22986,H,23078,H,24132,H,970,EXCLUDING
+ROBERTS Wayne,366,H,368,H,398,H,398,H,398,H,398,H,400,H,400,H,400,H,400,H,400,H,400,H,400,H,400,H,400,H,400,H,400,H,400,H,400,H,402,H,403,H,403,H,404,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+FLANAGAN Robert,686,H,690,H,730,H,730,H,730,H,730,H,730,H,730,H,730,H,730,H,730,H,730,H,730,H,730,H,731,H,731,H,733,H,733,H,733,H,733,H,733,H,733,H,734,H,864,H,865,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+STEPHEN Matthew,11803,H,11829,H,11841,H,11841,H,11841,H,11843,H,11844,H,11844,H,11844,H,11845,H,11845,H,11846,H,11846,H,11848,H,11853,H,11853,H,11856,H,11860,H,11862,H,11867,H,11913,H,11913,H,12198,H,12198,H,12227,H,12232,H,12235,H,12787,H,12798,H,12856,H,13102,H,13161,H,13463,H,13937,H,14254,H,14790,H,15249,H,16862,H,16867,H,20413,H,25591,H,25741,H
+LAMBERT Adam,356,H,359,H,363,H,363,H,363,H,363,H,364,H,364,H,364,H,365,H,366,H,368,H,368,H,368,H,368,H,369,H,370,H,371,H,371,H,375,H,377,H,378,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+JONES Michael,1451,H,1454,H,1456,H,1456,H,1456,H,1456,H,1456,H,1456,H,1456,H,1456,H,1457,H,1512,H,1512,H,1512,H,1516,H,1516,H,1516,H,1517,H,1517,H,1518,H,1536,H,1538,H,1546,H,1548,H,1550,H,1553,H,1553,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+FALZON Frank,77,H,78,H,78,H,78,H,78,H,78,H,78,H,79,H,80,H,81,H,81,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+LAMBIE Jacqui,31292,H,31488,H,31532,H,31535,H,31535,H,31563,H,31565,H,31604,H,31604,H,31606,H,31609,H,31617,H,31625,H,31628,H,31650,H,31653,H,31657,H,31659,H,31666,H,31674,H,31706,H,31709,H,31754,H,31773,H,31835,H,31866,H,31881,H,32122,H,32186,H,32312,H,32582,H,33554,H,34856,H,35070,H,35723,H,36442,H,36973,H,39356,H,39378,H,43653,H,49400,H,53389,PEL
+WILLIAMS Glynn,39,H,41,H,41,H,41,H,41,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+REYNOLDS Chris,52,H,52,H,52,H,52,H,52,H,54,H,54,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+INFORMAL Alfred,4012,H,4013,H,4017,H,4017,H,4017,H,4017,H,4017,H,4019,H,4019,H,4019,H,4019,H,4020,H,4022,H,4026,H,4029,H,4029,H,4122,H,4125,H,4125,H,4129,H,4139,H,4140,H,4142,H,4143,H,4151,H,4152,H,4159,H,4201,H,4208,H,4316,H,4394,H,4544,H,4739,H,4789,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+OWEN Matt,129,H,129,H,129,H,129,H,129,H,129,H,129,H,130,H,130,H,131,H,131,H,131,H,133,H,135,H,138,H,138,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+MORGAN Kevin,9078,H,9105,H,9110,H,9110,H,9110,H,9110,H,9110,H,9110,H,9110,H,9121,H,9121,H,9121,H,9122,H,9123,H,9125,H,9125,H,9126,H,9131,H,9135,H,9277,H,9283,H,9283,H,9284,H,9284,H,9300,H,9303,H,9306,H,9480,H,9492,H,9530,H,9676,H,9759,H,10064,H,10233,H,10614,H,10860,H,11112,H,12790,H,12794,H,0,EX,0,EX,0,EX
+WILLIAMS David,138,H,140,H,140,H,140,H,140,H,140,H,140,H,140,H,140,H,183,H,183,H,183,H,184,H,184,H,187,H,187,H,188,H,190,H,190,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+GUNNIS Craig,65,H,66,H,66,H,66,H,66,H,66,H,66,H,67,H,68,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+GARLAND Craig,3475,H,3495,H,3503,H,3503,H,3503,H,3503,H,3504,H,3504,H,3504,H,3504,H,3504,H,3505,H,3509,H,3509,H,3509,H,3509,H,3512,H,3516,H,3654,H,3656,H,3662,H,3664,H,3665,H,3665,H,3682,H,3687,H,3694,H,3705,H,3712,H,3743,H,3750,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+DUNCAN Mark,174,H,175,H,175,H,175,H,175,H,175,H,175,H,176,H,176,H,176,H,176,H,177,H,178,H,178,H,179,H,181,H,183,H,184,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+BYFIELD Rebecca Anthea,5971,H,5981,H,5985,H,5985,H,5985,H,5985,H,5985,H,5985,H,5985,H,5987,H,5987,H,5987,H,5992,H,5993,H,5998,H,5998,H,5998,H,6129,H,6131,H,6138,H,6156,H,6156,H,6160,H,6162,H,6194,H,6198,H,6199,H,6382,H,6391,H,6439,H,6577,H,6825,H,7430,H,7560,H,8671,H,9286,H,9456,H,0,EX,0,EX,0,EX,0,EX,0,EX
+SWANSON Kim,162,H,163,H,163,H,163,H,163,H,163,H,163,H,163,H,163,H,164,H,164,H,165,H,166,H,167,H,170,H,170,H,174,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+BECK Greg,408,H,412,H,412,H,412,H,412,H,412,H,413,H,413,H,413,H,413,H,413,H,413,H,415,H,415,H,434,H,434,H,434,H,436,H,437,H,437,H,437,H,438,H,439,H,439,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+MAV Steve,3579,H,3594,H,3594,H,3594,H,3594,H,3594,H,3594,H,3594,H,3595,H,3597,H,3599,H,3601,H,3623,H,3624,H,3661,H,3661,H,3663,H,3670,H,3675,H,3677,H,3678,H,3678,H,3681,H,3687,H,3789,H,3793,H,3795,H,3818,H,3825,H,3841,H,3845,H,3987,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+FLANNERY Francis,83,H,83,H,83,H,83,H,83,H,83,H,83,H,83,H,83,H,83,H,83,H,83,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+STREET Karen,112,H,113,H,113,H,113,H,113,H,113,H,113,H,113,H,113,H,113,H,113,H,114,H,122,H,122,H,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
 Exhausted,0,,0,,0,,0,,0,,0,,0,,0,,0,,0,,0,,0,,0,,0,,0,,1,,1,,1,,2,,2,,9,,9,,9,,9,,9,,11,,13,,37,,39,,73,,175,,224,,239,,344,,472,,663,,895,,1542,,1550,,2405,,6101,,6627,
 Loss to fraction,0,,19,,35,,46,,47,,49,,54,,54,,54,,55,,60,,60,,60,,60,,60,,61,,61,,62,,62,,63,,67,,69,,72,,78,,79,,85,,89,,91,,98,,98,,101,,102,,104,,104,,104,,105,,105,,105,,108,,108,,92,,92,
diff --git a/tests/data/aec-senate-formalpreferences-24310-TAS.ods b/tests/data/aec-senate-formalpreferences-24310-TAS.ods
index 5187104..56bb3b8 100644
Binary files a/tests/data/aec-senate-formalpreferences-24310-TAS.ods and b/tests/data/aec-senate-formalpreferences-24310-TAS.ods differ
diff --git a/tests/data/ers97.csv b/tests/data/ers97.csv
index 0b2c321..f8f0e41 100644
--- a/tests/data/ers97.csv
+++ b/tests/data/ers97.csv
@@ -1,15 +1,15 @@
 Stage:,1,,2,,3,,4,,5,,6,,7,,8,
 Comment:,First preferences,,Surplus of Smith,,Exclusion of Monk,,Exclusion of Monk,,"Exclusion of Glazier, Wright",,"Exclusion of Glazier, Wright",,Surplus of Carpenter,,Exclusion of Abbot,
 Smith,134,PEL,107.58,EL,107.58,EL,107.58,EL,107.58,EL,107.58,EL,107.58,EL,107.58,EL
-Carpenter,81,,88.35,,88.35,,88.35,,122.35,PEL,122.35,PEL,107.58,EL,107.58,EL
-Wright,27,,32.25,,32.25,,32.25,,5.25,EXCLUDING,0,EX,0,EX,0,EX
-Glazier,24,,30.51,,30.51,,30.51,,6.51,EXCLUDING,0,EX,0,EX,0,EX
-Duke,105,,106.68,,108.68,PEL,108.68,PEL,108.68,PEL,108.68,PEL,108.68,PEL,108.68,PEL
-Prince,91,,91,,91,,91,,102,,104.31,,104.31,PEL,104.31,PEL
-Baron,64,,64,,64,,64.21,,67.21,,68.26,,70.26,,82.26,
-Abbot,59,,59.84,,64.84,,64.84,,65.84,,67.1,,68.1,,2.1,EXCLUDING
-Vicar,55,,55,,69,,69.21,,69.21,,71.31,,71.31,,113.31,PEL
-Monk,23,,23.42,,0.42,EXCLUDING,0,EX,0,EX,0,EX,0,EX,0,EX
-Freeman,90,,93.78,,95.78,,95.78,,95.78,,96.62,,101.62,,101.62,PEL
+Carpenter,81,H,88.35,H,88.35,H,88.35,H,122.35,PEL,122.35,PEL,107.58,EL,107.58,EL
+Wright,27,H,32.25,H,32.25,H,32.25,H,5.25,EXCLUDING,0,EX,0,EX,0,EX
+Glazier,24,H,30.51,H,30.51,H,30.51,H,6.51,EXCLUDING,0,EX,0,EX,0,EX
+Duke,105,H,106.68,H,108.68,PEL,108.68,PEL,108.68,PEL,108.68,PEL,108.68,PEL,108.68,PEL
+Prince,91,H,91,H,91,H,91,H,102,H,104.31,H,104.31,PEL,104.31,PEL
+Baron,64,H,64,H,64,H,64.21,H,67.21,H,68.26,H,70.26,H,82.26,H
+Abbot,59,H,59.84,H,64.84,H,64.84,H,65.84,H,67.1,H,68.1,H,2.1,EXCLUDING
+Vicar,55,H,55,H,69,H,69.21,H,69.21,H,71.31,H,71.31,H,113.31,PEL
+Monk,23,H,23.42,H,0.42,EXCLUDING,0,EX,0,EX,0,EX,0,EX,0,EX
+Freeman,90,H,93.78,H,95.78,H,95.78,H,95.78,H,96.62,H,101.62,H,101.62,PEL
 Non-transferable,0,,0.59,,0.59,,0.59,,2.59,,6.79,,13.56,,25.56,
 Votes required,,,,,,,,,,,105.87,,104.13,,96.41,
diff --git a/tests/data/ers97.ods b/tests/data/ers97.ods
index cda9576..76d37bb 100644
Binary files a/tests/data/ers97.ods and b/tests/data/ers97.ods differ
diff --git a/tests/data/ers97_meek.csv b/tests/data/ers97_meek.csv
index b25c65c..cf60a90 100644
--- a/tests/data/ers97_meek.csv
+++ b/tests/data/ers97_meek.csv
@@ -1,15 +1,15 @@
 Stage:,1,,2,,4,,6,,9,,11,
 Comment:,First preferences,,Surpluses distributed,,Surpluses distributed,,Surpluses distributed,,Surpluses distributed,,Surpluses distributed,
 Smith,134,EL,107.26,EL,106.96,EL,104.42,EL,101.58,EL,73,EL
-Carpenter,81,,87.98,,88.47,,97.71,,101.58,EL,73,EL
-Wright,27,,31.99,,32.34,,34.97,,0,EX,0,EX
-Glazier,24,,30.19,,30.62,,0,EX,0,EX,0,EX
-Duke,105,,106.6,,106.96,EL,104.42,EL,101.58,EL,73,EL
-Prince,91,,91,,91,,92.45,,97.07,,73,EL
-Baron,64,,64,,64,,64.03,,67.24,,0,EX
-Abbot,59,,59.8,,64.85,,66,,68.92,,70.83,
-Vicar,55,,55,,69.21,,70.99,,73.27,,75.16,EL
-Monk,23,,23.4,,0,EX,0,EX,0,EX,0,EX
-Freeman,90,,93.59,,94.27,,95.97,,99.81,,73,EL
+Carpenter,81,H,87.98,H,88.47,H,97.71,H,101.58,EL,73,EL
+Wright,27,H,31.99,H,32.34,H,34.97,H,0,EX,0,EX
+Glazier,24,H,30.19,H,30.62,H,0,EX,0,EX,0,EX
+Duke,105,H,106.6,H,106.96,EL,104.42,EL,101.58,EL,73,EL
+Prince,91,H,91,H,91,H,92.45,H,97.07,H,73,EL
+Baron,64,H,64,H,64,H,64.03,H,67.24,H,0,EX
+Abbot,59,H,59.8,H,64.85,H,66,H,68.92,H,70.83,H
+Vicar,55,H,55,H,69.21,H,70.99,H,73.27,H,75.16,EL
+Monk,23,H,23.4,H,0,EX,0,EX,0,EX,0,EX
+Freeman,90,H,93.59,H,94.27,H,95.97,H,99.81,H,73,EL
 Exhausted,0,,2.2,,4.31,,22.05,,41.95,,242.01,
 Quota,107.57,,107.26,,106.96,,104.42,,101.58,,73,
diff --git a/tests/data/ers97_meek.ods b/tests/data/ers97_meek.ods
index 31940a0..955d8c6 100644
Binary files a/tests/data/ers97_meek.ods and b/tests/data/ers97_meek.ods differ
diff --git a/tests/data/prsa1.csv b/tests/data/prsa1.csv
index 1ec24bf..fa6b635 100644
--- a/tests/data/prsa1.csv
+++ b/tests/data/prsa1.csv
@@ -1,11 +1,11 @@
 Stage:,1,,2,,3,,4,,5,,6,,7,,8,,9,,10,,11,,12,,13,,14,,15,,16,,17,
 Comment:,First preferences,,Surplus of Grey,,Surplus of Ames,,Surplus of Spears,,Exclusion of Reid,,Exclusion of Reid,,Exclusion of Reid,,Exclusion of Reid,,Exclusion of Evans,,Exclusion of Evans,,Exclusion of Evans,,Exclusion of Evans,,Exclusion of Evans,,Exclusion of Evans,,Exclusion of Thomson,,Exclusion of Thomson,,Exclusion of Thomson,
-Evans,1,,2.234,,3.038,,4.823,,4.823,,4.823,,5.225,,5.82,,4.82,EX,3.586,EX,2.782,EX,0.997,EX,0.595,EX,0,EX,0,EX,0,EX,0,EX
+Evans,1,H,2.234,H,3.038,H,4.823,H,4.823,H,4.823,H,5.225,H,5.82,H,4.82,EX,3.586,EX,2.782,EX,0.997,EX,0.595,EX,0,EX,0,EX,0,EX,0,EX
 Grey,34,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL
-Thomson,5,,7.468,,8.674,,8.674,,8.674,,8.674,,8.674,,9.864,,10.864,,10.864,,11.266,,11.266,,11.668,,11.668,,6.668,EX,4.2,EX,2.994,EX
-Ames,10,,18.638,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL
-Reid,1,,1.617,,2.019,,3.804,,2.804,EX,2.187,EX,1.785,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
-Spears,11,,17.17,EL,17.17,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL
-White,3,,4.851,,8.067,,8.662,,9.662,,10.279,,10.279,,10.279,,10.279,,10.279,,10.681,,11.871,,11.871,,12.466,,12.466,,12.466,,13.672,EL
+Thomson,5,H,7.468,H,8.674,H,8.674,H,8.674,H,8.674,H,8.674,H,9.864,H,10.864,H,10.864,H,11.266,H,11.266,H,11.668,H,11.668,H,6.668,EX,4.2,EX,2.994,EX
+Ames,10,H,18.638,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL
+Reid,1,H,1.617,H,2.019,H,3.804,H,2.804,EX,2.187,EX,1.785,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX,0,EX
+Spears,11,H,17.17,EL,17.17,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL,13.001,EL
+White,3,H,4.851,H,8.067,H,8.662,H,9.662,H,10.279,H,10.279,H,10.279,H,10.279,H,10.279,H,10.681,H,11.871,H,11.871,H,12.466,H,12.466,H,12.466,H,13.672,EL
 Exhausted,0,,0,,0,,0,,0,,0,,0,,0,,0,,1.234,,1.234,,1.829,,1.829,,1.829,,6.829,,9.297,,9.297,
 Loss to fraction,0,,0.021,,0.03,,0.034,,0.034,,0.034,,0.034,,0.034,,0.034,,0.034,,0.034,,0.034,,0.034,,0.034,,0.034,,0.034,,0.034,
diff --git a/tests/data/prsa1.ods b/tests/data/prsa1.ods
index 09eb3fd..908addc 100644
Binary files a/tests/data/prsa1.ods and b/tests/data/prsa1.ods differ
diff --git a/tests/utils/mod.rs b/tests/utils/mod.rs
index b3ce7f7..0935852 100644
--- a/tests/utils/mod.rs
+++ b/tests/utils/mod.rs
@@ -45,8 +45,6 @@ where
 	// Remove exhausted/LBF rows
 	candidates.truncate(candidates.len() - 2);
 	
-	// TODO: Validate candidate names
-	
 	let stages: Vec<usize> = records.first().unwrap().iter().skip(1).step_by(2).map(|s| s.parse().unwrap()).collect();
 	
 	// Read BLT
@@ -56,6 +54,11 @@ where
 	
 	let election: Election<N> = Election::from_blt(lines.map(|r| r.expect("IO Error").to_string()).into_iter());
 	
+	// Validate candidate names
+	for (i, candidate) in candidates.iter().enumerate() {
+		assert_eq!(election.candidates[i].name, *candidate);
+	}
+	
 	validate_election(stages, records, election, stv_opts, cmp_dps, sum_rows);
 }
 
@@ -93,6 +96,15 @@ fn validate_stage<N: Number>(idx: usize, state: &CountState<N>, records: &Vec<St
 where
 	for<'r> &'r N: ops::Add<&'r N, Output=N>,
 {
+	// Validate stage name
+	let stage_name = &records.iter().nth(1).unwrap()[idx*2 + 1];
+	if stage_name.len() > 0 {
+		match state.kind {
+			Some(kind) => assert_eq!(format!("{} {}", kind, state.title), stage_name),
+			None => assert_eq!(state.title, stage_name),
+		}
+	}
+	
 	let mut candidate_votes: Vec<Option<N>> = records.iter().skip(2)
 		.map(|r| if r[idx*2 + 1].len() > 0 { Some(N::from(r[idx*2 + 1].parse::<f64>().expect("Syntax Error"))) } else { None })
 		.collect();