Fix small bugs with client and spec and record cassettes