Add group(), beautify reports
Add unit tests