Fixed eval and test added