Fix tests based on _run_circus