Testing improvements- C/C++