Very good.
Build the tool and when all is back togeter , I would go into the modules in a few days just to see how everthing is running.
Hopefully, you will only get a Single Flash for each, meaning No Faults Detected/Stored..........
Give the car a few good drive cycles/days for the Modules to adapt before getting codes.

__________________
A Dalton