Refactor to support fakeout client provider in test.

Signed-off-by: Phan Le <ple@pivotallabs.com>