Remove test added in a bad cherry-pick