ds model cleanup shade tests

Merged andreas.fenkart requested to merge MR_ds-model_cleanup_shade-tests into master Oct 11, 2021