update to latest upstream
handle evptest specially through a driver script