Added client-test framework