Preserve order of appearance in collect methods
Add extract-figures test