Group unit test was |= instead of &=; cosmetic changes to header files