Mr rework unit tests

Merged andreas.fenkart requested to merge taw/dss-mainline:MR_rework-unit-tests into master Mar 16, 2021