fixing test structures