(cleanup) Add TODO comments for future test modularization