Add more robust indexing events, and more unit tests