Worked on stabilizing the rdkcentral/entservices-infra repository by addressing a persistent issue with a flaky unit test, CloseAppUsingComRpcFailureSetTargetAppStateReturnError, which was impacting CI reliability and release velocity. Using C++ and unit testing expertise, isolated the unstable test and temporarily commented it out to prevent it from blocking builds, while documenting the rationale and outlining next steps for a robust refactor. This approach maintained the integrity of the CI pipeline and ensured ongoing development was not hindered by intermittent failures. The work emphasized careful documentation, traceability, and a methodical plan for future test re-enablement and refinement.