New methods in client and first commit for tests