Add temporary line skippers and regex replaces to make some tests green. Needed for Rec!1205 (merged).