Improve test organization