Follow up grid merge fixes. Repair broken grid tick tests