Adjusted test cases to c++ group