Add eager evaluation and test