Issue #3128814 by longwave, jungle, dww, alexpott: Replace assert* involving count() and an equality operator with assertCount()