Worked on the wazuh/wazuh-indexer repository, delivering two targeted improvements focused on search functionality and test reliability. Developed matched_fields support for the unified highlighter, enabling blended matches from multiple fields within search result snippets and updating both changelogs and tests to reflect this enhancement. Addressed resource management in S3 repository tests by ensuring executor services in S3Service and S3AsyncService terminate properly when the test plugin closes, reducing the risk of thread leaks and improving test stability. Utilized Java, Lucene, and OpenSearch throughout, demonstrating attention to both feature development and the maintainability of the testing infrastructure.