comm.cpp and test_comm.cpp updated