added the first unit test using gtest
fixed merge conflicts