Simplify functions call, update client and tests