Updated *_test.cpp programs