Improve test structure