Add count teacher test
Merge remote-tracking branch 'origin/feature-agenda' into feature-agenda