UHM-1240: Modify smoke tests to delete providers and users
revert inadvertant commit