Shade tests as well (patch to be squashed with the one by @olamy)
Merge pull request #1 from dadoonet/MSHADE-158

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