Merge "Allow unit testing w/o internet connectivity"