Issue #2381819 by slashrsm: Fix tests.