Refactor test client into a separate module
PEP-8