Tests updated, indexer refactored.