During February 2025, Aematts focused on refactoring the test suite for the lanl/singularity-eos repository, laying the foundation for reliable full-cycle testing. They reorganized the tst directory, standardized file naming conventions, and updated include paths and namespace declarations to improve code maintainability and clarity. Working primarily in C++, Aematts applied skills in refactoring, software organization, and testing to streamline the test infrastructure. This work addressed the need for consistent and maintainable test structures, enabling future end-to-end testing and smoother CI integration. The depth of the changes provided a robust organizational framework, though the scope was limited to a single feature.