renamed test-util.cc