New group tests + bug fix