Fix Grid Tests to test features correctly (#13334)

Change-Id: Ib7d8863487cc645f83539de2c9d8006fd8995da0