Fixcount

Added new tests to test for bug when counting in parallel

Fixed counting in parallel
The mixin changes need to be pulled into master first. Then this block should point to that commit. Please create an issue in jira and finalize the pull request for the block mixin first.