Add confirmation handling and tests