fixes tests after Nicolas' change was reverted
Merge branch 'master' into features/motivate-counts
adds given and received counts for bangmotivates