Fix tests broken by missing dependency
Decompose the "big" run function