Fix grouping of specs