Improved test runner modularization