Finished the TDD style client and test suite