refactoring previous c++ code with google-mock
..