Issue #1962358 by larowlan: Fixes use of generate() in test base