Add more tests to cover the missing cases. 

Tweak the GroupJoinFinder to make the checks clearer.