Implemented grouping by tests
New build