Fixed composite grid tests