Fixing C++ tests makefiles: part 1