clean up datacollection group stuff a bit, also a test fix