tests: cpp: more cleanups