Adding in ws-client tests, finished util tests