Use group_id if present when getting user thread and comment counts.

TNL-543

@jimabramson @dan-f Please review
I will make the comment clearer. I'm not inclined to muck too much more with these tests....