more cpp test cleanup