Fix tests bootstrap

Still a lot of work :)

```
F...S.................................S.....II...............   61 / 1457 (  4%)
.............S.S......................................SS.....  122 / 1457 (  8%)
..SS.S.......S...............................................  183 / 1457 ( 12%)
.............................................................  244 / 1457 ( 16%)
.............................................................  305 / 1457 ( 20%)
.............................................................  366 / 1457 ( 25%)
.....S.......................................................  427 / 1457 ( 29%)
.............................................................  488 / 1457 ( 33%)
.............................................................  549 / 1457 ( 37%)
........FEFFS............FSI.I.I.ISSS.SS.EEEEEE.EE...........  610 / 1457 ( 41%)
........I.................E.F..I..I........SI................  671 / 1457 ( 46%)
.........SS............FF..E...F.................S.......I...  732 / 1457 ( 50%)
.....................EE.FFS.SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS  793 / 1457 ( 54%)
SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS  854 / 1457 ( 58%)
SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS  915 / 1457 ( 62%)
SSSSSSSSSSSSSSSEEE.EEEEE....F....FEF.EEEEEEEEEEEEEEEEEEEEEEEE  976 / 1457 ( 66%)
FE..FFFEEFEFFF.FF.FF.F.F.FE......FSF...FFFEFF.I........FF.FEF 1037 / 1457 ( 71%)
F.FFFFFFFFFEEEEEEEFF.F..SSSSSSE.EEEEFFFFFE....FFFFFF......F.. 1098 / 1457 ( 75%)
......S....EEEEEEEFFFFFFFFS..FF..F..........EEEEEEEEEEEEEEEEE 1159 / 1457 ( 79%)
EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE 1220 / 1457 ( 83%)
EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFEEFEE 1281 / 1457 ( 87%)
EFF..F.FEEFFEEEEE..EEEEFEFEFFESSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS 1342 / 1457 ( 92%)
SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS 1403 / 1457 ( 96%)
SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS..........E
```