Replaced more assertEquals with assertCount