Tidying up evaluate() tests