Fix tests (in group :))