add required to mock client and complete tests