Test.cpp removal