Tidy evaluate() function after test