Changed Client constructor to protected and solved problems generated by
this action in tests