Updated Test Creation on c++ side