Merge "Restore tests for _elementSizeShift."