Fixing bug with Eval_Test index