Moving to option interfaces
Moving fake client to new package to avoid import cycle
Updating tests to use new import path