Added Googlemock

Right now this fails
Merge remote-tracking branch 'origin/master'