group fixes + object unit tests