Minor fixes
Lots of thx @TKasekamp
we are up to 88 tests !