Fix tests and treebank delete