added google mock and some other minor features