Improving test structure