added grouping and started tests