Fixing race on Reset / Grouping Handler (fix 2)
debug logging, test changes