Restructured grouping_spec, so tests are in a totally different place to increase flow from high level to low level methods