Deal reached for ex-White House counsel McGahn’s testimony