COMMONS-332 | Re-configuration UT for commons-component