Fix review nit, add test