Merge "Replace assertItemsEqual with assertEqual"