de-randomization fixes for testing, #37340