Added index files, and changed tests to use the index