Read-write lock for DeltaIndex
Reinstated layouter tests