Added test for test_eval_points.py
Resolved merge conflicts.