Clean up Comms. tests pass ok