Fixed a couple of broken tests, and added code to re-raise a connection exception if the init_comms connection attempt fails.