Add first argument to constructor
Fix test for client
Fix client tests