Test / fix collection changes and index updates