Fixes for C++
Fixes for C++

Add compare around return value of strstr

(manifest_new_testsuite): Remove unused rc variable, and reset ts on
failure.