Add fleshed out spy interfaces
Add fleshed out mock interfaces