Better Eval Eval Test & updated version