Change indexes to match test scenarios