MDL-31936 workshop: Backport unit test improvements from 2.7

This is required to be able to fully test the workshop reset features.