Remove `Grid` requirement from tests