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