Issue #1962358 by larowlan: Clean up TestBase