fix unit tests + grouping