Added groups and tests