Moved make_binary_eval function into unit tests since that is the only place it is used.
Moved make_unary_eval function into unit tests since that is the only place it is used.