Fix VerbeNet test when it's still zipped
Expand substructures when needed