Update fixtures for #1672
Add fixtures for #1798