BUG#94393 Fix tests