moving the evaluate_with* convenience functions to tests

We don't use them anywhere else