Make unit test provider smarter
Improve confirmation message upon survey delete