cleanup and all tests around group management now passing