Added eval and tests