Group db fixes & test.