Add mock as a dep
Cleanup client tests
Client tests PEP8