Fix popup, mark_templ and vega tests.