Shade tests as well (patch to be squashed with the one by @olamy)

Hey Olivier,


Here is a patch on top of your own patch that work fine for me.

Tell me what you think about it and if you can merge it (and squash both patchs).


Cheers!