Wip 8968

Fix bootstrapping of external node for test-suite
@dmick @jcsp