Add back test removed in fef62b51f after clearer testing.
Handle bootstrapping node race condition
Add further tests that highlight CL issues