fixed tests for cpp