Merge branch 'sponce_dropUTCommonBase' into 'master'

Modernized UT code and adapted to drop of UT base classes

See merge request !375
2 jobs for master in 20 seconds (queued for 1 second)