use of an index. Tests updated. (CVS 796) FossilOrigin-Name: bfb9a2aa939ecffc5dc2c7c23bddd57d357bdf13
FossilOrigin-Name: 6ffedb90a6478af6548db5298368eeca2b708cdc