Class-ify client
Rename helper spec to match new convention
Start client tests