Updated tests and allow discovery of most likely provider.