remove special case for C++ test(s)