improve test structure