Adding more indexers + tests
Adding files