Fix test groups