issue: Fix test failures caused by 816a906.