Fixed grid_scores_ shape + tests