restored curl and some tests

Change-Id: Ifa84435424abe18a1865e90bda653402608d1941