Update and rename test to Eval.java