Fix tests, do not communicate with live services
Merge pull request #1731 from dennishendriksen/master

Fix tests, do not communicate with live services