Start with groups
Refatoring in test