Improve test structure.