Switch to use client.RESTClient and add initial test