Improve test modularization.