Re-add test accidentally removed during cherry-pick.