Tests: Fix test broken by previous cherry-pick