Use redefined eval and add test