cpp test cleanup