Mock google

Improved mocking stuff. @cdg77 we can discuss this in a bit.