Re hiding it in apiclient - in first commit I've implemented it that way then I've noticed java implementation where it is implemented  in runner instead of apiclient and decided to move.  Will move again and rewrite tests. 