Fix tests and index path