Update in tests and indexer