SOC-3649 | Step 3: CommenPlugin - Unit Testing improvment