Fix provider discovery to wait for one provider

Fix provider discovery to wait for one provider
This is to fix a few more bugs in the jenkins run where providers are not "discovered" before the attempt to delete, hence no deletion occurs and clashes happen on subsequent tests.