Fixing unit tests for count queries.