Change to URL based announce server addresses (fixes #943)
Add tests for new discovery