Fixed several failures in infrastructure tests

#238 - Infrastructure discovery test interferes with subsequent tests
wait_for_provider_or_timeout needed to return to the original provider page for some tests