Issue #1962358 by larowlan: Fixes final test fails