Updated tests and added grouping