fixed tests and renamed usage of the index files