Fixed the tests to use the new indices