Fix tests after merging Change 47121 to Yangtools