Fix test-structure