Merge "Add C++ Unit tests"