added googletest
added a test
fixed a missing return statement
Merge branch 'refs/heads/master' into develop
created test for reference