Refactoring to get rid of sleeps and replace with waits. Also adding some more stability to RemoteProvidersIT.