New version with google test framework template.
merge