Issue #3374376: Fix Automated tests

Naveen Valecha requested to merge issue/custom_meta-3374376:3374376-requirement-of-dependency into 2.1.x Jul 18, 2023