Updated tests to work with new index.