added some unit test with google mocks
Merge branch 'develop'