Updated for C++ comm testing