refactor client
Client and payment tests