Applied the whole series.

There was another test needing adjustment (see below) so I added it to
the last patch.

Thank you!

Ludo’.