Reduce eval scope in test env
Fix argument not found error