Issue #1962358 by larowlan: More test fixes