12145 rnd settings

Fix the tests and the various issues reported by @pwalczysko on gh-2365