Improve DI for testing#1973

BentiGorlich wants to merge 2 commits intomainMbinOrg/mbin:mainfrom

new/improve-test-setupMbinOrg/mbin:new/improve-test-setupCopy head branch name to clipboard