Update test.cpp

Merge