by slashrsm: Fix tests.