Missing these assertions didn't necessarily break tests but they are more correct and having them should help suss out bugs.
This breaks the old grouping mechanism, but honestly that was a weird way of doing it.