Fixed solver and grid tests