diff --git a/validphys2/src/validphys/tests/regressions/test_filter_rebuild_closure_data.csv b/validphys2/src/validphys/tests/regressions/test_filter_rebuild_closure_data.csv
new file mode 100644
index 0000000000000000000000000000000000000000..f08d5f1da79c543f3d6345e97603298189c1f58f
--- /dev/null
+++ b/validphys2/src/validphys/tests/regressions/test_filter_rebuild_closure_data.csv
@@ -0,0 +1,236 @@
+group	dataset	id	data_central
+NMC	NMC	16	0.3590979449642769
+NMC	NMC	21	0.3418489967573356
+NMC	NMC	22	0.3385797834821318
+NMC	NMC	27	0.3626633082391744
+NMC	NMC	28	0.3692716200256828
+NMC	NMC	29	0.3393563365749903
+NMC	NMC	34	0.3444498046197637
+NMC	NMC	35	0.3407104407839699
+NMC	NMC	36	0.3088634338876201
+NMC	NMC	40	0.3654544140138315
+NMC	NMC	41	0.3521034660045445
+NMC	NMC	42	0.3787441768710764
+NMC	NMC	46	0.3312367855788098
+NMC	NMC	47	0.346712620589439
+NMC	NMC	48	0.3387464251835502
+NMC	NMC	51	0.3437231853655276
+NMC	NMC	52	0.3511911046893071
+NMC	NMC	53	0.3304359605299125
+NMC	NMC	54	0.3748550568432098
+NMC	NMC	57	0.3203068352989945
+NMC	NMC	58	0.3388416020147311
+NMC	NMC	59	0.3252985180538622
+NMC	NMC	60	0.3423675061233887
+NMC	NMC	63	0.3210319614324407
+NMC	NMC	64	0.2645723343804536
+NMC	NMC	65	0.2953035334139908
+NMC	NMC	68	0.2503767782145905
+NMC	NMC	69	0.2509541786746806
+NMC	NMC	83	0.355814281095028
+NMC	NMC	84	0.3472129524639826
+NMC	NMC	87	0.3477514092172802
+NMC	NMC	88	0.3614047770010685
+NMC	NMC	89	0.3857914187582577
+NMC	NMC	91	0.3568921235976778
+NMC	NMC	92	0.3673224596267586
+NMC	NMC	93	0.3705126687227432
+NMC	NMC	94	0.3651200782544097
+NMC	NMC	95	0.3611163678080757
+NMC	NMC	97	0.338897628030416
+NMC	NMC	98	0.3320178091764132
+NMC	NMC	99	0.3406929570567711
+NMC	NMC	100	0.3635925759415095
+NMC	NMC	101	0.3604999882044543
+NMC	NMC	104	0.319194182718294
+NMC	NMC	105	0.3697724022709702
+NMC	NMC	106	0.3576121518141163
+NMC	NMC	107	0.3472440027561155
+NMC	NMC	108	0.3272166298847574
+NMC	NMC	110	0.3394501467443629
+NMC	NMC	111	0.336183211830513
+NMC	NMC	112	0.3343622098801047
+NMC	NMC	113	0.3417845037997969
+NMC	NMC	114	0.3130143747218269
+NMC	NMC	115	0.3203252795512227
+NMC	NMC	116	0.3024900845518207
+NMC	NMC	117	0.3222163037893534
+NMC	NMC	118	0.3141105910090921
+NMC	NMC	119	0.3419126047250114
+NMC	NMC	120	0.2996676554205135
+NMC	NMC	121	0.3292322326058323
+NMC	NMC	122	0.326249065992484
+NMC	NMC	123	0.3031896321747348
+NMC	NMC	124	0.335124445843593
+NMC	NMC	125	0.3267074120414776
+NMC	NMC	126	0.2971263562639138
+NMC	NMC	127	0.2844094372715828
+NMC	NMC	128	0.2795733439485311
+NMC	NMC	129	0.2793472726831564
+NMC	NMC	130	0.2576106172820832
+NMC	NMC	131	0.2383611493668191
+NMC	NMC	132	0.2453366734386922
+NMC	NMC	133	0.2460763231739797
+NMC	NMC	134	0.2211186859251358
+NMC	NMC	136	0.1620908251929999
+NMC	NMC	137	0.1565594032786954
+NMC	NMC	147	0.3541432461285734
+NMC	NMC	148	0.3643820802473071
+NMC	NMC	152	0.4010784642425662
+NMC	NMC	153	0.372377838816021
+NMC	NMC	154	0.3655917041001197
+NMC	NMC	157	0.3954513221949499
+NMC	NMC	158	0.368307437837419
+NMC	NMC	159	0.3902899019946428
+NMC	NMC	160	0.3896666756535071
+NMC	NMC	161	0.3613250840981187
+NMC	NMC	162	0.3836815854133134
+NMC	NMC	163	0.3684223976969419
+NMC	NMC	164	0.3671176399730093
+NMC	NMC	165	0.3885396283853814
+NMC	NMC	166	0.3666214999021723
+NMC	NMC	167	0.3507268408337133
+NMC	NMC	168	0.3734204901014632
+NMC	NMC	169	0.3774582955719194
+NMC	NMC	170	0.3706101179860512
+NMC	NMC	171	0.3912747622889723
+NMC	NMC	172	0.3860112393554032
+NMC	NMC	173	0.330400863063013
+NMC	NMC	174	0.3683311984913736
+NMC	NMC	175	0.3826829950209051
+NMC	NMC	176	0.3658644387472716
+NMC	NMC	177	0.3641265387288813
+NMC	NMC	178	0.3420460544791387
+NMC	NMC	179	0.3939555042563784
+NMC	NMC	180	0.3802912828485387
+NMC	NMC	181	0.356472270012772
+NMC	NMC	182	0.368800468454258
+NMC	NMC	183	0.3523495656736664
+NMC	NMC	184	0.3693351311363972
+NMC	NMC	185	0.3733916662343561
+NMC	NMC	186	0.3582050756220469
+NMC	NMC	187	0.3694975055023481
+NMC	NMC	188	0.3494604405417548
+NMC	NMC	189	0.3186129775030548
+NMC	NMC	190	0.3280658064908322
+NMC	NMC	191	0.3270741160686268
+NMC	NMC	192	0.3325504732079439
+NMC	NMC	193	0.3462615757905332
+NMC	NMC	194	0.3146035218710495
+NMC	NMC	195	0.3205106492147048
+NMC	NMC	196	0.3365633881526351
+NMC	NMC	197	0.2761132245156395
+NMC	NMC	198	0.3220120874402293
+NMC	NMC	199	0.3212410876051211
+NMC	NMC	200	0.2916213141452645
+NMC	NMC	201	0.2809738230826736
+NMC	NMC	202	0.2700562503441974
+NMC	NMC	203	0.2836200345170125
+NMC	NMC	204	0.2513207647329542
+NMC	NMC	205	0.2188974300564463
+NMC	NMC	206	0.2293225038945057
+NMC	NMC	207	0.2460712972073124
+NMC	NMC	208	0.2102849178324163
+NMC	NMC	209	0.218125471132299
+NMC	NMC	210	0.1683499504402056
+NMC	NMC	211	0.1365235931606731
+NMC	NMC	212	0.1247051468620407
+NMC	NMC	221	0.3720228884714197
+NMC	NMC	222	0.3940697425706496
+NMC	NMC	225	0.3855208145571092
+NMC	NMC	226	0.3771361243632468
+NMC	NMC	227	0.3925360791903651
+NMC	NMC	229	0.3711984313961664
+NMC	NMC	230	0.3979961973809486
+NMC	NMC	231	0.411742451489519
+NMC	NMC	232	0.3892453844506108
+NMC	NMC	233	0.3972547698845612
+NMC	NMC	234	0.3650984322482627
+NMC	NMC	235	0.370214093641175
+NMC	NMC	236	0.3821993302297455
+NMC	NMC	237	0.3925629809077883
+NMC	NMC	238	0.3969791499955349
+NMC	NMC	239	0.3874193104145063
+NMC	NMC	240	0.367457773194367
+NMC	NMC	241	0.3743101078131621
+NMC	NMC	242	0.3874565359554392
+NMC	NMC	243	0.3906239940799423
+NMC	NMC	244	0.3852985315569899
+NMC	NMC	245	0.3916767008242606
+NMC	NMC	246	0.3703291553847959
+NMC	NMC	247	0.3821999206990327
+NMC	NMC	248	0.3884082542742029
+NMC	NMC	249	0.3913856687687926
+NMC	NMC	250	0.3845089256362029
+NMC	NMC	251	0.3772994132532595
+NMC	NMC	252	0.383137410229951
+NMC	NMC	253	0.3735471729251796
+NMC	NMC	254	0.37147029556717
+NMC	NMC	255	0.3746250677809841
+NMC	NMC	256	0.370537243890788
+NMC	NMC	257	0.3463160631810289
+NMC	NMC	258	0.3655432073679338
+NMC	NMC	259	0.3704920825522829
+NMC	NMC	260	0.3618314145939893
+NMC	NMC	261	0.3504381817470892
+NMC	NMC	262	0.3394352030052507
+NMC	NMC	263	0.3514674119325806
+NMC	NMC	264	0.349980964557792
+NMC	NMC	265	0.3581840986558641
+NMC	NMC	266	0.3506742701329102
+NMC	NMC	267	0.3393820014777095
+NMC	NMC	268	0.3299844498999134
+NMC	NMC	269	0.3455386254605011
+NMC	NMC	270	0.3407587606258352
+NMC	NMC	271	0.319569595756327
+NMC	NMC	272	0.3425453507390423
+NMC	NMC	273	0.3136515118564776
+NMC	NMC	274	0.3138822795351768
+NMC	NMC	275	0.312598559250489
+NMC	NMC	276	0.2807546229095549
+NMC	NMC	277	0.2265394566404365
+NMC	NMC	278	0.2848010360485518
+NMC	NMC	279	0.2866784497450377
+NMC	NMC	280	0.2808017740680125
+NMC	NMC	281	0.2524033554276955
+NMC	NMC	282	0.2770987755482916
+NMC	NMC	283	0.2465197353942723
+NMC	NMC	284	0.2290371648695564
+NMC	NMC	285	0.2243994534309648
+NMC	NMC	286	0.2019958730556691
+NMC	NMC	287	0.1980342838396906
+NMC	NMC	288	0.1582262326413971
+NMC	NMC	289	0.12620002753145
+NMC	NMC	290	0.1155327126250632
+NMC	NMC	291	0.1040397793045561
+ATLAS	ATLASTTBARTOT	0	166.19214765158827
+ATLAS	ATLASTTBARTOT	1	231.0175304244432
+ATLAS	ATLASTTBARTOT	2	811.6203366162674
+CMS	CMSZDIFF12	1	2901.065823798472
+CMS	CMSZDIFF12	2	1042.820655239297
+CMS	CMSZDIFF12	3	448.51951044338296
+CMS	CMSZDIFF12	4	216.0862216800924
+CMS	CMSZDIFF12	5	105.7448656264868
+CMS	CMSZDIFF12	6	57.30848794789545
+CMS	CMSZDIFF12	7	29.140311146239508
+CMS	CMSZDIFF12	11	2784.269222352431
+CMS	CMSZDIFF12	12	1017.5198639026642
+CMS	CMSZDIFF12	13	435.8471936946449
+CMS	CMSZDIFF12	14	202.51960135408643
+CMS	CMSZDIFF12	15	104.69119937495302
+CMS	CMSZDIFF12	16	58.69306905106061
+CMS	CMSZDIFF12	17	29.91886312568381
+CMS	CMSZDIFF12	21	2533.307414777631
+CMS	CMSZDIFF12	22	901.7157296806644
+CMS	CMSZDIFF12	23	403.8401147404037
+CMS	CMSZDIFF12	24	198.76940835322392
+CMS	CMSZDIFF12	25	101.22409898216654
+CMS	CMSZDIFF12	26	53.89358789044618
+CMS	CMSZDIFF12	27	27.93561122093945
+CMS	CMSZDIFF12	31	1995.279905375972
+CMS	CMSZDIFF12	32	725.5900600003346
+CMS	CMSZDIFF12	33	328.6928915832406
+CMS	CMSZDIFF12	34	169.0252316478899
+CMS	CMSZDIFF12	35	87.3190433487125
+CMS	CMSZDIFF12	36	48.66630403118574
+CMS	CMSZDIFF12	37	23.801900000683837