Added the indexer, cleaner, tests for both and tweaks to other tests.