Fix confirmation message and update CPP Unit