Update tests to also take the index into account.