Working on client and test cases.