Reorganised C++ test inputs/outputs