Clean up a few TODOs left over in !626 (merged), and add unit test for EstablishIntro.
EstablishIntro