CHG: Enhanced one test + improved one mock operation