Grouped tests
Cleanup and beautification