Reworked client impl of interest
Increase wait time in test
Merge pull request #201 from qiangdavidliu/2.x

Reworked client impl of interest
Merge remote-tracking branch 'remotes/netflix/2.x' into tbak/2.x