Updated functional test to include second confirmation on removal

AFDP-51