Fernando - Fixed mock on test/Added confirmation message