#1682: Enhance the test coverage part-4 (#1862)