Fix test fails in rhino/narwhal.