Fix 18 first GridRow tests