Merge "Replace assertItemsEqual with assertCountEqual"