Delete test data now has confirmation

Among other improvements.