Comms fixes; more unit tests.