indexer cleanup.
fixed broken tests.