Fixed feature tests
Make groups work again