Bug #1402491: Some fixes to the tests, but ultimately we're setting
them to skip for now, because they need to have cURL replaced with
something that can be stub/mock-ed for PHPUnit.

Change-Id: Ic15cbbbb3979bf57471def90b7603f322881c226