Added eval methods and more test cases