Grant's tests and a couple updates
comment