Merge "Add UT to increase code coverage"