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