Merge "Fix security issues of eval-s in testapi"