Final test fixes

So with these fixes all tests pass here.

I still have occasionally a few "vanished known breakages" but these are not reproducible and seems to be triggered by high level of test parallelism.