Update tests because of additional test data
Fix wrong counts
Merge branch 'master' into DS-962