MECH, yes, light expansion, weld, PT from the front and then leak test.
Note, you don't leak test with a soap solution, you buy leak test fluid to use.
ALL soaps contain a lot of Cl and many other chemicals. You never want soap residue on your equipment.
Grooves serve no purpose unless the tubesheets are significantly stronger than the tubes.
If y our mockup doesn't extrude the tube material clear down into the grooves then they aren't helping.
In light wall tubes using roughened holes is the best method.
In crevice corrosion the tighter the crevice the worse the conditions.
A light roll produces a very deep and fairly close crevice. Room for lots of corrosion.
If someone wants to strength weld with no hard roll after ask to see the vibration and fatigue calculation for the tubes and welds assuming that the tubesheet is only as thick as the weld. Because that is what you will have.
I have seen these fail many times.
= = = = = = = = = = = = = = = = = = = =
P.E. Metallurgy, consulting work welcomed