Restore *test.cc to original version