maryrosecook Further modularised client and more comprehensive tests

Latest commit 596e3d7

Jun 26, 2014