Removing unnecessary qualification in google client.
Dropping unnecessary variable.
Moving test files to have parity with how the lib/ folder is structured.