improve test organization